TODO 91 B

1234
  1. TODOs for 1.0:
  2. * Reintroduce some of the removed debug output
  3. * Test the whole code again