added a whole bunch of user related stuff