Feature/login 7

Ryan's glorious changes