Switch to shape_plan

Not optimized yet.  Eats babies.  And no shaper uses the shape_plan.
3 files changed