Refactoring & making things work. Trying to get test framework up and running, not quite there.