Some work on the CLI.