WIP on templating 2