Started implementing improved CollisionHandler