diff --git a/packages/core/types/Legend.ts b/packages/core/types/Legend.ts
index 07a1e728f7..947d494230 100644
--- a/packages/core/types/Legend.ts
+++ b/packages/core/types/Legend.ts
@@ -15,4 +15,5 @@ export type Legend = {
   singleRow: boolean
   type: string
   verticalSorted: boolean
+  groupBy: string
 }
diff --git a/packages/map/examples/default-hex.json b/packages/map/examples/default-hex.json
index f77d65e45f..827ac8d1e0 100644
--- a/packages/map/examples/default-hex.json
+++ b/packages/map/examples/default-hex.json
@@ -138,10 +138,7 @@
     "showBubbleZeros": false
   },
   "mapPosition": {
-    "coordinates": [
-      0,
-      30
-    ],
+    "coordinates": [0, 30],
     "zoom": 1
   },
   "map": {
@@ -569,4 +566,4 @@
   },
   "usingWidgetLoader": true,
   "validated": 4.23
-}
\ No newline at end of file
+}
diff --git a/packages/map/index.html b/packages/map/index.html
index e07e937eb1..009e235bdf 100644
--- a/packages/map/index.html
+++ b/packages/map/index.html
@@ -30,8 +30,8 @@
 
   <body>
     <!-- DEFAULT EXAMPLES -->
-    <div class="react-container" data-config="/examples/private/wastewatermap.json"></div>
-    <div class="react-container" data-config="/examples/example-hex-map-with-filter.json"></div>
+    <!-- <div class="react-container" data-config="/examples/private/wastewatermap.json"></div>
+    <div class="react-container" data-config="/examples/example-hex-map-with-filter.json"></div> -->
 
     <!-- <div class="react-container" data-config="/examples/hex-colors.json"></div> -->
     <!-- <div class="react-container react-container--maps" data-config="/examples/annotation/index.json">/</div> -->
@@ -59,7 +59,7 @@
     <!--      data-config="https://www.cdc.gov/wcms/4.0/cdc-wp/data-presentation/examples/Scale-Based-Categorical-Map-With-Special-Classes.json"-->
     <!--    ></div>-->
     <!-- <div class="react-container react-container--maps" data-config="/examples/private/world-map.json"></div> -->
-    <!-- <div class="react-container react-container--maps" data-config="/examples/default-hex.json"></div> -->
+    <div class="react-container react-container--maps" data-config="/examples/default-hex.json"></div>
     <!-- <div class="react-container react-container--maps" data-config="/examples/default-hex.json"></div> -->
     <!--     <div class="react-container react-container&#45;&#45;maps" data-config="/examples/hex-with-arrows.json"></div>-->
 
diff --git a/packages/map/src/CdcMap.tsx b/packages/map/src/CdcMap.tsx
index e4a757a9e5..7f52859faf 100644
--- a/packages/map/src/CdcMap.tsx
+++ b/packages/map/src/CdcMap.tsx
@@ -353,6 +353,7 @@ const CdcMap = ({
 
     // Legend - Update when runtimeData does
     const legend = generateRuntimeLegend(state, runtimeData, hashLegend)
+
     setRuntimeLegend(legend)
   }, [
     runtimeData,
diff --git a/packages/map/src/_stories/CdcMap.Legend.stories.tsx b/packages/map/src/_stories/CdcMap.Legend.stories.tsx
index c05bd6529b..23fceb6cb8 100644
--- a/packages/map/src/_stories/CdcMap.Legend.stories.tsx
+++ b/packages/map/src/_stories/CdcMap.Legend.stories.tsx
@@ -38,3 +38,12 @@ export const Legend_Bottom_Single_Row: Story = {
     ])
   }
 }
+export const Legend_Grouped: Story = {
+  args: {
+    config: editConfigKeys(WastewaterMap, [
+      { path: ['legend', 'position'], value: 'side' },
+      { path: ['legend', 'style'], value: 'boxes' },
+      { path: ['legend', 'groupBy'], value: 'pathogen' }
+    ])
+  }
+}
diff --git a/packages/map/src/components/EditorPanel/components/EditorPanel.tsx b/packages/map/src/components/EditorPanel/components/EditorPanel.tsx
index a38849a0a8..0dfc559b84 100644
--- a/packages/map/src/components/EditorPanel/components/EditorPanel.tsx
+++ b/packages/map/src/components/EditorPanel/components/EditorPanel.tsx
@@ -368,6 +368,15 @@ const EditorPanel = () => {
           }
         })
         break
