almost done for the auth