pre-cleanup

This commit has the code that was on the way to getting a non-azimuthal
interpolation.