2d interposlation working
2d interpolation cleanup.
Merge branch '2d-interpolation'