Started working on Cli