DEV: Begin to switch to new interpolator classes