Partial Commit.
DO NOT attempt to build based on this version.
Latest port of rdebourbon's code

With some of my own mods present but commented out.