Added initial CLI version (in progress)