Continue add cli, WIP