Rewrote a bunch of interpolation stuff, broke a few tests