Rearranged the User model to make more sense