Fist attempt

Plan to abstract away more of the OAUTH stuff.