Revert "Revert "Collision works!""

This reverts commit 25cb79010d9963701db3ebd053fe67e65c4f9a97.