Working through tests, refactoring some to reflect the fact that design does not yet exist.  There are some examples, for example in namespaces (features), as to how we might cleanup some fo the patterns.