Fleshing out auth refactor.