#7 New logged in hash rather than email+pw. Additional refactoring