Feature/interstop distance

No test coverage in this commit - testing still needs to be resolved generally after the refactor