Put more functionality into plots, and out of the CLI