Mostly-non-collision issue: fixed!

And then there was a woot.