Started working on CLI