More on Cathy's class layouts.

This is about all the non-smiling faces David makes that I want to preserve.