Expand templates

From OptimalScience
Expand templates