diff --git a/.gitignore b/.gitignore
index d81657df..7f156e2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -83,3 +83,6 @@ scripts/site_imports/wjf/idmap.json
 
 # work-PC publication clone: bundle drop folder for the transfer pipeline
 _transfer/
+
+# Local developer scratch notes and chat handoffs - never committed
+devnotes/
diff --git a/docs/CSV-IMPORT-GUIDE.md b/docs/CSV-IMPORT-GUIDE.md
index 1cc0a716..53b93d58 100644
--- a/docs/CSV-IMPORT-GUIDE.md
+++ b/docs/CSV-IMPORT-GUIDE.md
@@ -4,6 +4,24 @@ Short version: one CSV per table, a header row of exact column names, one record
 per row. The importer matches on natural keys, so re-importing updates instead of
 duplicating.
 
+## IMPORTANT: assets.csv alone will NOT show up in the lists
+
+An `assets.csv` row only creates the base asset record. A computer, machine, or
+measuring tool does NOT appear in its list view (PCs, Machines, Measuring Tools)
+until its matching subtype row is also imported:
+
+- A computer asset needs a row in `computers.csv` (`assetid` = the asset's
+  `assetnumber`) before it shows under PCs.
+- A machine asset needs a row in `machines.csv` before it shows under Machines.
+- A measuring-tool asset is managed by the Measuring Tools plugin, not the native
+  subtype importer, so it will exist as an asset but will not appear in the
+  Measuring Tools list from `assets.csv` alone.
+
+So always import the subtype file (`computers.csv` / `machines.csv`) right after
+`assets.csv`. Importing only `assets.csv` leaves the records invisible in the
+typed lists even though they are in the database. (The Azure and Thor imports do
+both steps automatically, which is why Azure/Thor PCs appear immediately.)
+
 ## Rules for hand-built native CSVs
 
 1. First row is the header. Use the exact column names below, lowercase, no spaces.
@@ -26,7 +44,8 @@ machinetypes, businessunits, locations, vendors, models, operatingsystems, asset
 computers, machines.
 
 An asset row must exist before its `computers`/`machines` subtype row: the subtype
