Partial work on the CLI