Starting to work on the CLI