next changes

Still working on login.