Started adding the CLI interface