No problem.
By the way, I haven't forgotten about this, just trying to find the best way to tackle it, as it's a big PR.
Also, I have strong opinions regarding coding styles/techniques that generally don't seem to align with RealThunder's approach.
I think my first step will be to take a small portion of the PR, and post my ideas here on the forum somewhere in order to start a discussion, as I want to be sure that the time I spend reviewing is put to good use.