Continuing on work done in #881, this is just a stub until I can get a full sense of what the final set of changes will be which I will document here or in the PR.

Working through the test suite and fixing things thus far, I'm at about 20 files changed and there is only one error remaining, which is rad!