Added some structure and basic oAuth