renaming who to people, where to places
added in organizations, because why not