Cleaned up naming, added more methods to user.