Handle more edge overlapping cases

Currently we only handle the first 6 cases, 3 left to implement:

```
   ---x---
---x---

   ------
---x-----

   ------
---x----x---


   ---x---
   ----

   ------
   ------

   ------
   -----x---


   ---x--x---
      ----

   ---x---
      ----

   ---x---
      ---x---
```
