Follow-up to #11 Continue the implementation of the CLI.
Follow-up to #11
Continue the implementation of the CLI.