Merge "switch from CLI to REST for consistency and because the CLI hates question...