Ch 11, 12

This pull request brings in both chapter 11 and 12. Chapter 12 is huge, so I'd really appreciate as many eyes on it as possible!

Let me know if you notice anything amiss.