beginnings of the templating
Merge branch 'daniel'