Feature/interstop distance

These still require proper test coverage, which will require some work on the test suite