CLI updates, wip