Merged in overlay. Added stagger to highlight pins. Combined type and color data