finished and working
Merge pull request #7 from tomcollins/refactor-interp

finished and working