initial commit
almost functional again.
imperfect smoothing deployed.
Merge pull request #1 from Magdain/collide_rewrite

Collide rewrite