finally have both templates working