I'm now about 80% done

I have move most of the changes, testing now, expecting to blow your mind soon.