Very rough initial draft of CLI v2 options