Did some changes to Users, added more class variables. Considering removing password.