Merge pull request #70 from thoraxe/interpolation

hackily implements linear interpolation, i think wrongly

Merge pull request #69 from thoraxe/snapshot-prep

Preparation for snapshot interpolation