This stuff needs to get doc'ed (and in the CLI tests).