Finished first cut of the User model

Change-Id: Ib77053fa340cf3e6d98f6daa05df4a6f95e54f00