MNT: Intermediate commit for 2D refactor.  2D cross section view is currently broken.