67.
Refactor for testability.
Initial stab at setting up tests.