[186] Still adding collision detection