Many important changes that enables the use of ESMF as the main interpolation routine