more templates back into cli