Changes to controller and DataPlotter

Changes made by Neal and Jason, committed by Andrew. I'm not sure what
the state of the changes is at the time of this save.