Expand templates

From LS Student Workers
Expand templates