Collision detection (broken)

Fixed brokenness