TODOs for 1.0:

* Reintroduce some of the removed debug output