Holy crap that took long enough.

I finally upgraded to MT 4.21, I'm definitely going to have to put in a few more hours (with some help) to get this all sorted out correctly, but at least it's a step in the right direction.