Copied 08 to 09.
Most (all?) of chapter 9. Diff is messy as fuck. I don't care to break
this up because it only works all-or-nothing.