Refactoring.
Refactoring.
Got all tests running.