All shapes added, collision detection working correctly