Collision Detection Revamp (Part 1)