Working on the CLI some more.