Almost done on authentication, jut need to fix it