more progress on the new plotting functionality