converted sevaral over to template group

@russellholt