2D integrator
Major internal re-structuring, preparing for interpolated response surfaces