Changed the way data is handled so that we don't have to duplicate 'people' data