With 3 test failures out of 235, things are going well, 2 of those are openGL, so they may no longer be relevant when replaced by Metal.

I spent a day just tidying up the project. This was started before XCode had folders, and it used groups extensively to keep things organized. In Xcode it looked fine, but if you look in the file system, everything was flat. I reorganized the file system to reflect the project structure and converted XCode to use folders (In most cases, I still have a few groups in there).

I can’t really think of anything else to do that I can put off the conversion to Metal, so it goes up on the board, and that’s what I’m going to do next.