added login and other stuff