OK with remove this comment, but do we need to have this TODO elsewhere? Do we need to make sure we are limiting the kind of information returned?