Finish implementing auth