MAJOR CHANGES for WIP Login

So many changes that go into lots of files…