Added login, still error checking left