Added interpolator and grid fitting capabilities