first take on templates
Merge branch 'templates'