significant progress on templates