Done some progress on the login