CLI done
wip