Fixup after rebase Also pull in the interpolator code, which is used for financial calculations. Fix up rebase