Started some refactoring for paired intersection