More work on the basic templates.