"to sooner or later"..? Does that mean adding more templates...? Can you help me out here with an actual commit if that's the case?