Finished first cut of the user model