Finished first cut of the User model