Work on bug #8161.  This is the first blush at the templates.