Expand templates

From Burden's Landing
Expand templates