Refactor 2d

Ready for merge.  Lookin at you, Caswell
Why do we have this class?