Makes sense once I add more templates. Shall I go ahead and add the other cpis now? I was trying to keep the first commit light but easily add in this feature if there is the demand.