New template system ref #43