need to talk to charlie about how we are going to test
Cleaned the saving of User a bit