Partial commit of stuff from updating-users chapter
Finish updating users