-links back with `assetid` (the asset's `assetnumber`).
+links back with `assetid` (the asset's `assetnumber`). Import the subtype file in
+the same session so the item appears in its list (see the IMPORTANT note above).
 
 ## Columns (REQUIRED in bold)
 
diff --git a/shopdb/data/catalog.json b/shopdb/data/catalog.json
index 34aaf6cc..ca9a24b7 100644
--- a/shopdb/data/catalog.json
+++ b/shopdb/data/catalog.json
@@ -7,7 +7,7 @@
     {
       "modeltype": "Access Point",
       "category": "Network",
-      "description": "Wireless access point for network connectivity"
+      "description": "Wireless Access Point"
     },
     {
       "modeltype": "Broach",
@@ -15,13 +15,12 @@
     },
     {
       "modeltype": "Camera",
-      "category": "Network",
-      "description": "Security camera for facility monitoring"
+      "category": "Network"
     },
     {
       "modeltype": "CMM",
       "category": "Equipment",
-      "description": "A coordinate-measuring machine (CMM) is a device that measures the geometry of physical objects by sensing discrete points on the surface of the object with a probe."
+      "description": "Coordinate Measuring Machine"
     },
     {
       "modeltype": "CNC Lathe",
@@ -33,6 +32,11 @@
       "category": "Equipment",
       "description": "CNC Milling Machine"
     },
+    {
+      "modeltype": "Controller",
+      "category": "Equipment",
+      "description": "CNC/machine control unit"
+    },
     {
       "modeltype": "Desktop PC",
       "category": "PC",
@@ -40,21 +44,25 @@
     },
     {
       "modeltype": "Eddy Current",
-      "category": "Equipment",
-      "description": "Wild Stallions will never be a super band until we have Eddie Van Halen on guitar."
+      "category": "Equipment"
     },
     {
       "modeltype": "EDM",
       "category": "Equipment",
       "description": "Electrical Discharge Machine"
     },
+    {
+      "modeltype": "Firewall",
+      "category": "Network"
+    },
     {
       "modeltype": "Furnace",
       "category": "Equipment"
     },
     {
       "modeltype": "Grinder",
-      "category": "Equipment"
+      "category": "Equipment",
+      "description": "Grinding Machine"
     },
     {
       "modeltype": "Hobbing Machine",
@@ -66,8 +74,11 @@
     },
     {
       "modeltype": "IDF",
-      "category": "Network",
-      "description": "Intermediate Distribution Frame - network equipment closet"
+      "category": "Network"
+    },
+    {
+      "modeltype": "Inspection",
+      "category": "Equipment"
     },
     {
       "modeltype": "Inspection Station",
@@ -85,11 +96,6 @@
     },
     {
       "modeltype": "Lathe",
-      "category": "Equipment",
-      "description": "The Okuma & Howa 2SPV80 is a CNC machine renowned for its precision and efficiency in manufacturing processes. It is widely utilized across various sectors, facilitating the production of intricate components with ease. Industries such as automotive, aerospace, and metalworking benefit from its capabilities. "
-    },
-    {
-      "modeltype": "LocationOnly",
       "category": "Equipment"
     },
     {
@@ -102,8 +108,7 @@
     },
     {
       "modeltype": "Part Marker",
-      "category": "Equipment",
-      "description": "Dot peen markers provide a reliable, permanent method for marking materials with information that is crucial for product identification and traceability in various industrial applications."
+      "category": "Equipment"
     },
     {
       "modeltype": "Part Washer",
@@ -111,13 +116,11 @@
     },
     {
       "modeltype": "PC",
-      "category": "PC",
-      "description": "Standard user workstation computer"
+      "category": "PC"
     },
     {
       "modeltype": "Printer",
-      "category": "Printer",
-      "description": "Network printer - HP, Xerox, or other print devices"
+      "category": "Printer"
     },
     {
       "modeltype": "Robotic Deburring",
@@ -126,7 +129,7 @@
     {
       "modeltype": "Server",
       "category": "Network",
-      "description": "Physical or virtual server"
+      "description": "Server"
     },
     {
       "modeltype": "Shopfloor PC",
@@ -135,13 +138,16 @@
     },
     {
       "modeltype": "Shotpeen",
-      "category": "Equipment",
-      "description": "Shot peening is a cold working process used to produce a compressive residual stress layer and modify the mechanical properties of metals and composites."
+      "category": "Equipment"
+    },
+    {
+      "modeltype": "Spline Checker",
+      "category": "Equipment"
     },
     {
       "modeltype": "Switch",
       "category": "Network",
-      "description": "Network switch for connectivity"
+      "description": "Network Switch"
     },
     {
       "modeltype": "USB Device",
@@ -169,18 +175,22 @@
     },
     {
       "machinetype": "CMM",
-      "description": "A coordinate-measuring machine (CMM) is a device that measures the geometry of physical objects by sensing discrete points on the surface of the object with a probe.",
-      "color": "#8e44ad"
+      "description": "Coordinate Measuring Machine"
     },
     {
-      "machinetype": "Eddy Current",
-      "description": "Wild Stallions will never be a super band until we have Eddie Van Halen on guitar."
+      "machinetype": "CNC",
+      "description": "Computer Numerical Control machine"
+    },
+    {
+      "machinetype": "EDM",
+      "description": "Electrical Discharge Machine"
     },
     {
       "machinetype": "Furnace"
     },
     {
-      "machinetype": "Grinder"
+      "machinetype": "Grinder",
+      "description": "Grinding machine"
     },
     {
       "machinetype": "Hobbing Machine"
@@ -193,33 +203,39 @@
     },
     {
       "machinetype": "Lathe",
-      "description": "The Okuma & Howa 2SPV80 is a CNC machine renowned for its precision and efficiency in manufacturing processes. It is widely utilized across various sectors, facilitating the production of intricate components with ease. Industries such as automotive, aerospace, and metalworking benefit from its capabilities. "
+      "description": "Lathe machine"
     },
     {
-      "machinetype": "LocationOnly"
-    },
-    {
-      "machinetype": "Measuring Machine"
+      "machinetype": "Mill",
+      "description": "Milling machine"
     },
     {
       "machinetype": "Mill Turn"
     },
+    {
+      "machinetype": "Other",
+      "description": "Other machine type"
+    },
     {
       "machinetype": "Part Marker",
-      "description": "Dot peen markers provide a reliable, permanent method for marking materials with information that is crucial for product identification and traceability in various industrial applications."
+      "description": "Part marking/engraving machine"
     },
     {
       "machinetype": "Part Washer"
     },
+    {
+      "machinetype": "Press",
+      "description": "Press machine"
+    },
+    {
+      "machinetype": "Robot",
+      "description": "Industrial robot"
+    },
     {
       "machinetype": "Robotic Deburring"
     },
     {
-      "machinetype": "Shotpeen",
-      "description": "Shot peening is a cold working process used to produce a compressive residual stress layer and modify the mechanical properties of metals and composites."
-    },
-    {
-      "machinetype": "USB Device"
+      "machinetype": "Shotpeen"
     },
     {
       "machinetype": "Vertical Lathe"
@@ -228,38 +244,92 @@
       "machinetype": "Vertical Turning Center"
     },
     {
-      "machinetype": "Wax Trace"
+      "machinetype": "Workstation",
+      "description": "Shop floor workstation"
     }
   ],
   "computertypes": [
     {
-      "computertype": "CMM",
-      "color": "#7934f3"
+      "computertype": "CMM"
+    },
+    {
+      "computertype": "CMM PC",
+      "description": "PC dedicated to CMM operation"
+    },
+    {
+      "computertype": "CMMC Device",
+      "description": "CMMC compliance device"
+    },
+    {
+      "computertype": "Dashboard"
     },
     {
       "computertype": "Engineer"
     },
+    {
+      "computertype": "Engineer Workstation",
+      "description": "Engineering workstation for CAD/CAM work"
+    },
+    {
+      "computertype": "Engineering Workstation",
+      "description": "CAD/CAM workstation"
+    },
     {
       "computertype": "Genspect"
     },
     {
       "computertype": "Heat Treat"
     },
+    {
+      "computertype": "Inspection PC",
+      "description": "Quality inspection computer"
+    },
     {
       "computertype": "Keyence"
     },
+    {
+      "computertype": "Kiosk",
+      "description": "Kiosk or info display PC"
+    },
+    {
+      "computertype": "Laptop",
+      "description": "Laptop computer"
+    },
+    {
+      "computertype": "Lobby Display"
+    },
+    {
+      "computertype": "Office PC",
+      "description": "General office computer"
+    },
+    {
+      "computertype": "Other",
+      "description": "Other computer type"
+    },
     {
       "computertype": "Part Marker"
     },
+    {
+      "computertype": "Server",
+      "description": "Server system"
+    },
     {
       "computertype": "Shopfloor"
     },
+    {
+      "computertype": "Shopfloor PC",
+      "description": "Shop floor production computer"
+    },
     {
       "computertype": "Standard"
     },
     {
       "computertype": "Uncategorized"
     },
+    {
+      "computertype": "Virtual Machine",
+      "description": "Virtual machine"
+    },
     {
       "computertype": "Wax / Trace"
     }
@@ -267,8 +337,11 @@
   "printertypes": [
     {
       "printertype": "Card",
-      "description": "ID / card printer",
-      "color": "#2dce89"
+      "description": "ID / card printer"
+    },
+    {
+      "printertype": "Color Laser Printer",
+      "description": "Color laser printer"
     },
     {
       "printertype": "Dot Matrix",
@@ -280,19 +353,35 @@
     },
     {
       "printertype": "Label",
-      "description": "Label / receipt printer"
+      "description": "Label/barcode printer"
+    },
+    {
+      "printertype": "Label Printer",
+      "description": "Label/barcode printer"
     },
     {
       "printertype": "Laser",
-      "description": "Laser printer (toner)"
+      "description": "Standard laser printer"
+    },
+    {
+      "printertype": "Laser Printer",
+      "description": "Laser printer"
     },
     {
       "printertype": "MFP",
       "description": "Multifunction printer with scan/copy/fax"
     },
+    {
+      "printertype": "Multifunction Printer",
+      "description": "MFP with scan/fax"
+    },
+    {
+      "printertype": "Network Printer",
+      "description": "Network-connected printer"
+    },
     {
       "printertype": "Other",
-      "description": "Unclassified / other printer"
+      "description": "Other printer type"
     },
     {
       "printertype": "Plotter",
@@ -304,25 +393,52 @@
     }
   ],
   "networkdevicetypes": [
+    {
+      "networkdevicetype": "Access Panel"
+    },
     {
       "networkdevicetype": "Access Point",
-      "description": "Wireless access point for network connectivity"
+      "description": "Wireless access point"
     },
     {
       "networkdevicetype": "Camera",
-      "description": "Security camera for facility monitoring"
+      "description": "IP camera"
+    },
+    {
+      "networkdevicetype": "Firewall",
+      "description": "Network firewall"
     },
     {
       "networkdevicetype": "IDF",
-      "description": "Intermediate Distribution Frame - network equipment closet"
+      "description": "Intermediate Distribution Frame/closet"
+    },
+    {
+      "networkdevicetype": "MDF",
+      "description": "Main Distribution Frame"
+    },
+    {
+      "networkdevicetype": "Other",
+      "description": "Other network device"
+    },
+    {
+      "networkdevicetype": "Patch Panel",
+      "description": "Patch panel"
+    },
+    {
+      "networkdevicetype": "Router",
+      "description": "Network router"
     },
     {
       "networkdevicetype": "Server",
-      "description": "Physical or virtual server"
+      "description": "Server (reclassified from PCs)"
     },
     {
       "networkdevicetype": "Switch",
-      "description": "Network switch for connectivity"
+      "description": "Network switch"
+    },
+    {
+      "networkdevicetype": "UPS",
+      "description": "Uninterruptible power supply"
     }
   ],
   "locationtypes": [
@@ -383,6 +499,12 @@
     {
       "osname": "Microsoft Windows 11 Enterprise"
     },
+    {
+      "osname": "Microsoft Windows 11 Enterprise LTSC"
+    },
+    {
+      "osname": "Microsoft Windows 11 Enterprise LTSC 24H2 (build 26100)"
+    },
     {
       "osname": "TBD"
     },
@@ -390,10 +512,28 @@
       "osname": "Windows 10",
       "osversion": "10.0"
     },
+    {
+      "osname": "Windows 10 Enterprise"
+    },
+    {
+      "osname": "Windows 10 Pro"
+    },
+    {
+      "osname": "Windows 10.0.26100"
+    },
     {
       "osname": "Windows 11",
       "osversion": "11.0"
     },
+    {
+      "osname": "Windows 11 24H2"
+    },
+    {
+      "osname": "Windows 11 Enterprise"
+    },
+    {
+      "osname": "Windows 11 Pro"
+    },
     {
       "osname": "Windows Server 2019",
       "osversion": "2019"
@@ -407,22 +547,21 @@
     {
       "vendor": "ABTech"
     },
-    {
-      "vendor": "Allen-Bradley"
-    },
     {
       "vendor": "Broach"
     },
     {
-      "vendor": "Brother",
-      "website": "https://www.brother.com"
+      "vendor": "Brother"
     },
     {
-      "vendor": "Brown/Sharpe"
+      "vendor": "Brown & Sharpe"
     },
     {
       "vendor": "Campbell"
     },
+    {
+      "vendor": "Checkpoint"
+    },
     {
       "vendor": "Cisco"
     },
@@ -435,9 +574,6 @@
     {
       "vendor": "Doosan"
     },
-    {
-      "vendor": "DT"
-    },
     {
       "vendor": "Eddy"
     },
@@ -450,6 +586,9 @@
     {
       "vendor": "Fidia"
     },
+    {
+      "vendor": "Gleason"
+    },
     {
       "vendor": "Gleason-Pfauter"
     },
@@ -468,15 +607,17 @@
     {
       "vendor": "HID"
     },
+    {
+      "vendor": "Hoffmann"
+    },
     {
       "vendor": "HP"
     },
     {
-      "vendor": "HP Inc.",
-      "website": "https://www.hp.com"
+      "vendor": "Hwacheon"
     },
     {
-      "vendor": "Hwacheon"
+      "vendor": "Intermec"
     },
     {
       "vendor": "Keyence"
@@ -484,17 +625,9 @@
     {
       "vendor": "LaPointe"
     },
-    {
-      "vendor": "Lenovo",
-      "website": "https://www.lenovo.com"
-    },
     {
       "vendor": "Makino"
     },
-    {
-      "vendor": "Microsoft",
-      "website": "https://www.microsoft.com"
-    },
     {
       "vendor": "Mitutoyo"
     },
@@ -514,34 +647,19 @@
       "vendor": "Phoenix Inc"
     },
     {
-      "vendor": "Progessive"
-    },
-    {
-      "vendor": "QEMU"
+      "vendor": "Progressive"
     },
     {
       "vendor": "Ransohoff"
     },
-    {
-      "vendor": "Siemens"
-    },
-    {
-      "vendor": "TBD"
-    },
     {
       "vendor": "Telesis"
     },
-    {
-      "vendor": "Test"
-    },
     {
       "vendor": "Toshulin"
     },
     {
-      "vendor": "UnscopedLiveVendor"
-    },
-    {
-      "vendor": "VM-Ware"
+      "vendor": "VMware"
     },
     {
       "vendor": "WJDT"
@@ -552,10 +670,6 @@
     {
       "vendor": "Zebra"
     },
-    {
-      "vendor": "Zebra Technologies",
-      "website": "https://www.zebra.com"
-    },
     {
       "vendor": "Zeiss"
     },
@@ -567,35 +681,42 @@
     {
       "modelnumber": "EAS1000",
       "vendor": "ABTech",
-      "modeltype": "Measuring Machine",
-      "imageurl": "/images/models/machines/abtech-eas1000.png"
-    },
-    {
-      "modelnumber": "Allen-Bradley",
-      "vendor": "Allen-Bradley",
-      "description": "Allen-Bradley Controller"
+      "modeltype": "Measuring Machine"
     },
     {
       "modelnumber": "Vertical Broach",
       "vendor": "Broach",
       "modeltype": "Broach"
     },
+    {
+      "modelnumber": "MFC-J5845DW",
+      "vendor": "Brother",
+      "modeltype": "Printer"
+    },
     {
       "modelnumber": "Model One",
-      "vendor": "Brown/Sharpe",
-      "modeltype": "LocationOnly"
+      "vendor": "Brown & Sharpe",
+      "modeltype": "CMM"
     },
     {
       "modelnumber": "1000C1000",
       "vendor": "Campbell",
-      "modeltype": "Grinder",
-      "imageurl": "/images/models/machines/1000C1000.jpg"
+      "modeltype": "Grinder"
+    },
+    {
+      "modelnumber": "6400",
+      "vendor": "Checkpoint",
+      "modeltype": "Firewall"
+    },
+    {
+      "modelnumber": "Virtual Firewall",
+      "vendor": "Checkpoint",
+      "modeltype": "Firewall"
     },
     {
       "modelnumber": "9120AXI-B",
       "vendor": "Cisco",
-      "modeltype": "Access Point",
-      "imageurl": "/images/models/machines/Cisco9120.png"
+      "modeltype": "Access Point"
     },
     {
       "modelnumber": "C9200-48P-E",
@@ -607,56 +728,71 @@
       "vendor": "Cisco",
       "modeltype": "Switch"
     },
-    {
-      "modelnumber": "OptiPlex 5000",
-      "vendor": "Dell Inc."
-    },
-    {
-      "modelnumber": "Dell Pro 13 Plus PB13250",
-      "vendor": "Dell Inc.",
-      "modeltype": "LocationOnly"
-    },
-    {
-      "modelnumber": "Dell Pro 14 Plus PB14250",
-      "vendor": "Dell Inc.",
-      "modeltype": "LocationOnly"
-    },
-    {
-      "modelnumber": "Dell Pro Tower Plus QBT1250",
-      "vendor": "Dell Inc."
-    },
     {
       "modelnumber": "Latitude 5340",
       "vendor": "Dell Inc.",
-      "modeltype": "PC"
+      "modeltype": "Laptop"
     },
     {
       "modelnumber": "Latitude 5350",
       "vendor": "Dell Inc.",
-      "modeltype": "PC"
+      "modeltype": "Laptop"
+    },
+    {
+      "modelnumber": "Latitude 5420",
+      "vendor": "Dell Inc.",
+      "modeltype": "Laptop"
     },
     {
       "modelnumber": "Latitude 5430",
       "vendor": "Dell Inc.",
-      "modeltype": "LocationOnly"
+      "modeltype": "Laptop"
     },
     {
       "modelnumber": "Latitude 5440",
       "vendor": "Dell Inc.",
-      "modeltype": "LocationOnly",
-      "imageurl": "/images/models/machines/latitude5440.png"
+      "modeltype": "Laptop"
     },
     {
       "modelnumber": "Latitude 5450",
       "vendor": "Dell Inc.",
-      "modeltype": "LocationOnly",
-      "imageurl": "/images/models/computers/Latitude-5450.png"
+      "modeltype": "Laptop"
+    },
+    {
+      "modelnumber": "Latitude 7230 Rugged Extreme Tablet",
+      "vendor": "Dell Inc.",
+      "modeltype": "Laptop"
+    },
+    {
+      "modelnumber": "Latitude 7320 Detachable",
+      "vendor": "Dell Inc.",
+      "modeltype": "Laptop"
+    },
+    {
+      "modelnumber": "Latitude 7330 Rugged Extreme",
+      "vendor": "Dell Inc.",
+      "modeltype": "Laptop"
+    },
+    {
+      "modelnumber": "Latitude 7350 Detachable",
+      "vendor": "Dell Inc.",
+      "modeltype": "Laptop"
+    },
+    {
+      "modelnumber": "OptiPlex 3000",
+      "vendor": "Dell Inc.",
+      "modeltype": "PC"
     },
     {
       "modelnumber": "OptiPlex 3080",
       "vendor": "Dell Inc.",
       "modeltype": "PC"
     },
+    {
+      "modelnumber": "OptiPlex 5000",
+      "vendor": "Dell Inc.",
+      "modeltype": "PC"
+    },
     {
       "modelnumber": "OptiPlex 5040",
       "vendor": "Dell Inc.",
@@ -665,48 +801,77 @@
     {
       "modelnumber": "OptiPlex 5050",
       "vendor": "Dell Inc.",
-      "modeltype": "PC",
-      "imageurl": "/images/models/computers/Optiplex-5050.png"
+      "modeltype": "PC"
     },
     {
       "modelnumber": "OptiPlex 5060",
       "vendor": "Dell Inc.",
-      "modeltype": "PC",
-      "imageurl": "/images/models/computers/Optiplex-5060.png"
+      "modeltype": "PC"
     },
     {
       "modelnumber": "OptiPlex 7000",
       "vendor": "Dell Inc.",
-      "modeltype": "PC",
-      "imageurl": "/images/models/computers/Optiplex-7000.png"
+      "modeltype": "PC"
     },
     {
       "modelnumber": "OptiPlex 7070",
       "vendor": "Dell Inc.",
-      "modeltype": "PC",
-      "imageurl": "/images/models/machines/OptiPlex-7070.png"
+      "modeltype": "PC"
     },
     {
       "modelnumber": "OptiPlex 7080",
       "vendor": "Dell Inc.",
-      "modeltype": "LocationOnly",
-      "imageurl": "/images/models/computers/Optiplex-7080.jpg"
+      "modeltype": "PC"
     },
     {
       "modelnumber": "OptiPlex 7090",
       "vendor": "Dell Inc.",
-      "modeltype": "LocationOnly"
+      "modeltype": "PC"
+    },
+    {
+      "modelnumber": "OptiPlex 7400 AIO",
+      "vendor": "Dell Inc.",
+      "modeltype": "PC"
+    },
+    {
+      "modelnumber": "OptiPlex 7490 AIO",
+      "vendor": "Dell Inc.",
+      "modeltype": "PC"
+    },
+    {
+      "modelnumber": "OptiPlex AIO Plus 7410",
+      "vendor": "Dell Inc.",
+      "modeltype": "PC"
+    },
+    {
+      "modelnumber": "OptiPlex AIO Plus 7420",
+      "vendor": "Dell Inc.",
+      "modeltype": "PC"
+    },
+    {
+      "modelnumber": "OptiPlex Micro 7010",
+      "vendor": "Dell Inc.",
+      "modeltype": "PC"
     },
     {
       "modelnumber": "OptiPlex Micro 7020",
       "vendor": "Dell Inc.",
-      "modeltype": "LocationOnly"
+      "modeltype": "PC"
+    },
+    {
+      "modelnumber": "OptiPlex SFF 7020",
+      "vendor": "Dell Inc.",
+      "modeltype": "PC"
+    },
+    {
+      "modelnumber": "OptiPlex SFF Plus 7010",
+      "vendor": "Dell Inc.",
+      "modeltype": "PC"
     },
     {
       "modelnumber": "OptiPlex Tower Plus 7010",
       "vendor": "Dell Inc.",
-      "modeltype": "PC",
-      "imageurl": "/images/models/computers/OptiPlex-Tower-Plus-7010.png"
+      "modeltype": "PC"
     },
     {
       "modelnumber": "OptiPlex Tower Plus 7020",
@@ -714,210 +879,244 @@
       "modeltype": "PC"
     },
     {
-      "modelnumber": "Precision 5560",
-      "vendor": "Dell Inc.",
-      "modeltype": "LocationOnly",
-      "imageurl": "/images/models/machines/precision5560.jpg"
-    },
-    {
-      "modelnumber": "Precision 5570",
-      "vendor": "Dell Inc.",
-      "modeltype": "LocationOnly"
-    },
-    {
-      "modelnumber": "Precision 5680",
-      "vendor": "Dell Inc.",
-      "modeltype": "LocationOnly"
-    },
-    {
-      "modelnumber": "Precision 5690",
-      "vendor": "Dell Inc.",
-      "modeltype": "LocationOnly"
-    },
-    {
-      "modelnumber": "Precision 5820 Tower",
-      "vendor": "Dell Inc.",
-      "modeltype": "LocationOnly"
-    },
-    {
-      "modelnumber": "Precision 5860 Tower",
-      "vendor": "Dell Inc."
-    },
-    {
-      "modelnumber": "Precision 7680",
-      "vendor": "Dell Inc.",
-      "modeltype": "LocationOnly"
-    },
-    {
-      "modelnumber": "Precision 7750",
+      "modelnumber": "Precision 3650",
       "vendor": "Dell Inc.",
       "modeltype": "PC"
     },
+    {
+      "modelnumber": "Precision 3660",
+      "vendor": "Dell Inc.",
+      "modeltype": "PC"
+    },
+    {
+      "modelnumber": "Precision 5490",
+      "vendor": "Dell Inc.",
+      "modeltype": "Laptop"
+    },
+    {
+      "modelnumber": "Precision 5550",
+      "vendor": "Dell Inc.",
+      "modeltype": "Laptop"
+    },
+    {
+      "modelnumber": "Precision 5560",
+      "vendor": "Dell Inc.",
+      "modeltype": "Laptop"
+    },
+    {
+      "modelnumber": "Precision 5570",
+      "vendor": "Dell Inc.",
+      "modeltype": "Laptop"
+    },
+    {
+      "modelnumber": "Precision 5680",
+      "vendor": "Dell Inc.",
+      "modeltype": "Laptop"
+    },
+    {
+      "modelnumber": "Precision 5690",
+      "vendor": "Dell Inc.",
+      "modeltype": "Laptop"
+    },
+    {
+      "modelnumber": "Precision 5820 Tower",
+      "vendor": "Dell Inc.",
+      "modeltype": "PC"
+    },
+    {
+      "modelnumber": "Precision 5860 Tower",
+      "vendor": "Dell Inc.",
+      "modeltype": "PC"
+    },
+    {
+      "modelnumber": "Precision 7680",
+      "vendor": "Dell Inc.",
+      "modeltype": "Laptop"
+    },
+    {
+      "modelnumber": "Precision 7750",
+      "vendor": "Dell Inc.",
+      "modeltype": "Laptop"
+    },
+    {
+      "modelnumber": "Precision 7770",
+      "vendor": "Dell Inc.",
+      "modeltype": "Laptop"
+    },
     {
       "modelnumber": "Precision 7780",
       "vendor": "Dell Inc.",
-      "modeltype": "LocationOnly"
+      "modeltype": "Laptop"
+    },
+    {
+      "modelnumber": "Precision 7820 Tower",
+      "vendor": "Dell Inc.",
+      "modeltype": "PC"
+    },
+    {
+      "modelnumber": "Precision 7865 Tower",
+      "vendor": "Dell Inc.",
+      "modeltype": "PC"
     },
     {
       "modelnumber": "Precision 7875 Tower",
       "vendor": "Dell Inc.",
-      "modeltype": "LocationOnly"
+      "modeltype": "PC"
+    },
+    {
+      "modelnumber": "Precision 7920 Tower",
+      "vendor": "Dell Inc.",
+      "modeltype": "PC"
+    },
+    {
+      "modelnumber": "Precision 7960 Tower",
+      "vendor": "Dell Inc.",
+      "modeltype": "PC"
+    },
+    {
+      "modelnumber": "Pro 13 Plus PB13250",
+      "vendor": "Dell Inc.",
+      "modeltype": "Laptop"
+    },
+    {
+      "modelnumber": "Pro 13 Premium PA13250",
+      "vendor": "Dell Inc.",
+      "modeltype": "Laptop"
+    },
+    {
+      "modelnumber": "Pro 14 PC14250",
+      "vendor": "Dell Inc.",
+      "modeltype": "Laptop"
+    },
+    {
+      "modelnumber": "Pro 14 Plus PB14250",
+      "vendor": "Dell Inc.",
+      "modeltype": "Laptop"
+    },
+    {
+      "modelnumber": "Pro Desktops 24 AIO Plus QB24250",
+      "vendor": "Dell Inc.",
+      "modeltype": "PC"
+    },
+    {
+      "modelnumber": "Pro Desktops Micro QCM1250",
+      "vendor": "Dell Inc.",
+      "modeltype": "PC"
+    },
+    {
+      "modelnumber": "Pro Desktops Tower Plus QBT1250",
+      "vendor": "Dell Inc.",
+      "modeltype": "PC"
+    },
+    {
+      "modelnumber": "Pro Max 14 MC14250",
+      "vendor": "Dell Inc.",
+      "modeltype": "Laptop"
+    },
+    {
+      "modelnumber": "Pro Max 14 Premium MA14250",
+      "vendor": "Dell Inc.",
+      "modeltype": "Laptop"
+    },
+    {
+      "modelnumber": "Pro Max 16 MC16250",
+      "vendor": "Dell Inc.",
+      "modeltype": "Laptop"
+    },
+    {
+      "modelnumber": "Pro Max 16 Plus MB16250",
+      "vendor": "Dell Inc.",
+      "modeltype": "Laptop"
+    },
+    {
+      "modelnumber": "Pro Max 16 Premium MA16250",
+      "vendor": "Dell Inc.",
+      "modeltype": "Laptop"
+    },
+    {
+      "modelnumber": "Pro Max 18 Plus MB18250",
+      "vendor": "Dell Inc.",
+      "modeltype": "Laptop"
+    },
+    {
+      "modelnumber": "Pro Rugged 14 RB14250",
+      "vendor": "Dell Inc.",
+      "modeltype": "Laptop"
     },
     {
       "modelnumber": "NT-4300",
       "vendor": "DMG Mori",
-      "modeltype": "Mill Turn",
-      "imageurl": "/images/models/machines/nt4300.jpg"
+      "modeltype": "Mill Turn"
     },
     {
       "modelnumber": "Puma MX3100",
       "vendor": "Doosan",
-      "modeltype": "Mill Turn",
-      "imageurl": "/images/models/machines/mx3100.png"
-    },
-    {
-      "modelnumber": "IDF",
-      "vendor": "DT",
-      "modeltype": "IDF"
-    },
-    {
-      "modelnumber": "Server",
-      "vendor": "DT",
-      "modeltype": "Server"
+      "modeltype": "Mill Turn"
     },
     {
       "modelnumber": "EZ-Eddy",
       "vendor": "Eddy",
-      "modeltype": "Eddy Current",
-      "imageurl": "/images/models/machines/ezeddy.png"
+      "modeltype": "Eddy Current"
     },
     {
       "modelnumber": "TM-C3500",
       "vendor": "Epson",
-      "modeltype": "LocationOnly",
-      "imageurl": "/images/models/printers/Epson-C3500.png"
+      "modeltype": "Printer"
     },
     {
-      "modelnumber": "0i-TC",
+      "modelnumber": "31i-MB",
       "vendor": "Fanuc",
-      "description": "FANUC Series 0i-TC Controller"
-    },
-    {
-      "modelnumber": "18i-TB",
-      "vendor": "Fanuc",
-      "description": "FANUC Series 18i-TB Controller"
-    },
-    {
-      "modelnumber": "31i",
-      "vendor": "Fanuc",
-      "description": "FANUC Series 31i Controller"
-    },
-    {
-      "modelnumber": "31i-A",
-      "vendor": "Fanuc",
-      "description": "FANUC Series 31i-MODEL A Controller"
-    },
-    {
-      "modelnumber": "31i-A5",
-      "vendor": "Fanuc",
-      "description": "FANUC Series 31i-MODEL A5 Controller"
-    },
-    {
-      "modelnumber": "31i-B",
-      "vendor": "Fanuc",
-      "description": "FANUC Series 31i-MODEL B Controller"
-    },
-    {
-      "modelnumber": "31i-B5",
-      "vendor": "Fanuc",
-      "description": "FANUC Series 31i-MODEL B5 Controller"
-    },
-    {
-      "modelnumber": "32i-B",
-      "vendor": "Fanuc",
-      "description": "FANUC Series 32i-MODEL B Controller"
+      "modeltype": "Controller"
     },
     {
       "modelnumber": "M710UC",
       "vendor": "Fanuc",
-      "modeltype": "Robotic Deburring",
-      "imageurl": "/images/models/machines/M710uc.png"
-    },
-    {
-      "modelnumber": "Panel i",
-      "vendor": "Fanuc",
-      "description": "FANUC Panel i Controller"
-    },
-    {
-      "modelnumber": "Power Motion i-A",
-      "vendor": "Fanuc",
-      "description": "FANUC Power Motion i-MODEL A Controller"
-    },
-    {
-      "modelnumber": "Professional 5",
-      "vendor": "Fanuc",
-      "description": "FANUC Professional 5 Controller"
-    },
-    {
-      "modelnumber": "R-30iA",
-      "vendor": "Fanuc",
-      "description": "FANUC System R-30iA Controller"
-    },
-    {
-      "modelnumber": "R-30iB",
-      "vendor": "Fanuc",
-      "description": "FANUC System R-30iB Controller"
-    },
-    {
-      "modelnumber": "Unknown",
-      "vendor": "Fanuc",
-      "description": "FANUC (Unknown Model) Controller"
+      "modeltype": "Robotic Deburring"
     },
     {
       "modelnumber": "D218",
       "vendor": "Fidia",
-      "modeltype": "5-axis Mill",
-      "imageurl": "/images/models/machines/d218.png"
+      "modeltype": "5-axis Mill"
     },
     {
-      "modelnumber": "FIDIA C20",
-      "vendor": "Fidia",
-      "description": "FIDIA C20 Controller"
+      "modelnumber": "475GMS",
+      "vendor": "Gleason",
+      "modeltype": "Spline Checker"
     },
     {
       "modelnumber": "P600S",
       "vendor": "Gleason-Pfauter",
-      "modeltype": "Hobbing Machine",
-      "imageurl": "/images/models/machines/p600s.png"
+      "modeltype": "Hobbing Machine"
     },
     {
       "modelnumber": "Vacuum Furnace",
       "vendor": "GM Enterprises",
-      "modeltype": "Furnace",
-      "imageurl": "/images/models/machines/furnace.png"
+      "modeltype": "Furnace"
     },
     {
       "modelnumber": "550T",
       "vendor": "Grob",
-      "modeltype": "LocationOnly"
+      "modeltype": "5-axis Mill"
     },
     {
       "modelnumber": "G750",
       "vendor": "Grob",
-      "modeltype": "Mill Turn",
-      "imageurl": "/images/models/machines/g750.jpg"
+      "modeltype": "Mill Turn"
+    },
+    {
+      "modelnumber": "VF-2SS",
+      "vendor": "Haas Automation",
+      "modeltype": "CNC Mill"
     },
     {
       "modelnumber": "7.10.7 SF",
       "vendor": "Hexagon",
-      "modeltype": "CMM",
-      "imageurl": "/images/models/machines/7107sf.png"
+      "modeltype": "CMM"
     },
     {
       "modelnumber": "CMM",
       "vendor": "Hexagon",
-      "modeltype": "CMM",
-      "imageurl": "/images/models/machines/cmm.png"
+      "modeltype": "CMM"
     },
     {
       "modelnumber": "Global Advantage",
@@ -927,147 +1126,236 @@
     {
       "modelnumber": "DTC 4500e",
       "vendor": "HID",
-      "modeltype": "LocationOnly",
-      "imageurl": "/images/models/printers/DTC4500e.png"
+      "modeltype": "Printer"
     },
     {
-      "modelnumber": "Color Laserjet CP2025",
-      "vendor": "HP",
-      "modeltype": "LocationOnly",
-      "imageurl": "/images/models/printers/LaserJet -CP2025.png"
+      "modelnumber": "Hoffmann Broach",
+      "vendor": "Hoffmann",
+      "modeltype": "Broach"
     },
     {
-      "modelnumber": "Color LaserJet M254dw",
-      "vendor": "HP",
-      "modeltype": "Printer",
-      "imageurl": "/images/models/printers/LaserJet-M254dw.png"
-    },
-    {
-      "modelnumber": "Color LaserJet M255dw",
-      "vendor": "HP",
-      "modeltype": "LocationOnly"
-    },
-    {
-      "modelnumber": "HP DesignJet T1700dr PS",
-      "vendor": "HP",
-      "modeltype": "LocationOnly",
-      "imageurl": "/images/models/printers/HP-DesignJet-T1700dr.png"
-    },
-    {
-      "modelnumber": "HP LaserJet M610 / M611 / M612 / M634 / M635 / M636",
+      "modelnumber": "Color LaserJet CP2025",
       "vendor": "HP",
       "modeltype": "Printer"
     },
     {
-      "modelnumber": "LaserJet 200 color M251nw",
+      "modelnumber": "Color LaserJet M254dw",
       "vendor": "HP",
-      "imageurl": "/images/models/printers/Laserjet-Pro-M251nw.png"
+      "modeltype": "Printer"
+    },
+    {
+      "modelnumber": "Color LaserJet M255dw",
+      "vendor": "HP",
+      "modeltype": "Printer"
+    },
+    {
+      "modelnumber": "Color LaserJet Pro 3201dw",
+      "vendor": "HP",
+      "modeltype": "Printer",
+      "documentationurl": "https://support.hp.com/us-en/product/troubleshooting/hp-color-laserjet-pro-3201-3204,-3288-printer-series/model/2101679526",
+      "imageurl": "/api/models/image/model-112.webp"
+    },
+    {
+      "modelnumber": "Color LaserJet Pro M454dw",
+      "vendor": "HP",
+      "modeltype": "Printer",
+      "documentationurl": "https://support.hp.com/us-en/drivers/mps-bundle-bom5/model/19203830?sku=W1Y45AR",
+      "imageurl": "/api/models/image/model-120.png"
+    },
+    {
+      "modelnumber": "DesignJet T1700dr PS",
+      "vendor": "HP",
+      "modeltype": "Printer"
+    },
+    {
+      "modelnumber": "EliteDesk 800 G6",
+      "vendor": "HP",
+      "modeltype": "PC"
+    },
+    {
+      "modelnumber": "LaserJet 4001N",
+      "vendor": "HP",
+      "modeltype": "Printer"
     },
     {
       "modelnumber": "LaserJet 4250tn",
       "vendor": "HP",
-      "modeltype": "Printer",
-      "imageurl": "/images/models/printers/LaserJet-4250.png"
+      "modeltype": "Printer"
     },
     {
-      "modelnumber": "LaserJet 4250tn DO NOT USE",
+      "modelnumber": "LaserJet CP5225",
       "vendor": "HP",
-      "modeltype": "LocationOnly",
-      "imageurl": "/images/models/printers/LaserJet-4250.png"
+      "modeltype": "Printer"
+    },
+    {
+      "modelnumber": "LaserJet M402N",
+      "vendor": "HP",
+      "modeltype": "Printer"
+    },
+    {
+      "modelnumber": "LaserJet M404N",
+      "vendor": "HP",
+      "modeltype": "Printer"
     },
     {
       "modelnumber": "LaserJet M406",
       "vendor": "HP",
-      "modeltype": "LocationOnly",
-      "imageurl": "/images/models/printers/LaserJet-M406.png"
+      "modeltype": "Printer"
+    },
+    {
+      "modelnumber": "LaserJet M428Fdn",
+      "vendor": "HP",
+      "modeltype": "Printer"
+    },
+    {
+      "modelnumber": "LaserJet M428Fdw",
+      "vendor": "HP",
+      "modeltype": "Printer"
     },
     {
       "modelnumber": "LaserJet M454dn",
       "vendor": "HP",
-      "modeltype": "Printer",
-      "imageurl": "/images/models/printers/LaserJet-M454dn.png"
+      "modeltype": "Printer"
     },
     {
       "modelnumber": "LaserJet M506",
       "vendor": "HP",
-      "modeltype": "LocationOnly",
-      "imageurl": "/images/models/printers/LaserJet-M506.png"
+      "modeltype": "Printer"
+    },
+    {
+      "modelnumber": "LaserJet M507",
+      "vendor": "HP",
+      "modeltype": "Printer"
+    },
+    {
+      "modelnumber": "LaserJet M553",
+      "vendor": "HP",
+      "modeltype": "Printer"
     },
     {
       "modelnumber": "LaserJet M602",
       "vendor": "HP",
-      "modeltype": "Printer",
-      "imageurl": "/images/models/printers/LaserJet-M602.png"
+      "modeltype": "Printer"
+    },
+    {
+      "modelnumber": "LaserJet M610",
+      "vendor": "HP",
+      "modeltype": "Printer"
+    },
+    {
+      "modelnumber": "LaserJet M611",
+      "vendor": "HP",
+      "modeltype": "Printer"
+    },
+    {
+      "modelnumber": "LaserJet M612",
+      "vendor": "HP",
+      "modeltype": "Printer"
+    },
+    {
+      "modelnumber": "LaserJet M634",
+      "vendor": "HP",
+      "modeltype": "Printer"
+    },
+    {
+      "modelnumber": "LaserJet M635",
+      "vendor": "HP",
+      "modeltype": "Printer"
+    },
+    {
+      "modelnumber": "LaserJet M636",
+      "vendor": "HP",
+      "modeltype": "Printer"
+    },
+    {
+      "modelnumber": "LaserJet M651",
+      "vendor": "HP",
+      "modeltype": "Printer"
+    },
+    {
+      "modelnumber": "LaserJet P2035",
+      "vendor": "HP",
+      "modeltype": "Printer"
+    },
+    {
+      "modelnumber": "LaserJet P2055Dn",
+      "vendor": "HP",
+      "modeltype": "Printer"
+    },
+    {
+      "modelnumber": "LaserJet P3015",
+      "vendor": "HP",
+      "modeltype": "Printer"
     },
     {
       "modelnumber": "LaserJet P3015dn",
       "vendor": "HP",
-      "modeltype": "Printer",
-      "imageurl": "/images/models/printers/LaserJet-P3015dn.png"
+      "modeltype": "Printer"
     },
     {
-      "modelnumber": "Laserjet Pro 200 M251nw",
+      "modelnumber": "LaserJet Pro 200 color M251nw",
       "vendor": "HP",
-      "modeltype": "Printer",
-      "imageurl": "/images/models/printers/Laserjet-Pro-M251nw.png"
+      "modeltype": "Printer"
+    },
+    {
+      "modelnumber": "LaserJet Pro 400",
+      "vendor": "HP",
+      "modeltype": "Printer"
     },
     {
       "modelnumber": "LaserJet Pro 4001n",
       "vendor": "HP",
-      "modeltype": "Printer",
-      "imageurl": "/images/models/printers/LaserJet-4001n.png"
+      "modeltype": "Printer"
     },
     {
       "modelnumber": "LaserJet Pro M252dw",
       "vendor": "HP",
-      "imageurl": "/images/models/printers/LaserJet-Pro-M252dw.png"
+      "modeltype": "Printer"
     },
     {
       "modelnumber": "LaserJet Pro M404n",
       "vendor": "HP",
-      "modeltype": "Printer",
-      "imageurl": "/images/models/printers/LaserJet-M404.png"
-    },
-    {
-      "modelnumber": "LaserJet Pro M454dw",
-      "vendor": "HP",
-      "imageurl": "/images/models/printers/LaserJet-M454dn.png"
+      "modeltype": "Printer"
     },
     {
       "modelnumber": "LaserJet Pro M607",
       "vendor": "HP",
-      "modeltype": "LocationOnly",
-      "imageurl": "/images/models/printers/LaserJet-M607.png"
+      "modeltype": "Printer"
+    },
+    {
+      "modelnumber": "ProLiant DL380 Gen9",
+      "vendor": "HP",
+      "modeltype": "Server"
     },
     {
       "modelnumber": "VT 550 2SP",
       "vendor": "Hwacheon",
-      "modeltype": "Vertical Turning Center",
-      "imageurl": "/images/models/machines/vt5502sp.png"
+      "modeltype": "Vertical Turning Center"
+    },
+    {
+      "modelnumber": "PM43",
+      "vendor": "Intermec",
+      "modeltype": "Printer"
     },
     {
       "modelnumber": "VR-3100",
       "vendor": "Keyence",
-      "modeltype": "Measuring Machine",
-      "imageurl": "/images/models/machines/keyence-vr3100.png"
+      "modeltype": "Measuring Machine"
     },
     {
       "modelnumber": "Horizontal Broach",
       "vendor": "LaPointe",
-      "modeltype": "Broach",
-      "imageurl": "/images/models/machines/hbroach.png"
+      "modeltype": "Broach"
     },
     {
       "modelnumber": "a81nx",
       "vendor": "Makino",
-      "modeltype": "Horizontal Machining Center",
-      "imageurl": "/images/models/machines/a81nx.png"
+      "modeltype": "Horizontal Machining Center"
     },
     {
       "modelnumber": "C-4500",
       "vendor": "Mitutoyo",
-      "modeltype": "Wax Trace",
-      "imageurl": "/images/models/machines/c4500.png"
+      "modeltype": "Wax Trace"
     },
     {
       "modelnumber": "CV-3200",
@@ -1086,8 +1374,7 @@
     {
       "modelnumber": "VP9000",
       "vendor": "OKK",
-      "modeltype": "5-axis Mill",
-      "imageurl": "/images/models/machines/vp9000.jpg"
+      "modeltype": "5-axis Mill"
     },
     {
       "modelnumber": "2SP-V80",
@@ -1097,159 +1384,161 @@
     {
       "modelnumber": "LOC650",
       "vendor": "Okuma",
-      "modeltype": "Mill Turn",
-      "imageurl": "/images/models/machines/loc650.png"
+      "modeltype": "Mill Turn"
     },
     {
       "modelnumber": "Multus",
       "vendor": "Okuma",
       "modeltype": "Mill Turn"
     },
-    {
-      "modelnumber": "OKUMA OSP-P300L",
-      "vendor": "Okuma",
-      "description": "OKUMA OSP-P300L Controller"
-    },
-    {
-      "modelnumber": "OKUMA OSP-P300LA",
-      "vendor": "Okuma",
-      "description": "OKUMA OSP-P300LA Controller"
-    },
     {
       "modelnumber": "VTM-100",
       "vendor": "Okuma",
-      "modeltype": "Vertical Lathe",
-      "imageurl": "/images/models/machines/vtm100.png"
+      "modeltype": "Vertical Lathe"
     },
     {
       "modelnumber": "Phoenix Broach",
       "vendor": "Phoenix Inc",
-      "modeltype": "Broach",
-      "imageurl": "/images/models/machines/phoenixbroach.png"
+      "modeltype": "Broach"
     },
     {
       "modelnumber": "Shotpeen",
-      "vendor": "Progessive",
-      "modeltype": "Shotpeen",
-      "imageurl": "/images/models/machines/shotpeen.png"
-    },
-    {
-      "modelnumber": "Ubuntu 24.04 PC (Q35 + ICH9, 2009)",
-      "vendor": "QEMU"
+      "vendor": "Progressive",
+      "modeltype": "Shotpeen"
     },
     {
       "modelnumber": "Lean Drum",
       "vendor": "Ransohoff",
-      "modeltype": "Part Washer",
-      "imageurl": "/images/models/machines/leandrum.jpg"
+      "modeltype": "Part Washer"
     },
     {
       "modelnumber": "LeanJet RB-2",
       "vendor": "Ransohoff",
-      "modeltype": "Part Washer",
-      "imageurl": "/images/models/machines/rb2.png"
-    },
-    {
-      "modelnumber": "SIEMENS",
-      "vendor": "Siemens",
-      "description": "SIEMENS Controller"
-    },
-    {
-      "modelnumber": "SIEMENS SIMATIC PANEL TOUCH",
-      "vendor": "Siemens",
-      "description": "SIEMENS SIMATIC PANEL TOUCH Controller"
-    },
-    {
-      "modelnumber": "SIEMENS SINUMERIK",
-      "vendor": "Siemens",
-      "description": "SIEMENS SINUMERIK Controller"
+      "modeltype": "Part Washer"
     },
     {
       "modelnumber": "PINSTAMP - TMP4210 Dot Peen",
       "vendor": "Telesis",
       "modeltype": "Part Marker"
     },
-    {
-      "modelnumber": "Test",
-      "vendor": "Test"
-    },
     {
       "modelnumber": "Powerturn",
       "vendor": "Toshulin",
-      "modeltype": "Vertical Turning Center",
-      "imageurl": "/images/models/machines/powerturn.png"
+      "modeltype": "Vertical Turning Center"
     },
     {
-      "modelnumber": "Virtual",
-      "vendor": "VM-Ware",
+      "modelnumber": "Virtual Server",
+      "vendor": "VMware",
       "modeltype": "Server"
     },
     {
-      "modelnumber": "TBD",
+      "modelnumber": "Inspection",
       "vendor": "WJDT",
-      "modeltype": "LocationOnly"
+      "modeltype": "Inspection"
     },
     {
-      "modelnumber": "Altalink C8135",
+      "modelnumber": "TBD",
+      "vendor": "WJDT"
+    },
+    {
+      "modelnumber": "AltaLink B8045",
       "vendor": "Xerox",
-      "modeltype": "LocationOnly",
-      "imageurl": "/images/models/printers/AltaLink-C8130.png"
+      "modeltype": "Printer"
+    },
+    {
+      "modelnumber": "AltaLink B8055",
+      "vendor": "Xerox",
+      "modeltype": "Printer"
+    },
+    {
+      "modelnumber": "AltaLink B8170",
+      "vendor": "Xerox",
+      "modeltype": "Printer"
+    },
+    {
+      "modelnumber": "AltaLink C8035",
+      "vendor": "Xerox",
+      "modeltype": "Printer"
+    },
+    {
+      "modelnumber": "AltaLink C8135",
+      "vendor": "Xerox",
+      "modeltype": "Printer"
     },
     {
       "modelnumber": "AltaLink EC8036",
       "vendor": "Xerox",
-      "modeltype": "Printer",
-      "imageurl": "/images/models/printers/Xerox-EC8036.png"
+      "modeltype": "Printer"
     },
     {
-      "modelnumber": "Versalink B405DN",
+      "modelnumber": "VersaLink B400",
       "vendor": "Xerox",
-      "modeltype": "LocationOnly",
-      "imageurl": "/images/models/printers/Versalink-B405.png"
+      "modeltype": "Printer"
     },
     {
-      "modelnumber": "Versalink B7125",
+      "modelnumber": "VersaLink B405",
       "vendor": "Xerox",
-      "modeltype": "Printer",
-      "imageurl": "/images/models/printers/Versalink-B7125.png"
+      "modeltype": "Printer"
     },
     {
-      "modelnumber": "Versalink C405",
+      "modelnumber": "VersaLink B405DN",
       "vendor": "Xerox",
-      "modeltype": "LocationOnly",
-      "imageurl": "/images/models/printers/Versalink-C405.png"
+      "modeltype": "Printer"
     },
     {
-      "modelnumber": "Versalink C415",
-      "vendor": "Xerox"
-    },
-    {
-      "modelnumber": "Versalink C7100",
+      "modelnumber": "VersaLink B415",
       "vendor": "Xerox",
-      "modeltype": "LocationOnly",
-      "imageurl": "/images/models/printers/Versalink-C7125.png"
+      "modeltype": "Printer"
     },
     {
-      "modelnumber": "Versalink C7125",
+      "modelnumber": "VersaLink B7100",
       "vendor": "Xerox",
-      "modeltype": "Printer",
-      "imageurl": "/images/models/printers/Versalink-C7125.png"
+      "modeltype": "Printer"
     },
     {
-      "modelnumber": "Zebra ZT411",
+      "modelnumber": "VersaLink B7125",
+      "vendor": "Xerox",
+      "modeltype": "Printer"
+    },
+    {
+      "modelnumber": "VersaLink C405",
+      "vendor": "Xerox",
+      "modeltype": "Printer"
+    },
+    {
+      "modelnumber": "VersaLink C415",
+      "vendor": "Xerox",
+      "modeltype": "Printer"
+    },
+    {
+      "modelnumber": "VersaLink C7100",
+      "vendor": "Xerox",
+      "modeltype": "Printer"
+    },
+    {
+      "modelnumber": "VersaLink C7125",
+      "vendor": "Xerox",
+      "modeltype": "Printer"
+    },
+    {
+      "modelnumber": "ZD621",
       "vendor": "Zebra",
-      "modeltype": "LocationOnly",
-      "imageurl": "/images/models/printers/zt411.png"
+      "modeltype": "Printer"
+    },
+    {
+      "modelnumber": "ZT411",
+      "vendor": "Zebra",
+      "modeltype": "Printer"
+    },
+    {
+      "modelnumber": "CONTURA G2",
+      "vendor": "Zeiss",
+      "modeltype": "CMM"
     },
     {
       "modelnumber": "Redomatic 600",
       "vendor": "Zoller",
       "modeltype": "Measuring Machine"
-    },
-    {
-      "modelnumber": "ZOLLER",
-      "vendor": "Zoller",
-      "description": "ZOLLER Controller"
     }
   ],
   "modelsupplies": [
@@ -1333,6 +1622,86 @@
       "marketingname": "202X Magenta",
       "pageyield": 2500
     },
+    {
+      "modelnumber": "Color LaserJet M255dw",
+      "vendor": "HP",
+      "supplytype": "toner",
+      "color": "black",
+      "capacitytier": "standard",
+      "partnumber": "CF500A",
+      "marketingname": "202A Black",
+      "pageyield": 1400
+    },
+    {
+      "modelnumber": "Color LaserJet M255dw",
+      "vendor": "HP",
+      "supplytype": "toner",
+      "color": "black",
+      "capacitytier": "high",
+      "partnumber": "CF500X",
+      "marketingname": "202X Black",
+      "pageyield": 3200
+    },
+    {
+      "modelnumber": "Color LaserJet M255dw",
+      "vendor": "HP",
+      "supplytype": "toner",
+      "color": "cyan",
+      "capacitytier": "standard",
+      "partnumber": "CF501A",
+      "marketingname": "202A Cyan",
+      "pageyield": 1300
+    },
+    {
+      "modelnumber": "Color LaserJet M255dw",
+      "vendor": "HP",
+      "supplytype": "toner",
+      "color": "cyan",
+      "capacitytier": "high",
+      "partnumber": "CF501X",
+      "marketingname": "202X Cyan",
+      "pageyield": 2500
+    },
+    {
+      "modelnumber": "Color LaserJet M255dw",
+      "vendor": "HP",
+      "supplytype": "toner",
+      "color": "yellow",
+      "capacitytier": "standard",
+      "partnumber": "CF502A",
+      "marketingname": "202A Yellow",
+      "pageyield": 1300
+    },
+    {
+      "modelnumber": "Color LaserJet M255dw",
+      "vendor": "HP",
+      "supplytype": "toner",
+      "color": "yellow",
+      "capacitytier": "high",
+      "partnumber": "CF502X",
+      "marketingname": "202X Yellow",
+      "pageyield": 2500
+    },
+    {
+      "modelnumber": "Color LaserJet M255dw",
+      "vendor": "HP",
+      "supplytype": "toner",
+      "color": "magenta",
+      "capacitytier": "standard",
+      "partnumber": "CF503A",
+      "marketingname": "202A Magenta",
+      "pageyield": 1300
+    },
+    {
+      "modelnumber": "Color LaserJet M255dw",
+      "vendor": "HP",
+      "supplytype": "toner",
+      "color": "magenta",
+      "capacitytier": "high",
+      "partnumber": "CF503X",
+      "marketingname": "202X Magenta",
+      "pageyield": 2500
+    },
     {
       "modelnumber": "Color LaserJet M255dw",
       "vendor": "HP",
@@ -1414,97 +1783,167 @@
       "pageyield": 2450
     },
     {
-      "modelnumber": "HP LaserJet M610 / M611 / M612 / M634 / M635 / M636",
+      "modelnumber": "Color LaserJet Pro 3201dw",
       "vendor": "HP",
       "supplytype": "toner",
       "color": "black",
       "capacitytier": "standard",
-      "partnumber": "W1470A",
-      "marketingname": "147A Black",
-      "pageyield": 10500
+      "partnumber": "W2180A",
+      "marketingname": "218A Black",
+      "pageyield": 1300
     },
     {
-      "modelnumber": "HP LaserJet M610 / M611 / M612 / M634 / M635 / M636",
+      "modelnumber": "Color LaserJet Pro 3201dw",
       "vendor": "HP",
       "supplytype": "toner",
       "color": "black",
       "capacitytier": "high",
-      "partnumber": "W1470X",
-      "marketingname": "147X Black (not M610)",
-      "pageyield": 25200
+      "partnumber": "W2180X",
+      "marketingname": "218X Black",
+      "pageyield": 3200
     },
     {
-      "modelnumber": "LaserJet 200 color M251nw",
-      "vendor": "HP",
-      "supplytype": "toner",
-      "color": "black",
-      "capacitytier": "standard",
-      "partnumber": "CF210A",
-      "marketingname": "131A Black",
-      "pageyield": 1600
-    },
-    {
-      "modelnumber": "LaserJet 200 color M251nw",
-      "vendor": "HP",
-      "supplytype": "toner",
-      "color": "black",
-      "capacitytier": "high",
-      "partnumber": "CF210X",
-      "marketingname": "131X Black",
-      "pageyield": 2400
-    },
-    {
-      "modelnumber": "LaserJet 200 color M251nw",
+      "modelnumber": "Color LaserJet Pro 3201dw",
       "vendor": "HP",
       "supplytype": "toner",
       "color": "cyan",
       "capacitytier": "standard",
-      "partnumber": "CF211A",
-      "marketingname": "131A Cyan",
-      "pageyield": 1800
+      "partnumber": "W2181A",
+      "marketingname": "218A Cyan",
+      "pageyield": 1200
     },
     {
-      "modelnumber": "LaserJet 200 color M251nw",
+      "modelnumber": "Color LaserJet Pro 3201dw",
+      "vendor": "HP",
+      "supplytype": "toner",
+      "color": "cyan",
+      "capacitytier": "high",
+      "partnumber": "W2181X",
+      "marketingname": "218X Cyan",
+      "pageyield": 2500
+    },
+    {
+      "modelnumber": "Color LaserJet Pro 3201dw",
       "vendor": "HP",
       "supplytype": "toner",
       "color": "yellow",
       "capacitytier": "standard",
-      "partnumber": "CF212A",
-      "marketingname": "131A Yellow",
-      "pageyield": 1800
+      "partnumber": "W2182A",
+      "marketingname": "218A Yellow",
+      "pageyield": 1200
     },
     {
-      "modelnumber": "LaserJet 200 color M251nw",
+      "modelnumber": "Color LaserJet Pro 3201dw",
+      "vendor": "HP",
+      "supplytype": "toner",
+      "color": "yellow",
+      "capacitytier": "high",
+      "partnumber": "W2182X",
+      "marketingname": "218X Yellow",
+      "pageyield": 2500
+    },
+    {
+      "modelnumber": "Color LaserJet Pro 3201dw",
       "vendor": "HP",
       "supplytype": "toner",
       "color": "magenta",
       "capacitytier": "standard",
-      "partnumber": "CF213A",
-      "marketingname": "131A Magenta",
-      "pageyield": 1800
+      "partnumber": "W2183A",
+      "marketingname": "218A Magenta",
+      "pageyield": 1200
     },
     {
-      "modelnumber": "LaserJet 4250tn",
+      "modelnumber": "Color LaserJet Pro 3201dw",
+      "vendor": "HP",
+      "supplytype": "toner",
+      "color": "magenta",
+      "capacitytier": "high",
+      "partnumber": "W2183X",
+      "marketingname": "218X Magenta",
+      "pageyield": 2500
+    },
+    {
+      "modelnumber": "Color LaserJet Pro M454dw",
       "vendor": "HP",
       "supplytype": "toner",
       "color": "black",
       "capacitytier": "standard",
-      "partnumber": "Q5942A",
-      "marketingname": "42A Black",
-      "pageyield": 10000
+      "partnumber": "W2020A",
+      "marketingname": "414A Black",
+      "pageyield": 2400
     },
     {
-      "modelnumber": "LaserJet 4250tn",
+      "modelnumber": "Color LaserJet Pro M454dw",
       "vendor": "HP",
       "supplytype": "toner",
       "color": "black",
       "capacitytier": "high",
-      "partnumber": "Q5942X",
-      "marketingname": "42X Black",
-      "pageyield": 20000
+      "partnumber": "W2020X",
+      "marketingname": "414X",
+      "pageyield": 7500
     },
     {
-      "modelnumber": "LaserJet 4250tn DO NOT USE",
+      "modelnumber": "Color LaserJet Pro M454dw",
+      "vendor": "HP",
+      "supplytype": "toner",
+      "color": "cyan",
+      "capacitytier": "standard",
+      "partnumber": "W2021A",
+      "marketingname": "414A Cyan",
+      "pageyield": 2100
+    },
+    {
+      "modelnumber": "Color LaserJet Pro M454dw",
+      "vendor": "HP",
+      "supplytype": "toner",
+      "color": "cyan",
+      "capacitytier": "high",
+      "partnumber": "W2021X",
+      "marketingname": "414X Cyan",
+      "pageyield": 6000
+    },
+    {
+      "modelnumber": "Color LaserJet Pro M454dw",
+      "vendor": "HP",
+      "supplytype": "toner",
+      "color": "yellow",
+      "capacitytier": "standard",
+      "partnumber": "W2022A",
+      "marketingname": "414A",
+      "pageyield": 2100
+    },
+    {
+      "modelnumber": "Color LaserJet Pro M454dw",
+      "vendor": "HP",
+      "supplytype": "toner",
+      "color": "yellow",
+      "capacitytier": "high",
+      "partnumber": "W2022X",
+      "marketingname": "414X Yellow",
+      "pageyield": 6000
+    },
+    {
+      "modelnumber": "Color LaserJet Pro M454dw",
+      "vendor": "HP",
+      "supplytype": "toner",
+      "color": "magenta",
+      "capacitytier": "standard",
+      "partnumber": "W2023A",
+      "marketingname": "414A Magenta",
+      "pageyield": 2100
+    },
+    {
+      "modelnumber": "Color LaserJet Pro M454dw",
+      "vendor": "HP",
+      "supplytype": "toner",
+      "color": "magenta",
+      "capacitytier": "high",
+      "partnumber": "W2023X",
+      "marketingname": "414X Magenta",
+      "pageyield": 6000
+    },
+    {
+      "modelnumber": "LaserJet 4250tn",
       "vendor": "HP",
       "supplytype": "toner",
       "color": "black",
@@ -1514,7 +1953,7 @@
       "pageyield": 10000
     },
     {
-      "modelnumber": "LaserJet 4250tn DO NOT USE",
+      "modelnumber": "LaserJet 4250tn",
       "vendor": "HP",
       "supplytype": "toner",
       "color": "black",
@@ -1693,6 +2132,26 @@
       "marketingname": "90X Black (Contract)",
       "pageyield": 24000
     },
+    {
+      "modelnumber": "LaserJet M610",
+      "vendor": "HP",
+      "supplytype": "toner",
+      "color": "black",
+      "capacitytier": "standard",
+      "partnumber": "W1470A",
+      "marketingname": "147A Black",
+      "pageyield": 10500
+    },
+    {
+      "modelnumber": "LaserJet M610",
+      "vendor": "HP",
+      "supplytype": "toner",
+      "color": "black",
+      "capacitytier": "high",
+      "partnumber": "W1470X",
+      "marketingname": "147X Black",
+      "pageyield": 25200
+    },
     {
       "modelnumber": "LaserJet P3015dn",
       "vendor": "HP",
@@ -1724,7 +2183,7 @@
       "pageyield": 12500
     },
     {
-      "modelnumber": "Laserjet Pro 200 M251nw",
+      "modelnumber": "LaserJet Pro 200 color M251nw",
       "vendor": "HP",
       "supplytype": "toner",
       "color": "black",
@@ -1734,7 +2193,7 @@
       "pageyield": 1600
     },
     {
-      "modelnumber": "Laserjet Pro 200 M251nw",
+      "modelnumber": "LaserJet Pro 200 color M251nw",
       "vendor": "HP",
       "supplytype": "toner",
       "color": "black",
@@ -1744,7 +2203,7 @@
       "pageyield": 2400
     },
     {
-      "modelnumber": "Laserjet Pro 200 M251nw",
+      "modelnumber": "LaserJet Pro 200 color M251nw",
       "vendor": "HP",
       "supplytype": "toner",
       "color": "cyan",
@@ -1754,7 +2213,7 @@
       "pageyield": 1800
     },
     {
-      "modelnumber": "Laserjet Pro 200 M251nw",
+      "modelnumber": "LaserJet Pro 200 color M251nw",
       "vendor": "HP",
       "supplytype": "toner",
       "color": "yellow",
@@ -1764,7 +2223,7 @@
       "pageyield": 1800
     },
     {
-      "modelnumber": "Laserjet Pro 200 M251nw",
+      "modelnumber": "LaserJet Pro 200 color M251nw",
       "vendor": "HP",
       "supplytype": "toner",
       "color": "magenta",
@@ -1773,6 +2232,86 @@
       "marketingname": "131A Magenta",
       "pageyield": 1800
     },
+    {
+      "modelnumber": "LaserJet Pro 200 color M251nw",
+      "vendor": "HP",
+      "supplytype": "toner",
+      "color": "black",
+      "capacitytier": "standard",
+      "partnumber": "CF400A",
+      "marketingname": "201A Black",
+      "pageyield": 1500
+    },
+    {
+      "modelnumber": "LaserJet Pro 200 color M251nw",
+      "vendor": "HP",
+      "supplytype": "toner",
+      "color": "black",
+      "capacitytier": "high",
+      "partnumber": "CF400X",
+      "marketingname": "201X Black",
+      "pageyield": 2800
+    },
+    {
+      "modelnumber": "LaserJet Pro 200 color M251nw",
+      "vendor": "HP",
+      "supplytype": "toner",
+      "color": "cyan",
+      "capacitytier": "standard",
+      "partnumber": "CF401A",
+      "marketingname": "201A Cyan",
+      "pageyield": 1400
+    },
+    {
+      "modelnumber": "LaserJet Pro 200 color M251nw",
+      "vendor": "HP",
+      "supplytype": "toner",
+      "color": "cyan",
+      "capacitytier": "high",
+      "partnumber": "CF401X",
+      "marketingname": "201X Cyan",
+      "pageyield": 2500
+    },
+    {
+      "modelnumber": "LaserJet Pro 200 color M251nw",
+      "vendor": "HP",
+      "supplytype": "toner",
+      "color": "yellow",
+      "capacitytier": "standard",
+      "partnumber": "CF402A",
+      "marketingname": "201A Yellow",
+      "pageyield": 1400
+    },
+    {
+      "modelnumber": "LaserJet Pro 200 color M251nw",
+      "vendor": "HP",
+      "supplytype": "toner",
+      "color": "yellow",
+      "capacitytier": "high",
+      "partnumber": "CF402X",
+      "marketingname": "201X Yellow",
+      "pageyield": 2500
+    },
+    {
+      "modelnumber": "LaserJet Pro 200 color M251nw",
+      "vendor": "HP",
+      "supplytype": "toner",
+      "color": "magenta",
+      "capacitytier": "standard",
+      "partnumber": "CF403A",
+      "marketingname": "201A Magenta",
+      "pageyield": 1400
+    },
+    {
+      "modelnumber": "LaserJet Pro 200 color M251nw",
+      "vendor": "HP",
+      "supplytype": "toner",
+      "color": "magenta",
+      "capacitytier": "high",
+      "partnumber": "CF403X",
+      "marketingname": "201X Magenta",
+      "pageyield": 2500
+    },
     {
       "modelnumber": "LaserJet Pro 4001n",
       "vendor": "HP",
@@ -1913,86 +2452,6 @@
       "marketingname": "58X Black (Contract)",
       "pageyield": 10000
     },
-    {
-      "modelnumber": "LaserJet Pro M454dw",
-      "vendor": "HP",
-      "supplytype": "toner",
-      "color": "black",
-      "capacitytier": "standard",
-      "partnumber": "W2020A",
-      "marketingname": "414A Black",
-      "pageyield": 2400
-    },
-    {
-      "modelnumber": "LaserJet Pro M454dw",
-      "vendor": "HP",
-      "supplytype": "toner",
-      "color": "black",
-      "capacitytier": "high",
-      "partnumber": "W2020X",
-      "marketingname": "414X Black",
-      "pageyield": 7500
-    },
-    {
-      "modelnumber": "LaserJet Pro M454dw",
-      "vendor": "HP",
-      "supplytype": "toner",
-      "color": "cyan",
-      "capacitytier": "standard",
-      "partnumber": "W2021A",
-      "marketingname": "414A Cyan",
-      "pageyield": 2100
-    },
-    {
-      "modelnumber": "LaserJet Pro M454dw",
-      "vendor": "HP",
-      "supplytype": "toner",
-      "color": "cyan",
-      "capacitytier": "high",
-      "partnumber": "W2021X",
-      "marketingname": "414X Cyan",
-      "pageyield": 6000
-    },
-    {
-      "modelnumber": "LaserJet Pro M454dw",
-      "vendor": "HP",
-      "supplytype": "toner",
-      "color": "yellow",
-      "capacitytier": "standard",
-      "partnumber": "W2022A",
-      "marketingname": "414A Yellow",
-      "pageyield": 2100
-    },
-    {
-      "modelnumber": "LaserJet Pro M454dw",
-      "vendor": "HP",
-      "supplytype": "toner",
-      "color": "yellow",
-      "capacitytier": "high",
-      "partnumber": "W2022X",
-      "marketingname": "414X Yellow",
-      "pageyield": 6000
-    },
-    {
-      "modelnumber": "LaserJet Pro M454dw",
-      "vendor": "HP",
-      "supplytype": "toner",
-      "color": "magenta",
-      "capacitytier": "standard",
-      "partnumber": "W2023A",
-      "marketingname": "414A Magenta",
-      "pageyield": 2100
-    },
-    {
-      "modelnumber": "LaserJet Pro M454dw",
-      "vendor": "HP",
-      "supplytype": "toner",
-      "color": "magenta",
-      "capacitytier": "high",
-      "partnumber": "W2023X",
-      "marketingname": "414X Magenta",
-      "pageyield": 6000
-    },
     {
       "modelnumber": "LaserJet Pro M607",
       "vendor": "HP",
@@ -2004,7 +2463,37 @@
       "pageyield": 11000
     },
     {
-      "modelnumber": "Altalink C8135",
+      "modelnumber": "LaserJet Pro M607",
+      "vendor": "HP",
+      "supplytype": "toner",
+      "color": "black",
+      "capacitytier": "high",
+      "partnumber": "CF237X",
+      "marketingname": "37X Black",
+      "pageyield": 25000
+    },
+    {
+      "modelnumber": "LaserJet Pro M607",
+      "vendor": "HP",
+      "supplytype": "toner",
+      "color": "black",
+      "capacitytier": "extrahigh",
+      "partnumber": "CF237Y",
+      "marketingname": "37Y Black (not M607)",
+      "pageyield": 41000
+    },
+    {
+      "modelnumber": "LaserJet Pro M607",
+      "vendor": "HP",
+      "supplytype": "toner",
+      "color": "black",
+      "capacitytier": "metered",
+      "partnumber": "CF237YC",
+      "marketingname": "37Y Black (Contract)",
+      "pageyield": 41000
+    },
+    {
+      "modelnumber": "AltaLink C8135",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "black",
@@ -2013,7 +2502,7 @@
       "marketingname": "C8135 Black (Metered)"
     },
     {
-      "modelnumber": "Altalink C8135",
+      "modelnumber": "AltaLink C8135",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "cyan",
@@ -2022,7 +2511,7 @@
       "marketingname": "C8135 Cyan (Metered)"
     },
     {
-      "modelnumber": "Altalink C8135",
+      "modelnumber": "AltaLink C8135",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "magenta",
@@ -2031,7 +2520,7 @@
       "marketingname": "C8135 Magenta (Metered)"
     },
     {
-      "modelnumber": "Altalink C8135",
+      "modelnumber": "AltaLink C8135",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "yellow",
@@ -2040,7 +2529,7 @@
       "marketingname": "C8135 Yellow (Metered)"
     },
     {
-      "modelnumber": "Altalink C8135",
+      "modelnumber": "AltaLink C8135",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "black",
@@ -2049,7 +2538,7 @@
       "marketingname": "C8135 Black (Sold)"
     },
     {
-      "modelnumber": "Altalink C8135",
+      "modelnumber": "AltaLink C8135",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "cyan",
@@ -2058,7 +2547,7 @@
       "marketingname": "C8135 Cyan (Sold)"
     },
     {
-      "modelnumber": "Altalink C8135",
+      "modelnumber": "AltaLink C8135",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "magenta",
@@ -2067,7 +2556,7 @@
       "marketingname": "C8135 Magenta (Sold)"
     },
     {
-      "modelnumber": "Altalink C8135",
+      "modelnumber": "AltaLink C8135",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "yellow",
@@ -2076,7 +2565,7 @@
       "marketingname": "C8135 Yellow (Sold)"
     },
     {
-      "modelnumber": "Altalink C8135",
+      "modelnumber": "AltaLink C8135",
       "vendor": "Xerox",
       "supplytype": "waste",
       "color": "none",
@@ -2085,7 +2574,7 @@
       "marketingname": "C8135 Waste Cartridge"
     },
     {
-      "modelnumber": "Altalink C8135",
+      "modelnumber": "AltaLink C8135",
       "vendor": "Xerox",
       "supplytype": "drum",
       "color": "none",
@@ -2165,6 +2654,42 @@
       "partnumber": "006R01700",
       "marketingname": "C8030 Yellow (Sold)"
     },
+    {
+      "modelnumber": "AltaLink EC8036",
+      "vendor": "Xerox",
+      "supplytype": "toner",
+      "color": "black",
+      "capacitytier": "metered",
+      "partnumber": "006R01701",
+      "marketingname": "C8030 Black (Metered)"
+    },
+    {
+      "modelnumber": "AltaLink EC8036",
+      "vendor": "Xerox",
+      "supplytype": "toner",
+      "color": "cyan",
+      "capacitytier": "metered",
+      "partnumber": "006R01702",
+      "marketingname": "C8030 Cyan (Metered)"
+    },
+    {
+      "modelnumber": "AltaLink EC8036",
+      "vendor": "Xerox",
+      "supplytype": "toner",
+      "color": "magenta",
+      "capacitytier": "metered",
+      "partnumber": "006R01703",
+      "marketingname": "C8030 Magenta (Metered)"
+    },
+    {
+      "modelnumber": "AltaLink EC8036",
+      "vendor": "Xerox",
+      "supplytype": "toner",
+      "color": "yellow",
+      "capacitytier": "metered",
+      "partnumber": "006R01704",
+      "marketingname": "C8030 Yellow (Metered)"
+    },
     {
       "modelnumber": "AltaLink EC8036",
       "vendor": "Xerox",
@@ -2184,7 +2709,7 @@
       "marketingname": "C8030 / EC8036 Drum"
     },
     {
-      "modelnumber": "Versalink B405DN",
+      "modelnumber": "VersaLink B405DN",
       "vendor": "Xerox",
       "supplytype": "drum",
       "color": "none",
@@ -2193,7 +2718,7 @@
       "marketingname": "B400 / B405 Drum"
     },
     {
-      "modelnumber": "Versalink B405DN",
+      "modelnumber": "VersaLink B405DN",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "black",
@@ -2203,7 +2728,7 @@
       "pageyield": 5900
     },
     {
-      "modelnumber": "Versalink B405DN",
+      "modelnumber": "VersaLink B405DN",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "black",
@@ -2213,7 +2738,7 @@
       "pageyield": 13900
     },
     {
-      "modelnumber": "Versalink B405DN",
+      "modelnumber": "VersaLink B405DN",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "black",
@@ -2223,7 +2748,7 @@
       "pageyield": 24600
     },
     {
-      "modelnumber": "Versalink B405DN",
+      "modelnumber": "VersaLink B405DN",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "black",
@@ -2233,7 +2758,7 @@
       "pageyield": 24600
     },
     {
-      "modelnumber": "Versalink B7125",
+      "modelnumber": "VersaLink B7125",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "black",
@@ -2243,7 +2768,7 @@
       "pageyield": 34300
     },
     {
-      "modelnumber": "Versalink B7125",
+      "modelnumber": "VersaLink B7125",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "black",
@@ -2253,7 +2778,7 @@
       "pageyield": 34300
     },
     {
-      "modelnumber": "Versalink B7125",
+      "modelnumber": "VersaLink B7125",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "black",
@@ -2263,7 +2788,7 @@
       "pageyield": 34300
     },
     {
-      "modelnumber": "Versalink B7125",
+      "modelnumber": "VersaLink B7125",
       "vendor": "Xerox",
       "supplytype": "drum",
       "color": "none",
@@ -2272,7 +2797,16 @@
       "marketingname": "B7125 Drum"
     },
     {
-      "modelnumber": "Versalink C405",
+      "modelnumber": "VersaLink B7125",
+      "vendor": "Xerox",
+      "supplytype": "waste",
+      "color": "none",
+      "capacitytier": "standard",
+      "partnumber": "115R00129",
+      "marketingname": "B7000 / B7100 Waste Cartridge"
+    },
+    {
+      "modelnumber": "VersaLink C405",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "black",
@@ -2282,7 +2816,7 @@
       "pageyield": 2500
     },
     {
-      "modelnumber": "Versalink C405",
+      "modelnumber": "VersaLink C405",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "yellow",
@@ -2292,7 +2826,7 @@
       "pageyield": 2500
     },
     {
-      "modelnumber": "Versalink C405",
+      "modelnumber": "VersaLink C405",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "cyan",
@@ -2302,7 +2836,7 @@
       "pageyield": 2500
     },
     {
-      "modelnumber": "Versalink C405",
+      "modelnumber": "VersaLink C405",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "magenta",
@@ -2312,7 +2846,7 @@
       "pageyield": 2500
     },
     {
-      "modelnumber": "Versalink C405",
+      "modelnumber": "VersaLink C405",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "black",
@@ -2322,7 +2856,7 @@
       "pageyield": 5000
     },
     {
-      "modelnumber": "Versalink C405",
+      "modelnumber": "VersaLink C405",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "black",
@@ -2332,7 +2866,7 @@
       "pageyield": 10500
     },
     {
-      "modelnumber": "Versalink C405",
+      "modelnumber": "VersaLink C405",
       "vendor": "Xerox",
       "supplytype": "drum",
       "color": "none",
@@ -2341,7 +2875,7 @@
       "marketingname": "C400 / C405 Drum"
     },
     {
-      "modelnumber": "Versalink C405",
+      "modelnumber": "VersaLink C405",
       "vendor": "Xerox",
       "supplytype": "waste",
       "color": "none",
@@ -2350,7 +2884,7 @@
       "marketingname": "C400 / C405 Waste Cartridge"
     },
     {
-      "modelnumber": "Versalink C415",
+      "modelnumber": "VersaLink C415",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "black",
@@ -2360,7 +2894,7 @@
       "pageyield": 2400
     },
     {
-      "modelnumber": "Versalink C415",
+      "modelnumber": "VersaLink C415",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "cyan",
@@ -2370,7 +2904,7 @@
       "pageyield": 2000
     },
     {
-      "modelnumber": "Versalink C415",
+      "modelnumber": "VersaLink C415",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "magenta",
@@ -2380,7 +2914,7 @@
       "pageyield": 2000
     },
     {
-      "modelnumber": "Versalink C415",
+      "modelnumber": "VersaLink C415",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "yellow",
@@ -2390,7 +2924,7 @@
       "pageyield": 2000
     },
     {
-      "modelnumber": "Versalink C415",
+      "modelnumber": "VersaLink C415",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "black",
@@ -2400,7 +2934,7 @@
       "pageyield": 10500
     },
     {
-      "modelnumber": "Versalink C415",
+      "modelnumber": "VersaLink C415",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "cyan",
@@ -2410,7 +2944,7 @@
       "pageyield": 7000
     },
     {
-      "modelnumber": "Versalink C415",
+      "modelnumber": "VersaLink C415",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "magenta",
@@ -2420,7 +2954,7 @@
       "pageyield": 7000
     },
     {
-      "modelnumber": "Versalink C415",
+      "modelnumber": "VersaLink C415",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "yellow",
@@ -2430,7 +2964,7 @@
       "pageyield": 7000
     },
     {
-      "modelnumber": "Versalink C415",
+      "modelnumber": "VersaLink C415",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "black",
@@ -2440,7 +2974,7 @@
       "pageyield": 15000
     },
     {
-      "modelnumber": "Versalink C415",
+      "modelnumber": "VersaLink C415",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "cyan",
@@ -2450,7 +2984,7 @@
       "pageyield": 10000
     },
     {
-      "modelnumber": "Versalink C415",
+      "modelnumber": "VersaLink C415",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "magenta",
@@ -2460,7 +2994,7 @@
       "pageyield": 10000
     },
     {
-      "modelnumber": "Versalink C415",
+      "modelnumber": "VersaLink C415",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "yellow",
@@ -2470,7 +3004,7 @@
       "pageyield": 10000
     },
     {
-      "modelnumber": "Versalink C415",
+      "modelnumber": "VersaLink C415",
       "vendor": "Xerox",
       "supplytype": "waste",
       "color": "none",
@@ -2479,7 +3013,7 @@
       "marketingname": "C415 Waste Cartridge"
     },
     {
-      "modelnumber": "Versalink C415",
+      "modelnumber": "VersaLink C415",
       "vendor": "Xerox",
       "supplytype": "drum",
       "color": "none",
@@ -2488,7 +3022,7 @@
       "marketingname": "C415 Drum / Imaging Unit"
     },
     {
-      "modelnumber": "Versalink C7100",
+      "modelnumber": "VersaLink C7100",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "black",
@@ -2498,7 +3032,7 @@
       "pageyield": 22500
     },
     {
-      "modelnumber": "Versalink C7100",
+      "modelnumber": "VersaLink C7100",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "cyan",
@@ -2508,7 +3042,7 @@
       "pageyield": 15500
     },
     {
-      "modelnumber": "Versalink C7100",
+      "modelnumber": "VersaLink C7100",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "magenta",
@@ -2518,7 +3052,7 @@
       "pageyield": 15500
     },
     {
-      "modelnumber": "Versalink C7100",
+      "modelnumber": "VersaLink C7100",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "yellow",
@@ -2528,7 +3062,7 @@
       "pageyield": 15500
     },
     {
-      "modelnumber": "Versalink C7100",
+      "modelnumber": "VersaLink C7100",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "black",
@@ -2538,7 +3072,7 @@
       "pageyield": 31300
     },
     {
-      "modelnumber": "Versalink C7100",
+      "modelnumber": "VersaLink C7100",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "cyan",
@@ -2548,7 +3082,7 @@
       "pageyield": 18500
     },
     {
-      "modelnumber": "Versalink C7100",
+      "modelnumber": "VersaLink C7100",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "magenta",
@@ -2558,7 +3092,7 @@
       "pageyield": 18500
     },
     {
-      "modelnumber": "Versalink C7100",
+      "modelnumber": "VersaLink C7100",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "yellow",
@@ -2568,7 +3102,7 @@
       "pageyield": 18500
     },
     {
-      "modelnumber": "Versalink C7100",
+      "modelnumber": "VersaLink C7100",
       "vendor": "Xerox",
       "supplytype": "drum",
       "color": "none",
@@ -2577,7 +3111,7 @@
       "marketingname": "C7125 Drum"
     },
     {
-      "modelnumber": "Versalink C7100",
+      "modelnumber": "VersaLink C7100",
       "vendor": "Xerox",
       "supplytype": "waste",
       "color": "none",
@@ -2586,7 +3120,16 @@
       "marketingname": "C7100 Series Waste Cartridge"
     },
     {
-      "modelnumber": "Versalink C7125",
+      "modelnumber": "VersaLink C7100",
+      "vendor": "Xerox",
+      "supplytype": "waste",
+      "color": "none",
+      "capacitytier": "standard",
+      "partnumber": "115R00129",
+      "marketingname": "C7000 / C7100 Waste Cartridge"
+    },
+    {
+      "modelnumber": "VersaLink C7125",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "black",
@@ -2596,7 +3139,7 @@
       "pageyield": 22500
     },
     {
-      "modelnumber": "Versalink C7125",
+      "modelnumber": "VersaLink C7125",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "cyan",
@@ -2606,7 +3149,7 @@
       "pageyield": 15500
     },
     {
-      "modelnumber": "Versalink C7125",
+      "modelnumber": "VersaLink C7125",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "magenta",
@@ -2616,7 +3159,7 @@
       "pageyield": 15500
     },
     {
-      "modelnumber": "Versalink C7125",
+      "modelnumber": "VersaLink C7125",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "yellow",
@@ -2626,7 +3169,7 @@
       "pageyield": 15500
     },
     {
-      "modelnumber": "Versalink C7125",
+      "modelnumber": "VersaLink C7125",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "black",
@@ -2636,7 +3179,7 @@
       "pageyield": 31300
     },
     {
-      "modelnumber": "Versalink C7125",
+      "modelnumber": "VersaLink C7125",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "cyan",
@@ -2646,7 +3189,7 @@
       "pageyield": 18500
     },
     {
-      "modelnumber": "Versalink C7125",
+      "modelnumber": "VersaLink C7125",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "magenta",
@@ -2656,7 +3199,7 @@
       "pageyield": 18500
     },
     {
-      "modelnumber": "Versalink C7125",
+      "modelnumber": "VersaLink C7125",
       "vendor": "Xerox",
       "supplytype": "toner",
       "color": "yellow",
@@ -2666,7 +3209,7 @@
       "pageyield": 18500
     },
     {
-      "modelnumber": "Versalink C7125",
+      "modelnumber": "VersaLink C7125",
       "vendor": "Xerox",
       "supplytype": "drum",
       "color": "none",
@@ -2675,13 +3218,22 @@
       "marketingname": "C7125 Drum"
     },
     {
-      "modelnumber": "Versalink C7125",
+      "modelnumber": "VersaLink C7125",
       "vendor": "Xerox",
       "supplytype": "waste",
       "color": "none",
       "capacitytier": "standard",
       "partnumber": "115R00128",
       "marketingname": "C7100 Series Waste Cartridge"
+    },
+    {
+      "modelnumber": "VersaLink C7125",
+      "vendor": "Xerox",
+      "supplytype": "waste",
+      "color": "none",
+      "capacitytier": "standard",
+      "partnumber": "115R00129",
+      "marketingname": "C7000 / C7100 Waste Cartridge"
     }
   ],
   "measuringtooltypes": [
@@ -2695,11 +3247,23 @@
       "description": "Vernier / digital caliper",
       "color": "#14abef"
     },
+    {
+      "name": "CMM"
+    },
+    {
+      "name": "Eddy Current"
+    },
+    {
+      "name": "Form Tracer"
+    },
     {
       "name": "Gage Block Set",
       "description": "Reference gage block set",
       "color": "#e83e8c"
     },
+    {
+      "name": "Genspect"
+    },
     {
       "name": "Height Gage",
       "description": "Height / vertical measuring gage",
@@ -2710,6 +3274,12 @@
       "description": "Dial / test indicator",
       "color": "#11cdef"
     },
+    {
+      "name": "Inspection"
+    },
+    {
+      "name": "Measuring Machine"
+    },
     {
       "name": "Micrometer",
       "description": "Outside / inside / depth micrometer",
@@ -2720,24 +3290,65 @@
       "description": "Other measuring tool",
       "color": "#6c757d"
     },
+    {
+      "name": "Spline Checker"
+    },
     {
       "name": "Thread Gage",
       "description": "Go / no-go thread gage",
       "color": "#fb6340"
+    },
+    {
+      "name": "Vision System"
+    },
+    {
+      "name": "Wax Trace"
     }
   ],
   "notificationtypes": [
+    {
+      "typename": "Awareness",
+      "typedescription": "General awareness notification",
+      "typecolor": "#17a2b8"
+    },
+    {
+      "typename": "Change",
+      "typedescription": "Planned change notification",
+      "typecolor": "#ffc107"
+    },
     {
       "typename": "General",
+      "typedescription": "General announcement",
       "typecolor": "#28a745"
     },
+    {
+      "typename": "Incident",
+      "typedescription": "Incident or outage notification",
+      "typecolor": "#dc3545"
+    },
+    {
+      "typename": "Maintenance",
+      "typedescription": "Scheduled maintenance notification",
+      "typecolor": "#6c757d"
+    },
     {
       "typename": "Recertification",
+      "typedescription": "Employees due to retake a training course (shows two weeks)",
       "typecolor": "#0d6efd"
     },
     {
       "typename": "Recognition",
+      "typedescription": "Employee recognition (clears at 8 AM Eastern)",
       "typecolor": "#ffc107"
+    },
+    {
+      "typename": "TBD",
+      "typecolor": "success"
+    },
+    {
+      "typename": "Training",
+      "typedescription": "Training notice (one card per employee)",
+      "typecolor": "#17a2b8"
     }
   ],
   "accessprotocols": [
@@ -2751,7 +3362,7 @@
       "name": "VNC",
       "scheme": "vnc",
       "defaultport": 5900,
-      "linktemplate": "com.realvnc.vncviewer.connect://{host}:{port}"
+      "linktemplate": "vnc://{host}:{port}"
     },
     {
       "name": "WinRM",