Finally organising the templating