Added linear and (currently broken) cubic interpolation