The CLI calls are a little disjointed (and not documented). Fix them so they are consistent and make sense, then document.