All of the authentication code in the services seemed non-standard. I was trying to change as little of the 1.0 auth code while trying to introduce the 2.0 auth. 

I can trying to do a refactor everything and just standardize everything across the board if you think that's wise.