Expand templates

From Cycling Logic

Expand templates