Redraw

There are a lot of rules, and we ran into a problem. I had to spend some time re-drawing the plan as we worked because we couldn't fit the original plan.

Done