PR: MAJOR CHANGES

So many changes that go into lots of files…