in the middle of reworking user login