Start refactoring out auth