Make a basic user model including passwords
fixed merge