Base for chapter 12.
Move stuff around a bit.