implementation work and oauth2 annoyances