Replacing oauth with api key so I can merge. Should have done from beginning. Some refactoring of modules.