Ripped out auth into a new engine
Fixed minor conflict