Interpolator

Implementing Issue #266
Needs to be updated to current master.