Fixed the non-working velocity based interpolation for now.  Need to revisit a new plan.