TODO 63 B

123
  1. TODOs for 1.0:
  2. * Reintroduce some of the removed debug output