More progress on templates