Almost there on intersections

Getting this up to master so it can be stubbed in on the UI