Further progress - text templates working