Refactoring continues.

Also uncommented and broke 6 tests.