Collisions

Sadly couldn't test anything, just uncomment!