merging cli into core