Work on integrating map collisions