Filling out a little more on the capabilities for the CLI