WIP: CLI client - todo comments