Added Login and other stuff