Lots of swap out of the Auth package