Commiting some changes for oauth, still not fully working yet.