Revamp handling of moved stops. Still some failing tests, and more tests need to be written. Almost certainly still buggy.