added login and stuff