Working on modern patch installation

It doesn't work ATM. I'm doing more variable renaming, and I'm not done.
GTG get shower now, so no more work until I get back.