WIP -- working on authenticator refactor
Some cleanup