Moved some stuff back into the user model