Some more works towards completing the collision component