diff --git a/data/furniture.json b/data/furniture.json
new file mode 100644
index 0000000..19c2710
--- /dev/null
+++ b/data/furniture.json
@@ -0,0 +1,121 @@
+{
+  "units": [
+    {
+      "name": "Library Kallax",
+      "openings": [
+        {
+          "id": "library-kallax-a1",
+          "label": "A1",
+          "zone": "oversize",
+          "width_in": 26.5,
+          "height_in": 13.25,
+          "depth_in": 15.4
+        },
+        {
+          "id": "library-kallax-a2",
+          "label": "A2",
+          "zone": "oversize",
+          "width_in": 26.5,
+          "height_in": 13.25,
+          "depth_in": 15.4
+        },
+        {
+          "id": "library-kallax-b1",
+          "label": "B1",
+          "zone": "cubes",
+          "width_in": 13.25,
+          "height_in": 13.25,
+          "depth_in": 15.4
+        },
+        {
+          "id": "library-kallax-b2",
+          "label": "B2",
+          "zone": "cubes",
+          "width_in": 13.25,
+          "height_in": 13.25,
+          "depth_in": 15.4
+        },
+        {
+          "id": "library-kallax-b3",
+          "label": "B3",
+          "zone": "cubes",
+          "width_in": 13.25,
+          "height_in": 13.25,
+          "depth_in": 15.4
+        },
+        {
+          "id": "library-kallax-b4",
+          "label": "B4",
+          "zone": "cubes",
+          "width_in": 13.25,
+          "height_in": 13.25,
+          "depth_in": 15.4
+        },
+        {
+          "id": "library-kallax-c1",
+          "label": "C1",
+          "zone": "cubes",
+          "width_in": 13.25,
+          "height_in": 13.25,
+          "depth_in": 15.4
+        },
+        {
+          "id": "library-kallax-c2",
+          "label": "C2",
+          "zone": "cubes",
+          "width_in": 13.25,
+          "height_in": 13.25,
+          "depth_in": 15.4
+        },
+        {
+          "id": "library-kallax-c3",
+          "label": "C3",
+          "zone": "cubes",
+          "width_in": 13.25,
+          "height_in": 13.25,
+          "depth_in": 15.4
+        },
+        {
+          "id": "library-kallax-c4",
+          "label": "C4",
+          "zone": "cubes",
+          "width_in": 13.25,
+          "height_in": 13.25,
+          "depth_in": 15.4
+        },
+        {
+          "id": "library-kallax-d1",
+          "label": "D1",
+          "zone": "cubes",
+          "width_in": 13.25,
+          "height_in": 13.25,
+          "depth_in": 15.4
+        },
+        {
+          "id": "library-kallax-d2",
+          "label": "D2",
+          "zone": "cubes",
+          "width_in": 13.25,
+          "height_in": 13.25,
+          "depth_in": 15.4
+        },
+        {
+          "id": "library-kallax-d3",
+          "label": "D3",
+          "zone": "cubes",
+          "width_in": 13.25,
+          "height_in": 13.25,
+          "depth_in": 15.4
+        },
+        {
+          "id": "library-kallax-d4",
+          "label": "D4",
+          "zone": "cubes",
+          "width_in": 13.25,
+          "height_in": 13.25,
+          "depth_in": 15.4
+        }
+      ]
+    }
+  ]
+}
diff --git a/src/bggpipe/templates/pages/shelves.html b/src/bggpipe/templates/pages/shelves.html
index 4243eda..11c8324 100644
--- a/src/bggpipe/templates/pages/shelves.html
+++ b/src/bggpipe/templates/pages/shelves.html
@@ -110,13 +110,17 @@ function unitBlock(u) {
         <button class="delunit danger" data-unit="${esc(u.name)}">remove unit</button>
       </span></div>
     <form class="editform addopeningform" data-unit="${esc(u.name)}" hidden>
-      <label>Label <input name="label" required placeholder="wide top"></label>
+      <label>Rows <input name="rows" inputmode="numeric" size="3" value="1"></label>
+      <label>Columns <input name="cols" inputmode="numeric" size="3" value="1"></label>
+      <label>Label <input name="label" placeholder="wide top — for a single opening"></label>
       <label>Zone <input name="zone"></label>
-      <label>W <input name="width_in" size="5"></label>
-      <label>H <input name="height_in" size="5"></label>
-      <label>D <input name="depth_in" size="5"></label>
+      <label>W <input name="width_in" size="5" placeholder="13.25"></label>
+      <label>H <input name="height_in" size="5" placeholder="13.25"></label>
+      <label>D <input name="depth_in" size="5" placeholder="15.4"></label>
       <span class="editactions"><button type="submit" class="primary">add</button></span>
-      <span class="edithint">all three sizes, or none for a no-limit spot</span>
+      <span class="edithint">a grid (rows × columns) continues the row letters —
+        3 × 4 under an existing A row becomes B1…D4; or set 1 × 1 and a label
+        for a single opening. All three sizes, or none for a no-limit spot.</span>
     </form>
     <div class="openings">${u.openings.map(openingCell).join("")}</div>
   </section>`;
@@ -259,12 +263,27 @@ function wire() {
         alert("Give all three interior dimensions, or none for a no-limit spot.");
         return;
       }
-      await post("/api/furniture/add-openings", {
-        unit: form.dataset.unit, label: f.label.value, zone: f.zone.value,
-        width_in: parseFloat(f.width_in.value) || null,
-        height_in: parseFloat(f.height_in.value) || null,
-        depth_in: parseFloat(f.depth_in.value) || null,
-      });
+      const rows = parseInt(f.rows.value) || 1;
+      const cols = parseInt(f.cols.value) || 1;
+      const grid = rows * cols > 1;
+      if (!grid && !f.label.value.trim()) {
+        alert("A single opening needs a label (or set rows × columns for a grid).");
+        return;
+      }
+      const btn = form.querySelector('button[type="submit"]');
+      if (btn.disabled) return;
+      btn.disabled = true;
+      try {
+        await post("/api/furniture/add-openings", {
+          unit: form.dataset.unit, zone: f.zone.value,
+          ...(grid ? {rows, cols} : {label: f.label.value}),
+          width_in: parseFloat(f.width_in.value) || null,
+          height_in: parseFloat(f.height_in.value) || null,
+          depth_in: parseFloat(f.depth_in.value) || null,
+        });
+      } finally {
+        btn.disabled = false;
+      }
     });
 }