Cleanup.
Further work.
Worked on writing code and tests.