Expand templates

From capitalistManifesto
Expand templates