Actually save user data
Refactor out user specific code