Feature/interstop distance

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