Users branch is all done.

Users is all up and running, will create a pull request to add to master.