Feature/login

Clean this up so git blame makes a bit more sense.