Finished chapter 8. Fixes #7!