combined this is now the latest
added more stuff
added UserController