All 0.0.1 functionality in place... now we refactor (and test...)