Started with login and tweaked a bit
merge