beginning to change everything to use the user object!