Worked on adding tests. Needs more work.