adding entities to user and organization. related to #37
updating search to use an user object. related to #37