Another restructure, userid now stored instead of user model in session