Also realizing how much I've missed C++, having spent so much time in C# in work and college.
Pretty short update this. I plan on going through the various abstraction layers I've had to make to be able to test the engine. Abstracting away the system dependencies from the exposed interfaces. Work is slower than it might otherwise be at this stage, but I'm expecting the clean interfaces to pay off.