Expand templates

From Joe's Boredom
Expand templates