new login

Still needs to check some stuff with login