Tests pass and todomvc works. But there is some ugliness to now resolve, and a couple of unresolved issues.