More rewriting.

A new wave of tests are now passing.
One suite of tests passing.
More passing tests.