Fix merge issues.  Make authenticator thingy.