Attempt at introducing oauth2