Expand templates

From thecrankyhermit

Expand templates