Add more templates
Finish up for saturday
Merge branch 'feature-templates'