Updated UserController and added TODOs
Updated UserController and added TODOs