WIP: seems oauth is working after refactor