Ongoing work on the CLI.