Refactoring to add to user object
Better refactor of where locations should go