Multiple regs and driver files for different geo/time controls.
Re-work of Plotting
Merge branch 'test-run' into develop