Continuing work on templating