Another take at the CLI