Finishing chapter 6 and 7
Merge branch 'fixup_chapter7'