Add 'PeopleSet' functionality. Refactor.