Section 2.1 complete.

I bet this fixes some of the other ones, too.