added most recent cli changes
Merge branch 'cliRefactor'