Partial

Commented out code does not work yet, I think it might be the
intersection code.