Refactor to a single 'user' class
Add more to the user class