Refactor 2d

Ready for merge.  Lookin at you, Caswell
I still have issues with this language (1D-contour plot?)  Given that this derives from `AbstarteDataView2D`....