Refactor grid calculation to handle interpolation on farther points without having to build enormous grids
Fix #7