Completing the user foundation
Merge branches 'updating-users' and 'master'