Complete rewrite of UsersController. Everything should be complete in the UsersController.