added user login and what not