First attempt at adding OAuth support