First 'working' version of the CLI