Finally got the dataflow on paper, things are making sense now, cleared out some cruft
We can match now, but not very robustly. Created a simple test case.