Initial work to improve the CLI.