Added: CLI draft