Lots of good changes, but kerf still not fully working.
Next: moving to proper geometry lib