+      case 'legendGroupBy':
+        setState({
+          ...state,
+          legend: {
+            ...state.legend,
+            groupBy: value
+          }
+        })
+        break
       case 'legendSubStyle':
         setState({
           ...state,
@@ -2315,6 +2324,17 @@ const EditorPanel = () => {
                     }}
                   />
                 )}
+
+                {'navigation' !== state.general.type && state.legend.type === 'category' && (
+                  <Select
+                    label='Legend Group By :'
+                    value={legend.groupBy || ''}
+                    options={columnsOptions.map(c => c.key)}
+                    onChange={event => {
+                      handleEditorChanges('legendGroupBy', event.target.value)
+                    }}
+                  />
+                )}
                 {'navigation' !== state.general.type && state.legend.style === 'gradient' && (
                   <label>
                     <span className='edit-label'>Gradient Style</span>
diff --git a/packages/map/src/components/Legend/components/Legend.tsx b/packages/map/src/components/Legend/components/Legend.tsx
index dca780fa36..e5f52b6afe 100644
--- a/packages/map/src/components/Legend/components/Legend.tsx
+++ b/packages/map/src/components/Legend/components/Legend.tsx
@@ -10,6 +10,7 @@ import LegendShape from '@cdc/core/components/LegendShape'
 import LegendGradient from '@cdc/core/components/Legend/Legend.Gradient'
 import LegendItemHex from './LegendItem.Hex'
 import Button from '@cdc/core/components/elements/Button'
+import LegendGroup from './LegendGroup/Legend.Group'
 
 import useDataVizClasses from '@cdc/core/helpers/useDataVizClasses'
 import ConfigContext from '../../../context'
@@ -116,7 +117,6 @@ const Legend = forwardRef<HTMLDivElement, LegendProps>((props, ref) => {
       }
 
       return (
-        // eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-noninteractive-element-interactions
         <li
           className={handleListItemClass()}
           key={idx}
@@ -292,7 +292,9 @@ const Legend = forwardRef<HTMLDivElement, LegendProps>((props, ref) => {
               }
               config={state}
             />
-            {!!legendListItems.length && (
+            <LegendGroup legendItems={getFormattedLegendItems()} />
+
+            {!!legendListItems.length && ['Select Option', ''].includes(state.legend.groupBy) && (
               <ul className={legendClasses.ul.join(' ') || ''} aria-label='Legend items'>
                 {legendListItems}
               </ul>
diff --git a/packages/map/src/components/Legend/components/LegendGroup/Legend.Group.css b/packages/map/src/components/Legend/components/LegendGroup/Legend.Group.css
new file mode 100644
index 0000000000..80114a07ba
--- /dev/null
+++ b/packages/map/src/components/Legend/components/LegendGroup/Legend.Group.css
@@ -0,0 +1,27 @@
+.group-label {
+  font-weight: 500;
+  font-family: Nunito, sans-serif;
+  font-size: 1rem;
+  margin-bottom: 0.5rem;
+}
+.group-list-item {
+  list-style: none;
+  font-weight: 400;
+  font-size: 0.889rem;
+  margin-top: 0.5rem !important;
+  cursor: pointer;
+}
+
+.group-container {
+  margin-bottom: 2rem;
+}
+
+.legend-group-item-disable {
+  opacity: 0.4;
+}
+
+.legend-group-item-not-disable {
+  outline: 1px solid #005ea2;
+  outline-offset: 5px;
+  border-radius: 1px;
+}
diff --git a/packages/map/src/components/Legend/components/LegendGroup/Legend.Group.tsx b/packages/map/src/components/Legend/components/LegendGroup/Legend.Group.tsx
new file mode 100644
index 0000000000..73c2e499f9
--- /dev/null
+++ b/packages/map/src/components/Legend/components/LegendGroup/Legend.Group.tsx
@@ -0,0 +1,129 @@
+import { useContext, useMemo } from 'react'
+import './legend.group.css'
+import LegendShape from '@cdc/core/components/LegendShape'
+import { toggleLegendActive } from '@cdc/map/src/helpers/toggleLegendActive'
+import ErrorBoundary from '@cdc/core/components/ErrorBoundary'
+import ConfigContext from '../../../../context'
+
+interface LegendItem {
+  color: string
+  label: string
+  disabled?: boolean
+  special: boolean
+}
+
+interface GroupedData {
+  [key: string]: LegendItem[]
+}
+
+const LegendGroup = ({ legendItems }) => {
+  const { runtimeLegend, setAccessibleStatus, setRuntimeLegend, state } = useContext(ConfigContext)
+
+  const groupLegendItems = (items: LegendItem[], data: object[], groupByKey: string): GroupedData => {
+    if (!groupByKey || !data || !items) return {}
+
+    const columnKey = state.columns.primary.name || ''
+    const result: GroupedData = {}
+
+    for (const row of data) {
+      const groupValue = row[groupByKey]
+      if (!groupValue) continue
+
+      const label = row[columnKey]
+      const match = items.find(i => i.label === label)
+      if (!match) continue
+
+      result[groupValue] ||= []
+      if (!result[groupValue].some(i => i.label === label)) {
+        result[groupValue].push(match)
+      }
+    }
+
+    // Sort items in each group
+    Object.entries(result).forEach(([group, items]) => {
+      result[group] = [...items].sort(
+        (a, b) =>
+          (state.legend.categoryValuesOrder ?? []).indexOf(a.label) -
+          (state.legend.categoryValuesOrder ?? []).indexOf(b.label)
+      )
+    })
+
+    return result
+  }
+
+  const handleToggleItem = (item: LegendItem) => {
+    const newItems = runtimeLegend.items.map(legend =>
+      legend.value === item.label ? { ...legend, disabled: !legend.disabled } : legend
+    )
+
+    const wasDisabled = runtimeLegend.items.find(i => i.value === item.label)?.disabled
+    const delta = wasDisabled ? -1 : 1
+
+    setRuntimeLegend({
+      ...runtimeLegend,
+      items: newItems,
+      disabledAmt: (runtimeLegend.disabledAmt ?? 0) + delta
+    })
+
+    setAccessibleStatus(
+      `${wasDisabled ? 'Enabled' : 'Disabled'} legend item ${item.label}. Please reference the data table.`
+    )
+  }
+
+  const getLegendItemClasses = (item: LegendItem, hasDisabledItems: boolean) => {
+    return [
+      'group-list-item',
+      item.disabled ? 'legend-group-item-disable' : hasDisabledItems ? 'legend-group-item-not-disable' : ''
+    ]
+      .filter(Boolean)
+      .join(' ')
+  }
+
+  // Новый способ без viewport
+  const gridClass =
+    state.legend.position === 'bottom' || state.legend.position === 'top'
+      ? 'col-12 col-sm-6 col-md-4 col-lg-3'
+      : 'col-12'
+
+  const groupedData = useMemo(
+    () => groupLegendItems(legendItems, state.data, state.legend.groupBy),
+    [legendItems, state.data, state.legend.groupBy]
+  )
+
+  const hasDisabledItems = runtimeLegend.items.some(item => item.disabled)
+
+  return (
+    <ErrorBoundary component='Grouped Legend'>
+      <div className='row'>
+        {Object.entries(groupedData).map(([groupName, items]) => (
+          <div className={`${gridClass} group-container`} key={groupName}>
+            <p className='group-label'>{groupName}</p>
+            <ul className='row'>
+              {items.map((item, index) => (
+                <li
+                  key={`${item.label}-${index}`}
+                  role='button'
+                  tabIndex={0}
+                  title={`Legend item ${item.label} - Click to disable`}
+                  className={getLegendItemClasses(item, hasDisabledItems)}
+                  onClick={() => handleToggleItem(item)}
+                  onKeyDown={e => {
+                    if (e.key === 'Enter' || e.key === ' ') {
+                      e.preventDefault()
+                      toggleLegendActive(index, item.label, runtimeLegend, setRuntimeLegend, setAccessibleStatus)
+                    }
+                  }}
+                >
+                  <LegendShape shape={state.legend.style === 'boxes' ? 'square' : 'circle'} fill={item.color} />
+                  <span>{item.label}</span>
+                </li>
+              ))}
+            </ul>
+          </div>
+        ))}
+      </div>
+    </ErrorBoundary>
+  )
+}
+
+export default LegendGroup
diff --git a/packages/map/src/data/initial-state.js b/packages/map/src/data/initial-state.js
index c0cb1815de..6210c692d8 100644
--- a/packages/map/src/data/initial-state.js
+++ b/packages/map/src/data/initial-state.js
@@ -72,7 +72,8 @@ export default {
     subStyle: 'linear blocks',
     tickRotation: '',
     singleColumnLegend: false,
-    hideBorder: false
+    hideBorder: false,
+    groupBy: ''
   },
   filters: [],
   table: {
