Cli scaffolding
Merge branch 'refs/heads/CLI'