Revert "Total revamp to Collision/Handling"

This reverts commit f44ed72decc2642dfd7f48c3722cd5ff1a96c59d.