work on cli
work on templates