Added a bunch of stuff including login