Finished off the OO in the user auth