move class stuff from authenticator to server