[NM] finished chapter 6
[NM] massive re-import, re-format
[NM] added a test to finish chapter 6