diff --git a/data/cpu/amd/2016/desktop/amd-2d3151a2m88e4.json b/data/cpu/amd/2016/desktop/amd-2d3151a2m88e4.json
new file mode 100644
index 0000000..bec4f12
--- /dev/null
+++ b/data/cpu/amd/2016/desktop/amd-2d3151a2m88e4.json
@@ -0,0 +1,39 @@
+{
+  "slug": "amd-2d3151a2m88e4",
+  "name": "AMD Eng Sample 2D3151A2M88E4",
+  "manufacturer": "amd",
+  "sample_class": "es",
+  "qspec": null,
+  "opn": "2D3151A2M88E4",
+  "stepping": null,
+  "cpuid": null,
+  "sample_revision": "es2",
+  "retail_equivalent": "ryzen-7-1800x",
+  "first_seen_date": "2016-12-24",
+  "release_date": null,
+  "segment": "desktop",
+  "architecture": "Zen",
+  "socket": "AM4",
+  "process_node": "14 nm",
+  "cores": 8,
+  "threads": 16,
+  "p_cores": null,
+  "e_cores": null,
+  "base_clock_ghz": 3.15,
+  "boost_clock_ghz": 3.5,
+  "l3_cache_mb": null,
+  "tdp_w": null,
+  "max_tdp_w": null,
+  "integrated_graphics": null,
+  "memory_support": "DDR4",
+  "msrp_usd": null,
+  "verified": false,
+  "markings": [
+    "AMD Eng Sample"
+  ],
+  "notes": "Summit Ridge 8-core ES2 tested by CanardPC. Prefix 2 = ES2. Clocks below retail Ryzen 7 1800X.",
+  "source_urls": [
+    "https://www.guru3d.com/story/french-magazing-posts-engineering-sample-amd-ryzen-processor-benchmarks/",
+    "https://en.wikipedia.org/wiki/Zen_(microarchitecture)"
+  ]
+}
diff --git a/data/cpu/amd/2020/desktop/amd-100-000000059-14.json b/data/cpu/amd/2020/desktop/amd-100-000000059-14.json
new file mode 100644
index 0000000..abf926c
--- /dev/null
+++ b/data/cpu/amd/2020/desktop/amd-100-000000059-14.json
@@ -0,0 +1,39 @@
+{
+  "slug": "amd-100-000000059-14",
+  "name": "AMD Eng Sample 100-000000059-14",
+  "manufacturer": "amd",
+  "sample_class": "es",
+  "qspec": null,
+  "opn": "100-000000059-14",
+  "stepping": null,
+  "cpuid": null,
+  "sample_revision": "es1",
+  "retail_equivalent": "ryzen-9-5950x",
+  "first_seen_date": "2020-05-19",
+  "release_date": null,
+  "segment": "desktop",
+  "architecture": "Zen 3",
+  "socket": "AM4",
+  "process_node": "TSMC 7 nm",
+  "cores": 16,
+  "threads": 32,
+  "p_cores": null,
+  "e_cores": null,
+  "base_clock_ghz": 3.7,
+  "boost_clock_ghz": 4.6,
+  "l3_cache_mb": 64.0,
+  "tdp_w": null,
+  "max_tdp_w": null,
+  "integrated_graphics": null,
+  "memory_support": "DDR4",
+  "msrp_usd": null,
+  "verified": false,
+  "markings": [
+    "AMD Eng Sample"
+  ],
+  "notes": "Vermeer 16C/32T engineering sample. OPN clock field 46/37. Public listing via Igor'sLAB / VideoCardz.",
+  "source_urls": [
+    "https://videocardz.com/newz/amd-16-core-zen3-ryzen-9-4950x-engineering-sample-boosts-up-to-4-9-ghz",
+    "https://en.wikipedia.org/wiki/Zen_3"
+  ]
+}
diff --git a/data/cpu/amd/2020/desktop/amd-100-000000061-06.json b/data/cpu/amd/2020/desktop/amd-100-000000061-06.json
new file mode 100644
index 0000000..67e42d8
--- /dev/null
+++ b/data/cpu/amd/2020/desktop/amd-100-000000061-06.json
@@ -0,0 +1,39 @@
+{
+  "slug": "amd-100-000000061-06",
+  "name": "AMD Eng Sample 100-000000061-06",
+  "manufacturer": "amd",
+  "sample_class": "es",
+  "qspec": null,
+  "opn": "100-000000061-06",
+  "stepping": null,
+  "cpuid": null,
+  "sample_revision": "es1",
+  "retail_equivalent": "ryzen-9-5950x",
+  "first_seen_date": "2020-08-07",
+  "release_date": null,
+  "segment": "desktop",
+  "architecture": "Zen 3",
+  "socket": "AM4",
+  "process_node": "TSMC 7 nm",
+  "cores": 16,
+  "threads": 32,
+  "p_cores": null,
+  "e_cores": null,
+  "base_clock_ghz": 3.7,
+  "boost_clock_ghz": 4.9,
+  "l3_cache_mb": 64.0,
+  "tdp_w": null,
+  "max_tdp_w": null,
+  "integrated_graphics": null,
+  "memory_support": "DDR4",
+  "msrp_usd": null,
+  "verified": false,
+  "markings": [
+    "AMD Eng Sample"
+  ],
+  "notes": "Later Vermeer 16C ES. OPN clock field 49/37 \u2014 closer to retail 5950X boost.",
+  "source_urls": [
+    "https://videocardz.com/newz/amd-16-core-zen3-ryzen-9-4950x-engineering-sample-boosts-up-to-4-9-ghz",
+    "https://en.wikipedia.org/wiki/Zen_3"
+  ]
+}
diff --git a/data/cpu/amd/2020/desktop/amd-100-000000065-04.json b/data/cpu/amd/2020/desktop/amd-100-000000065-04.json
new file mode 100644
index 0000000..f94f368
--- /dev/null
+++ b/data/cpu/amd/2020/desktop/amd-100-000000065-04.json
@@ -0,0 +1,39 @@
+{
+  "slug": "amd-100-000000065-04",
+  "name": "AMD Eng Sample 100-000000065-04",
+  "manufacturer": "amd",
+  "sample_class": "es",
+  "qspec": null,
+  "opn": "100-000000065-04",
+  "stepping": null,
+  "cpuid": null,
+  "sample_revision": "es1",
+  "retail_equivalent": "ryzen-9-5950x",
+  "first_seen_date": "2020-08-07",
+  "release_date": null,
+  "segment": "desktop",
+  "architecture": "Zen 3",
+  "socket": "AM4",
+  "process_node": "TSMC 7 nm",
+  "cores": 16,
+  "threads": 32,
+  "p_cores": null,
+  "e_cores": null,
+  "base_clock_ghz": 3.6,
+  "boost_clock_ghz": 4.6,
+  "l3_cache_mb": 64.0,
+  "tdp_w": null,
+  "max_tdp_w": null,
+  "integrated_graphics": null,
+  "memory_support": "DDR4",
+  "msrp_usd": null,
+  "verified": false,
+  "markings": [
+    "AMD Eng Sample"
+  ],
+  "notes": "Vermeer 16C ES. OPN clock field 46/36.",
+  "source_urls": [
+    "https://videocardz.com/newz/amd-16-core-zen3-ryzen-9-4950x-engineering-sample-boosts-up-to-4-9-ghz",
+    "https://en.wikipedia.org/wiki/Zen_3"
+  ]
+}
diff --git a/data/cpu/amd/2024/desktop/amd-100-000001290-21.json b/data/cpu/amd/2024/desktop/amd-100-000001290-21.json
new file mode 100644
index 0000000..507f4f7
--- /dev/null
+++ b/data/cpu/amd/2024/desktop/amd-100-000001290-21.json
@@ -0,0 +1,39 @@
+{
+  "slug": "amd-100-000001290-21",
+  "name": "AMD Eng Sample 100-000001290-21",
+  "manufacturer": "amd",
+  "sample_class": "es",
+  "qspec": null,
+  "opn": "100-000001290-21",
+  "stepping": "A0",
+  "cpuid": null,
+  "sample_revision": "es1",
+  "retail_equivalent": "ryzen-5-9600x",
+  "first_seen_date": "2024-03-28",
+  "release_date": null,
+  "segment": "desktop",
+  "architecture": "Zen 5",
+  "socket": "AM5",
+  "process_node": "TSMC N4P",
+  "cores": 6,
+  "threads": 12,
+  "p_cores": null,
+  "e_cores": null,
+  "base_clock_ghz": null,
+  "boost_clock_ghz": null,
+  "l3_cache_mb": null,
+  "tdp_w": 105,
+  "max_tdp_w": null,
+  "integrated_graphics": null,
+  "memory_support": "DDR5",
+  "msrp_usd": null,
+  "verified": false,
+  "markings": [
+    "AMD Eng Sample"
+  ],
+  "notes": "Granite Ridge 6C/12T A0 engineering sample. Early stepping. 105 W TDP listing.",
+  "source_urls": [
+    "https://www.techpowerup.com/320980/alleged-amd-ryzen-granite-ridge-engineering-samples-pop-up-in-shipping-manifests",
+    "https://en.wikipedia.org/wiki/Zen_5"
+  ]
+}
diff --git a/data/cpu/amd/2024/desktop/amd-100-000001404-01.json b/data/cpu/amd/2024/desktop/amd-100-000001404-01.json
new file mode 100644
index 0000000..67de45f
--- /dev/null
+++ b/data/cpu/amd/2024/desktop/amd-100-000001404-01.json
@@ -0,0 +1,39 @@
+{
+  "slug": "amd-100-000001404-01",
+  "name": "AMD Eng Sample 100-000001404-01",
+  "manufacturer": "amd",
+  "sample_class": "es",
+  "qspec": null,
+  "opn": "100-000001404-01",
+  "stepping": "B0",
+  "cpuid": null,
+  "sample_revision": "es1",
+  "retail_equivalent": "ryzen-7-9700x",
+  "first_seen_date": "2024-03-28",
+  "release_date": null,
+  "segment": "desktop",
+  "architecture": "Zen 5",
+  "socket": "AM5",
+  "process_node": "TSMC N4P",
+  "cores": 8,
+  "threads": 16,
+  "p_cores": null,
+  "e_cores": null,
+  "base_clock_ghz": null,
+  "boost_clock_ghz": null,
+  "l3_cache_mb": null,
+  "tdp_w": 170,
+  "max_tdp_w": null,
+  "integrated_graphics": null,
+  "memory_support": "DDR5",
+  "msrp_usd": null,
+  "verified": false,
+  "markings": [
+    "AMD Eng Sample"
+  ],
+  "notes": "Granite Ridge 8C/16T B0 engineering sample from shipping manifests. 170 W TDP listing. Not a retail SKU.",
+  "source_urls": [
+    "https://www.techpowerup.com/320980/alleged-amd-ryzen-granite-ridge-engineering-samples-pop-up-in-shipping-manifests",
+    "https://en.wikipedia.org/wiki/Zen_5"
+  ]
+}
diff --git a/data/cpu/intel/2015/desktop/intel-qh8e.json b/data/cpu/intel/2015/desktop/intel-qh8e.json
new file mode 100644
index 0000000..00cffcf
--- /dev/null
+++ b/data/cpu/intel/2015/desktop/intel-qh8e.json
@@ -0,0 +1,39 @@
+{
+  "slug": "intel-qh8e",
+  "name": "Intel QH8E Engineering Sample",
+  "manufacturer": "intel",
+  "sample_class": "es",
+  "qspec": "QH8E",
+  "opn": null,
+  "stepping": "A0",
+  "cpuid": "506E0",
+  "sample_revision": "es1",
+  "retail_equivalent": null,
+  "first_seen_date": "2015-01-01",
+  "release_date": null,
+  "segment": "desktop",
+  "architecture": "Skylake",
+  "socket": "LGA1151",
+  "process_node": "14 nm",
+  "cores": 4,
+  "threads": 8,
+  "p_cores": null,
+  "e_cores": null,
+  "base_clock_ghz": 2.2,
+  "boost_clock_ghz": 2.6,
+  "l3_cache_mb": null,
+  "tdp_w": 95,
+  "max_tdp_w": null,
+  "integrated_graphics": null,
+  "memory_support": "DDR4",
+  "msrp_usd": null,
+  "verified": false,
+  "markings": [
+    "Intel Confidential"
+  ],
+  "notes": "Skylake A0 4C/8T engineering sample. Early stepping, BCLK overclock only.",
+  "source_urls": [
+    "https://oldrigrevive.com/lga-1151/complete-cpu-list/",
+    "https://en.wikipedia.org/wiki/Skylake_(microarchitecture)"
+  ]
+}
diff --git a/data/cpu/intel/2016/desktop/intel-qkyp.json b/data/cpu/intel/2016/desktop/intel-qkyp.json
new file mode 100644
index 0000000..347b923
--- /dev/null
+++ b/data/cpu/intel/2016/desktop/intel-qkyp.json
@@ -0,0 +1,39 @@
+{
+  "slug": "intel-qkyp",
+  "name": "Intel QKYP Engineering Sample",
+  "manufacturer": "intel",
+  "sample_class": "es",
+  "qspec": "QKYP",
+  "opn": null,
+  "stepping": "A0",
+  "cpuid": "506E8",
+  "sample_revision": "es1",
+  "retail_equivalent": "core-i7-7700k",
+  "first_seen_date": "2016-08-01",
+  "release_date": null,
+  "segment": "desktop",
+  "architecture": "Kaby Lake",
+  "socket": "LGA1151",
+  "process_node": "14 nm",
+  "cores": 4,
+  "threads": 8,
+  "p_cores": null,
+  "e_cores": null,
+  "base_clock_ghz": 3.7,
+  "boost_clock_ghz": 4.1,
+  "l3_cache_mb": 8.0,
+  "tdp_w": 95,
+  "max_tdp_w": null,
+  "integrated_graphics": "HD 630",
+  "memory_support": "DDR4",
+  "msrp_usd": null,
+  "verified": false,
+  "markings": [
+    "Intel Confidential"
+  ],
+  "notes": "Kaby Lake A0 ES mapped to Core i7-7700K. Unlocked multiplier on this sample.",
+  "source_urls": [
+    "https://oldrigrevive.com/lga-1151/complete-cpu-list/",
+    "https://en.wikipedia.org/wiki/Kaby_Lake"
+  ]
+}
diff --git a/data/cpu/intel/2021/desktop/intel-qx7e.json b/data/cpu/intel/2021/desktop/intel-qx7e.json
new file mode 100644
index 0000000..d889f6f
--- /dev/null
+++ b/data/cpu/intel/2021/desktop/intel-qx7e.json
@@ -0,0 +1,39 @@
+{
+  "slug": "intel-qx7e",
+  "name": "Intel QX7E Engineering Sample",
+  "manufacturer": "intel",
+  "sample_class": "es",
+  "qspec": "QX7E",
+  "opn": null,
+  "stepping": "B0",
+  "cpuid": null,
+  "sample_revision": "es1",
+  "retail_equivalent": "core-i9-12900k",
+  "first_seen_date": "2021-08-01",
+  "release_date": null,
+  "segment": "desktop",
+  "architecture": "Alder Lake",
+  "socket": "LGA1700",
+  "process_node": "Intel 7",
+  "cores": 16,
+  "threads": 24,
+  "p_cores": 8,
+  "e_cores": 8,
+  "base_clock_ghz": 1.3,
+  "boost_clock_ghz": 5.3,
+  "l3_cache_mb": 30.0,
+  "tdp_w": null,
+  "max_tdp_w": null,
+  "integrated_graphics": "Intel UHD Graphics",
+  "memory_support": "DDR5 / DDR4",
+  "msrp_usd": null,
+  "verified": false,
+  "markings": [
+    "Intel Confidential"
+  ],
+  "notes": "Alder Lake large-die B0/A0 ES. Slightly higher clocks than QXLB. Top PCIe 5.0 slot disabled.",
+  "source_urls": [
+    "https://oldrigrevive.com/lga1700/full-es-list/",
+    "https://en.wikipedia.org/wiki/Alder_Lake"
+  ]
+}
diff --git a/data/cpu/intel/2021/desktop/intel-qx7h.json b/data/cpu/intel/2021/desktop/intel-qx7h.json
new file mode 100644
index 0000000..5bf8a37
--- /dev/null
+++ b/data/cpu/intel/2021/desktop/intel-qx7h.json
@@ -0,0 +1,39 @@
+{
+  "slug": "intel-qx7h",
+  "name": "Intel QX7H Engineering Sample",
+  "manufacturer": "intel",
+  "sample_class": "es",
+  "qspec": "QX7H",
+  "opn": null,
+  "stepping": "B0",
+  "cpuid": null,
+  "sample_revision": "es1",
+  "retail_equivalent": "core-i9-12900kf",
+  "first_seen_date": "2021-08-01",
+  "release_date": null,
+  "segment": "desktop",
+  "architecture": "Alder Lake",
+  "socket": "LGA1700",
+  "process_node": "Intel 7",
+  "cores": 16,
+  "threads": 24,
+  "p_cores": 8,
+  "e_cores": 8,
+  "base_clock_ghz": 1.2,
+  "boost_clock_ghz": 5.1,
+  "l3_cache_mb": 30.0,
+  "tdp_w": null,
+  "max_tdp_w": null,
+  "integrated_graphics": null,
+  "memory_support": "DDR5 / DDR4",
+  "msrp_usd": null,
+  "verified": false,
+  "markings": [
+    "Intel Confidential"
+  ],
+  "notes": "Alder Lake large-die B0/A0 ES mapped to Core i9-12900KF. No iGPU. Top PCIe 5.0 slot disabled. Not a retail SKU.",
+  "source_urls": [
+    "https://oldrigrevive.com/lga1700/full-es-list/",
+    "https://en.wikipedia.org/wiki/Alder_Lake"
+  ]
+}
diff --git a/data/cpu/intel/2021/desktop/intel-qx7j.json b/data/cpu/intel/2021/desktop/intel-qx7j.json
new file mode 100644
index 0000000..e6b952f
--- /dev/null
+++ b/data/cpu/intel/2021/desktop/intel-qx7j.json
@@ -0,0 +1,39 @@
+{
+  "slug": "intel-qx7j",
+  "name": "Intel QX7J Engineering Sample",
+  "manufacturer": "intel",
+  "sample_class": "es",
+  "qspec": "QX7J",
+  "opn": null,
+  "stepping": "B0",
+  "cpuid": null,
+  "sample_revision": "es1",
+  "retail_equivalent": "core-i9-12900f",
+  "first_seen_date": "2021-08-01",
+  "release_date": null,
+  "segment": "desktop",
+  "architecture": "Alder Lake",
+  "socket": "LGA1700",
+  "process_node": "Intel 7",
+  "cores": 16,
+  "threads": 24,
+  "p_cores": 8,
+  "e_cores": 8,
+  "base_clock_ghz": 1.0,
+  "boost_clock_ghz": 4.0,
+  "l3_cache_mb": 30.0,
+  "tdp_w": null,
+  "max_tdp_w": null,
+  "integrated_graphics": null,
+  "memory_support": "DDR5 / DDR4",
+  "msrp_usd": null,
+  "verified": false,
+  "markings": [
+    "Intel Confidential"
+  ],
+  "notes": "Locked-multiplier Alder Lake large-die ES without iGPU. Top PCIe 5.0 slot disabled.",
+  "source_urls": [
+    "https://oldrigrevive.com/lga1700/full-es-list/",
+    "https://en.wikipedia.org/wiki/Alder_Lake"
+  ]
+}
diff --git a/data/cpu/intel/2021/desktop/intel-qxjb.json b/data/cpu/intel/2021/desktop/intel-qxjb.json
new file mode 100644
index 0000000..715a57a
--- /dev/null
+++ b/data/cpu/intel/2021/desktop/intel-qxjb.json
@@ -0,0 +1,39 @@
+{
+  "slug": "intel-qxjb",
+  "name": "Intel QXJB Engineering Sample",
+  "manufacturer": "intel",
+  "sample_class": "es",
+  "qspec": "QXJB",
+  "opn": null,
+  "stepping": "A0",
+  "cpuid": null,
+  "sample_revision": "es2",
+  "retail_equivalent": "core-i9-12900k",
+  "first_seen_date": "2021-06-01",
+  "release_date": null,
+  "segment": "desktop",
+  "architecture": "Alder Lake",
+  "socket": "LGA1700",
+  "process_node": "Intel 7",
+  "cores": 16,
+  "threads": 24,
+  "p_cores": 8,
+  "e_cores": 8,
+  "base_clock_ghz": 1.2,
+  "boost_clock_ghz": 4.0,
+  "l3_cache_mb": 30.0,
+  "tdp_w": null,
+  "max_tdp_w": null,
+  "integrated_graphics": "Intel UHD Graphics",
+  "memory_support": "DDR5 / DDR4",
+  "msrp_usd": null,
+  "verified": false,
+  "markings": [
+    "Intel Confidential"
+  ],
+  "notes": "Very early Alder Lake ES2. Unlocked multiplier, unstable IMC, PCIe bugs. Not a retail SKU.",
+  "source_urls": [
+    "https://oldrigrevive.com/lga1700/full-es-list/",
+    "https://en.wikipedia.org/wiki/Alder_Lake"
+  ]
+}
diff --git a/data/cpu/intel/2021/desktop/intel-qxje.json b/data/cpu/intel/2021/desktop/intel-qxje.json
new file mode 100644
index 0000000..c2abf51
--- /dev/null
+++ b/data/cpu/intel/2021/desktop/intel-qxje.json
@@ -0,0 +1,39 @@
+{
+  "slug": "intel-qxje",
+  "name": "Intel QXJE Engineering Sample",
+  "manufacturer": "intel",
+  "sample_class": "es",
+  "qspec": "QXJE",
+  "opn": null,
+  "stepping": "B0",
+  "cpuid": null,
+  "sample_revision": "es1",
+  "retail_equivalent": "core-i9-12900k",
+  "first_seen_date": "2021-09-01",
+  "release_date": null,
+  "segment": "desktop",
+  "architecture": "Alder Lake",
+  "socket": "LGA1700",
+  "process_node": "Intel 7",
+  "cores": 16,
+  "threads": 24,
+  "p_cores": 8,
+  "e_cores": 8,
+  "base_clock_ghz": 1.4,
+  "boost_clock_ghz": 5.4,
+  "l3_cache_mb": 30.0,
+  "tdp_w": null,
+  "max_tdp_w": null,
+  "integrated_graphics": "Intel UHD Graphics",
+  "memory_support": "DDR5 / DDR4",
+  "msrp_usd": null,
+  "verified": false,
+  "markings": [
+    "Intel Confidential"
+  ],
+  "notes": "Widely circulated first-wave Alder Lake ES. Higher power and heat than later QS/retail.",
+  "source_urls": [
+    "https://oldrigrevive.com/lga1700/full-es-list/",
+    "https://en.wikipedia.org/wiki/Alder_Lake"
+  ]
+}
diff --git a/data/cpu/intel/2021/desktop/intel-qxq3.json b/data/cpu/intel/2021/desktop/intel-qxq3.json
new file mode 100644
index 0000000..d264480
--- /dev/null
+++ b/data/cpu/intel/2021/desktop/intel-qxq3.json
@@ -0,0 +1,39 @@
+{
+  "slug": "intel-qxq3",
+  "name": "Intel QXQ3 Engineering Sample",
+  "manufacturer": "intel",
+  "sample_class": "es",
+  "qspec": "QXQ3",
+  "opn": null,
+  "stepping": "B0",
+  "cpuid": null,
+  "sample_revision": "es1",
+  "retail_equivalent": "core-i9-12900",
+  "first_seen_date": "2021-10-01",
+  "release_date": null,
+  "segment": "desktop",
+  "architecture": "Alder Lake",
+  "socket": "LGA1700",
+  "process_node": "Intel 7",
+  "cores": 16,
+  "threads": 24,
+  "p_cores": 8,
+  "e_cores": 8,
+  "base_clock_ghz": 1.2,
+  "boost_clock_ghz": 4.6,
+  "l3_cache_mb": 30.0,
+  "tdp_w": 65,
+  "max_tdp_w": null,
+  "integrated_graphics": "Intel UHD Graphics",
+  "memory_support": "DDR5 / DDR4",
+  "msrp_usd": null,
+  "verified": false,
+  "markings": [
+    "Intel Confidential"
+  ],
+  "notes": "Locked Alder Lake ES with a hard 65 W TDP cap. Mapped to Core i9-12900, not the K SKU.",
+  "source_urls": [
+    "https://oldrigrevive.com/es/lga_1700/lista-completa-es/",
+    "https://en.wikipedia.org/wiki/Alder_Lake"
+  ]
+}
diff --git a/data/cpu/intel/2021/desktop/intel-qxq4.json b/data/cpu/intel/2021/desktop/intel-qxq4.json
new file mode 100644
index 0000000..54101b3
--- /dev/null
+++ b/data/cpu/intel/2021/desktop/intel-qxq4.json
@@ -0,0 +1,39 @@
+{
+  "slug": "intel-qxq4",
+  "name": "Intel QXQ4 Engineering Sample",
+  "manufacturer": "intel",
+  "sample_class": "es",
+  "qspec": "QXQ4",
+  "opn": null,
+  "stepping": "B0",
+  "cpuid": null,
+  "sample_revision": "es1",
+  "retail_equivalent": "core-i7-12700",
+  "first_seen_date": "2021-10-01",
+  "release_date": null,
+  "segment": "desktop",
+  "architecture": "Alder Lake",
+  "socket": "LGA1700",
+  "process_node": "Intel 7",
+  "cores": 12,
+  "threads": 20,
+  "p_cores": 8,
+  "e_cores": 4,
+  "base_clock_ghz": 1.2,
+  "boost_clock_ghz": 4.4,
+  "l3_cache_mb": 25.0,
+  "tdp_w": null,
+  "max_tdp_w": null,
+  "integrated_graphics": "Intel UHD Graphics",
+  "memory_support": "DDR5 / DDR4",
+  "msrp_usd": null,
+  "verified": false,
+  "markings": [
+    "Intel Confidential"
+  ],
+  "notes": "Alder Lake 8P+4E ES mapped to Core i7-12700. Early sub-revisions may disable extra P-cores.",
+  "source_urls": [
+    "https://oldrigrevive.com/es/lga_1700/lista-completa-es/",
+    "https://en.wikipedia.org/wiki/Alder_Lake"
+  ]
+}
diff --git a/data/cpu/intel/2022/desktop/intel-q0d8.json b/data/cpu/intel/2022/desktop/intel-q0d8.json
new file mode 100644
index 0000000..30f23c7
--- /dev/null
+++ b/data/cpu/intel/2022/desktop/intel-q0d8.json
@@ -0,0 +1,39 @@
+{
+  "slug": "intel-q0d8",
+  "name": "Intel Q0D8 Engineering Sample",
+  "manufacturer": "intel",
+  "sample_class": "es",
+  "qspec": "Q0D8",
+  "opn": null,
+  "stepping": "A0",
+  "cpuid": null,
+  "sample_revision": "es1",
+  "retail_equivalent": "core-i9-13900k",
+  "first_seen_date": "2022-06-24",
+  "release_date": null,
+  "segment": "desktop",
+  "architecture": "Raptor Lake",
+  "socket": "LGA1700",
+  "process_node": "Intel 7",
+  "cores": 24,
+  "threads": 32,
+  "p_cores": 8,
+  "e_cores": 16,
+  "base_clock_ghz": 1.4,
+  "boost_clock_ghz": 3.8,
+  "l3_cache_mb": 36.0,
+  "tdp_w": null,
+  "max_tdp_w": null,
+  "integrated_graphics": "Intel UHD Graphics",
+  "memory_support": "DDR5 / DDR4",
+  "msrp_usd": null,
+  "verified": false,
+  "markings": [
+    "Intel Confidential"
+  ],
+  "notes": "Raptor Lake ES1 tested by Expreview three months before launch. P-cores 1.4\u20133.8 GHz; clocks well below retail i9-13900K.",
+  "source_urls": [
+    "https://videocardz.com/newz/intel-raptor-lake-es-cpu-tested-three-months-ahead-of-launch-20-faster-than-alder-lake-in-multi-threaded-tests",
+    "https://en.wikipedia.org/wiki/Raptor_Lake"
+  ]
+}
diff --git a/tests/test_classify.py b/tests/test_classify.py
index 313623f..b156d28 100644
--- a/tests/test_classify.py
+++ b/tests/test_classify.py
@@ -119,10 +119,14 @@ def test_declared_retail_wins() -> None:
     assert result.sample_class == "retail"
 
 
-def test_seed_qxlb_file_classifies_es() -> None:
+def test_every_catalog_record_classifies_as_es() -> None:
     from pathlib import Path
     import json
 
-    path = Path("data/cpu/intel/2021/desktop/intel-qxlb.json")
-    rec = json.loads(path.read_text(encoding="utf-8"))
-    assert classify(rec).sample_class == "es"
+    root = Path("data/cpu")
+    files = sorted(root.rglob("*.json"))
+    assert files, "catalog is empty"
+    for path in files:
+        rec = json.loads(path.read_text(encoding="utf-8"))
+        result = classify(rec)
+        assert result.sample_class == "es", f"{path}: {result.sample_class} {result.reasons}"