Working through changes to templates.  Still only partial.