(imported from TODO) # plot * Look at with-plot - change to with-datasource? * also add the ds_* keywords as part of the with-datasource?