Major overhaul to Auth system