Cleaned up a lot of the 'section' code.  Now let's hit those templates again.