Before controllers get split into views + controllers
Refactor auth