worked on templating stuff