Expand templates

From Leo's Notes
Expand templates