Moved user stuff to user controller
Yay for MVC