Total redo with oauth and things