WIP
Finished templates
Merge branch 'template'