Just spent several hours reimplementing a unit test suite to try and flush out a bug in this big refactor. Aaaaaaaand the tests all pass.

Ugggh! So frustrating to see all green lol