Finished first cut of the User model
Merge branch 'modelling-users'