Fixes to first working version. Interpolation is an option defaulting to false