Fix a lot more of the scaffolding problems.
Commit changes that fix up a lot of issues with the unit tests. We are almost there with g++ unit tests.
Resolve merge conflicts.