Finish first version of the CLI