Major rewrite of chapter 2

Unfortunately, nuked old chapter 2 in the process.  Whoops.  I don't think it's a big deal, though; we only need parts anyway, and it's unclear where to put them.