Merging Alan's Oauth