diff --git a/diagrams/0003_Land_Rover_12V.json b/diagrams/0003_Land_Rover_12V.json
index 07bbe65..ce1b9e1 100644
--- a/diagrams/0003_Land_Rover_12V.json
+++ b/diagrams/0003_Land_Rover_12V.json
@@ -475,8 +475,8 @@
       "device_type": "switch",
       "label": "Headlight switch",
       "reference": "",
-      "x": 2609.626745737271,
-      "y": 294.9203047444426,
+      "x": 2610.504993363303,
+      "y": 385.37981022574746,
       "width": 115.52787254866973,
       "height": 138.18705259375037,
       "properties": {
@@ -657,7 +657,7 @@
       "device_type": "switch",
       "label": "Hazard Switch",
       "reference": "",
-      "x": 2485.419354273477,
+      "x": 2348.4127246124717,
       "y": 179.82231324577066,
       "width": 90.0,
       "height": 70.0,
@@ -720,8 +720,8 @@
       "device_type": "switch",
       "label": "Fog light Switch",
       "reference": "",
-      "x": 2626.3319111329592,
-      "y": 455.0766639756596,
+      "x": 2624.575415880895,
+      "y": 528.8494645623547,
       "width": 90.0,
       "height": 70.0,
       "properties": {
@@ -842,8 +842,8 @@
       "device_type": "component",
       "label": "BMS",
       "reference": "",
-      "x": 1648.6839077336845,
-      "y": -1367.0527224437028,
+      "x": 1655.1360772102437,
+      "y": -1278.0127836671825,
       "width": 120.0,
       "height": 64.76400555759813,
       "properties": {
@@ -868,8 +868,8 @@
       "device_type": "component",
       "label": "Current sensor",
       "reference": "",
-      "x": 1652.0852723151074,
-      "y": -1245.51395799214,
+      "x": 1649.5044045244836,
+      "y": -1204.2200733421596,
       "width": 120.0,
       "height": 64.76400555759813,
       "properties": {
@@ -1736,154 +1736,14 @@
         }
       ]
     },
-    {
-      "id": 87,
-      "sheet_id": null,
-      "device_type": "group",
-      "label": "\"dash/Cluster",
-      "reference": "",
-      "x": -471.34137909181356,
-      "y": -230.63435070664994,
-      "width": 1044.7441670310584,
-      "height": 796.3904952562445,
-      "properties": {
-        "fillColor": "#2828a0",
-        "fillOpacity": 0.15
-      },
-      "pins": []
-    },
-    {
-      "id": 88,
-      "sheet_id": null,
-      "device_type": "switch",
-      "label": "Hazards",
-      "reference": "",
-      "x": -309.5962291649571,
-      "y": -28.303050268625626,
-      "width": 90.0,
-      "height": 92.0,
-      "properties": {
-        "switchType": "SPDT",
-        "partNumber": "",
-        "manufacturer": ""
-      },
-      "pins": [
-        {
-          "id": "pin_1",
-          "name": "12V In",
-          "side": "right",
-          "x_offset": 90,
-          "y_offset": 30.666666666666664
-        },
-        {
-          "id": "pin_2",
-          "name": "Light 12V in",
-          "side": "right",
-          "x_offset": 90,
-          "y_offset": 61.33333333333333
-        },
-        {
-          "id": "pin_3",
-          "name": "Light GND",
-          "side": "left",
-          "x_offset": 0,
-          "y_offset": 30.666666666666664
-        },
-        {
-          "id": "pin_4",
-          "name": "Signal out",
-          "side": "left",
-          "x_offset": 0,
-          "y_offset": 61.33333333333333
-        }
-      ]
-    },
-    {
-      "id": 89,
-      "sheet_id": null,
-      "device_type": "switch",
-      "label": "Heat",
-      "reference": "",
-      "x": -88.09135541212254,
-      "y": -19.706536158648206,
-      "width": 90.0,
-      "height": 70.0,
-      "properties": {
-        "switchType": "SPDT",
-        "partNumber": "",
-        "manufacturer": ""
-      },
-      "pins": [
-        {
-          "id": "C",
-          "name": "C",
-          "side": "left",
-          "x_offset": 0,
-          "y_offset": 35
-        },
-        {
-          "id": "NO",
-          "name": "NO",
-          "side": "right",
-          "x_offset": 90,
-          "y_offset": 21
-        },
-        {
-          "id": "NC",
-          "name": "NC",
-          "side": "right",
-          "x_offset": 90,
-          "y_offset": 49
-        }
-      ]
-    },
-    {
-      "id": 90,
-      "sheet_id": null,
-      "device_type": "switch",
-      "label": "Blower fan",
-      "reference": "",
-      "x": -313.80668683502506,
-      "y": 128.57588586516135,
-      "width": 90.0,
-      "height": 70.0,
-      "properties": {
-        "switchType": "SPDT",
-        "partNumber": "",
-        "manufacturer": ""
-      },
-      "pins": [
-        {
-          "id": "C",
-          "name": "C",
-          "side": "left",
-          "x_offset": 0,
-          "y_offset": 35
-        },
-        {
-          "id": "NO",
-          "name": "NO",
-          "side": "right",
-          "x_offset": 90,
-          "y_offset": 21
-        },
-        {
-          "id": "NC",
-          "name": "NC",
-          "side": "right",
-          "x_offset": 90,
-          "y_offset": 49
-        }
-      ]
-    },
     {
       "id": 107,
       "sheet_id": null,
       "device_type": "relay",
       "label": "Right Blinker Relay",
       "reference": "",
-      "x": 2676.982468073397,
-      "y": -54.629669331190655,
+      "x": 2675.2259728213326,
+      "y": -107.32452689311577,
       "width": 110.0,
       "height": 92.0,
       "properties": {
@@ -1929,8 +1789,8 @@
       "device_type": "relay",
       "label": "Left Blinker Relay",
       "reference": "",
-      "x": 2679.9212812291453,
-      "y": 62.96311966467607,
+      "x": 2678.164785977081,
+      "y": 32.22445275355307,
       "width": 110.0,
       "height": 92.0,
       "properties": {
@@ -1991,8 +1851,8 @@
       "device_type": "group",
       "label": "HVJB/ Battery box",
       "reference": "",
-      "x": -590.011336278148,
-      "y": -1343.6028008389653,
+      "x": -1899.052836527088,
+      "y": -160.90310758456053,
       "width": 1241.6680324398856,
       "height": 992.3306363564523,
       "properties": {
@@ -2007,8 +1867,8 @@
       "device_type": "component",
       "label": "Negative Contactor",
       "reference": "",
-      "x": -545.6033984830325,
-      "y": -1222.2219005931602,
+      "x": -1854.6448987319727,
+      "y": -39.52220733875538,
       "width": 120.0,
       "height": 92.0,
       "properties": {
@@ -2054,8 +1914,8 @@
       "device_type": "component",
       "label": "Positive Contactor",
       "reference": "",
-      "x": -546.883917972251,
-      "y": -1104.402955174428,
+      "x": -1855.9254182211912,
+      "y": 78.29673807997688,
       "width": 120.0,
       "height": 92.0,
       "properties": {
@@ -2101,8 +1961,8 @@
       "device_type": "component",
       "label": "Bender IMD",
       "reference": "",
-      "x": -534.6873606493224,
-      "y": -467.0000587289293,
+      "x": -948.7005504495999,
+      "y": 725.6566861868328,
       "width": 120.0,
       "height": 80.0,
       "properties": {
@@ -2148,8 +2008,8 @@
       "device_type": "component",
       "label": "Precharge Relay",
       "reference": "",
-      "x": -536.0772915040557,
-      "y": -832.0492039994002,
+      "x": -1845.1187917529958,
+      "y": 350.6504892550046,
       "width": 120.0,
       "height": 60.0,
       "properties": {
@@ -2181,8 +2041,8 @@
       "device_type": "component",
       "label": "Honeywell current sensor",
       "reference": "",
-      "x": -539.2544757151079,
-      "y": -723.4574706206716,
+      "x": -1848.295975964048,
+      "y": 459.24222263373315,
       "width": 139.80287342348493,
       "height": 95.14337379442941,
       "properties": {
@@ -2228,8 +2088,8 @@
       "device_type": "component",
       "label": "BMS",
       "reference": "",
-      "x": -540.706098211231,
-      "y": -592.1133536887197,
+      "x": -1849.747598460171,
+      "y": 590.5863395656851,
       "width": 139.80287342348493,
       "height": 95.14337379442941,
       "properties": {
@@ -2275,8 +2135,8 @@
       "device_type": "component",
       "label": "Heat Contactor",
       "reference": "",
-      "x": -236.69974836156734,
-      "y": -589.7562685145514,
+      "x": -1545.7412486105075,
+      "y": 592.9434247398534,
       "width": 120.0,
       "height": 60.0,
       "properties": {
@@ -2308,8 +2168,8 @@
       "device_type": "terminal_block",
       "label": "12V Terminal Block",
       "reference": "",
-      "x": -346.6574401839636,
-      "y": -932.8678967101533,
+      "x": -1655.6989404329038,
+      "y": 249.83179654425146,
       "width": 96.0,
       "height": 60.0,
       "properties": {
@@ -2382,10 +2242,10 @@
       "device_type": "connector",
       "label": "Connector",
       "reference": "",
-      "x": 589.7243087423244,
-      "y": -1100.8227591093932,
+      "x": -719.3171915066157,
+      "y": 81.87693414501155,
       "width": 95.30215433005014,
-      "height": 551.1930867647818,
+      "height": 578.0,
       "properties": {
         "pinCount": 4,
         "orientation": "right",
@@ -2398,210 +2258,217 @@
           "name": "12Vin",
           "side": "left",
           "x_offset": 0,
-          "y_offset": 17.780422153702638
+          "y_offset": 18.64516129032258
         },
         {
           "id": "pin_2",
           "name": "Neg contactor OD VCU",
           "side": "left",
           "x_offset": 0,
-          "y_offset": 35.560844307405276
+          "y_offset": 37.29032258064516
         },
         {
           "id": "pin_3",
           "name": "Pos contactor OD",
           "side": "left",
           "x_offset": 0,
-          "y_offset": 53.341266461107914
+          "y_offset": 55.935483870967744
         },
         {
           "id": "pin_4",
           "name": "Precharge Relay",
           "side": "left",
           "x_offset": 0,
-          "y_offset": 71.12168861481055
+          "y_offset": 74.58064516129032
         },
         {
           "id": "pin_5",
           "name": "5",
           "side": "left",
           "x_offset": 0,
-          "y_offset": 88.9021107685132
+          "y_offset": 93.2258064516129
         },
         {
           "id": "pin_6",
           "name": "6",
           "side": "left",
           "x_offset": 0,
-          "y_offset": 106.68253292221583
+          "y_offset": 111.87096774193549
         },
         {
           "id": "pin_7",
           "name": "7",
           "side": "left",
           "x_offset": 0,
-          "y_offset": 124.46295507591847
+          "y_offset": 130.51612903225805
         },
         {
           "id": "pin_8",
           "name": "8",
           "side": "left",
           "x_offset": 0,
-          "y_offset": 142.2433772296211
+          "y_offset": 149.16129032258064
         },
         {
           "id": "pin_9",
           "name": "9",
           "side": "left",
           "x_offset": 0,
-          "y_offset": 160.02379938332376
+          "y_offset": 167.80645161290323
         },
         {
           "id": "pin_10",
           "name": "10",
           "side": "left",
           "x_offset": 0,
-          "y_offset": 177.8042215370264
+          "y_offset": 186.4516129032258
         },
         {
           "id": "pin_11",
           "name": "11",
           "side": "left",
           "x_offset": 0,
-          "y_offset": 195.58464369072905
+          "y_offset": 205.09677419354838
         },
         {
           "id": "pin_12",
           "name": "A/C Contactor",
           "side": "left",
           "x_offset": 0,
-          "y_offset": 213.36506584443165
+          "y_offset": 223.74193548387098
         },
         {
           "id": "pin_13",
           "name": "13",
           "side": "left",
           "x_offset": 0,
-          "y_offset": 231.1454879981343
+          "y_offset": 242.38709677419357
         },
         {
           "id": "pin_14",
           "name": "14",
           "side": "left",
           "x_offset": 0,
-          "y_offset": 248.92591015183694
+          "y_offset": 261.0322580645161
         },
         {
           "id": "pin_15",
           "name": "15",
           "side": "left",
           "x_offset": 0,
-          "y_offset": 266.7063323055396
+          "y_offset": 279.6774193548387
         },
         {
           "id": "pin_16",
           "name": "16",
           "side": "left",
           "x_offset": 0,
-          "y_offset": 284.4867544592422
+          "y_offset": 298.3225806451613
         },
         {
           "id": "pin_17",
           "name": "17",
           "side": "left",
           "x_offset": 0,
-          "y_offset": 302.26717661294487
+          "y_offset": 316.96774193548384
         },
         {
           "id": "pin_18",
           "name": "18",
           "side": "left",
           "x_offset": 0,
-          "y_offset": 320.0475987666475
+          "y_offset": 335.61290322580646
         },
         {
           "id": "pin_19",
           "name": "19",
           "side": "left",
           "x_offset": 0,
-          "y_offset": 337.8280209203501
+          "y_offset": 354.258064516129
         },
         {
           "id": "pin_20",
           "name": "20",
           "side": "left",
           "x_offset": 0,
-          "y_offset": 355.6084430740528
+          "y_offset": 372.9032258064516
         },
         {
           "id": "pin_21",
           "name": "21",
           "side": "left",
           "x_offset": 0,
-          "y_offset": 373.3888652277554
+          "y_offset": 391.54838709677415
         },
         {
           "id": "pin_22",
           "name": "22",
           "side": "left",
           "x_offset": 0,
-          "y_offset": 391.1692873814581
+          "y_offset": 410.19354838709677
         },
         {
           "id": "pin_23",
           "name": "23",
           "side": "left",
           "x_offset": 0,
-          "y_offset": 408.9497095351607
+          "y_offset": 428.83870967741933
         },
         {
           "id": "pin_24",
           "name": "24",
           "side": "left",
           "x_offset": 0,
-          "y_offset": 426.7301316888633
+          "y_offset": 447.48387096774195
         },
         {
           "id": "pin_25",
           "name": "25",
           "side": "left",
           "x_offset": 0,
-          "y_offset": 444.51055384256597
+          "y_offset": 466.1290322580645
         },
         {
           "id": "pin_26",
           "name": "26",
           "side": "left",
           "x_offset": 0,
-          "y_offset": 462.2909759962686
+          "y_offset": 484.77419354838713
         },
         {
           "id": "pin_27",
           "name": "27",
           "side": "left",
           "x_offset": 0,
-          "y_offset": 480.07139814997123
+          "y_offset": 503.4193548387097
         },
         {
           "id": "pin_28",
           "name": "28",
           "side": "left",
           "x_offset": 0,
-          "y_offset": 497.8518203036739
+          "y_offset": 522.0645161290322
         },
         {
           "id": "pin_29",
           "name": "29",
           "side": "left",
           "x_offset": 0,
-          "y_offset": 515.6322424573765
+          "y_offset": 540.7096774193548
         },
         {
           "id": "pin_30",
           "name": "30",
           "side": "left",
           "x_offset": 0,
-          "y_offset": 533.4126646110792
+          "y_offset": 559.3548387096774
+        },
+        {
+          "id": "pin_31",
+          "name": "",
+          "side": "right",
+          "x_offset": 95.30215433005014,
+          "y_offset": 289
         }
       ]
     },
@@ -2611,8 +2478,8 @@
       "device_type": "diode",
       "label": "Diode",
       "reference": "",
-      "x": 2478.351830241134,
-      "y": 131.60851663452428,
+      "x": 2484.4995636233584,
+      "y": 185.18162182248142,
       "width": 70.21157481274258,
       "height": 39.03546940362236,
       "properties": {
@@ -2638,6 +2505,145 @@
           "y_offset": 19.51773470181118
         }
       ]
+    },
+    {
+      "id": 128,
+      "sheet_id": null,
+      "device_type": "component",
+      "label": "BMS",
+      "reference": "",
+      "x": -1860.682144179084,
+      "y": 705.7744482239632,
+      "width": 139.80287342348493,
+      "height": 95.14337379442941,
+      "properties": {
+        "leftPins": 2,
+        "rightPins": 2,
+        "partNumber": "",
+        "manufacturer": ""
+      },
+      "pins": [
+        {
+          "id": "Lpin_1",
+          "name": "12V",
+          "side": "right",
+          "x_offset": 139.80287342348493,
+          "y_offset": 19.02867475888588
+        },
+        {
+          "id": "Lpin_2",
+          "name": "GND",
+          "side": "right",
+          "x_offset": 139.80287342348493,
+          "y_offset": 38.05734951777176
+        },
+        {
+          "id": "Rpin_1",
+          "name": "CANH",
+          "side": "right",
+          "x_offset": 139.80287342348493,
+          "y_offset": 57.086024276657646
+        },
+        {
+          "id": "Rpin_2",
+          "name": "CANL",
+          "side": "right",
+          "x_offset": 139.80287342348493,
+          "y_offset": 76.11469903554352
+        }
+      ]
+    },
+    {
+      "id": 129,
+      "sheet_id": null,
+      "device_type": "component",
+      "label": "BMS",
+      "reference": "",
+      "x": 1650.2943620368226,
+      "y": -1362.8614003499408,
+      "width": 120.0,
+      "height": 64.76400555759813,
+      "properties": {
+        "leftPins": 2,
+        "rightPins": 2,
+        "partNumber": "",
+        "manufacturer": ""
+      },
+      "pins": [
+        {
+          "id": "Rpin_2",
+          "name": "R2",
+          "side": "right",
+          "x_offset": 120,
+          "y_offset": 32.38200277879906
+        }
+      ]
+    },
+    {
+      "id": 130,
+      "sheet_id": null,
+      "device_type": "diode",
+      "label": "Diode",
+      "reference": "",
+      "x": 2486.3956395903315,
+      "y": 228.35533621296275,
+      "width": 70.21157481274258,
+      "height": 39.03546940362236,
+      "properties": {
+        "diodeType": "rectifier",
+        "voltage": "",
+        "current": "",
+        "partNumber": "",
+        "manufacturer": ""
+      },
+      "pins": [
+        {
+          "id": "A",
+          "name": "A",
+          "side": "left",
+          "x_offset": 0,
+          "y_offset": 19.51773470181118
+        },
+        {
+          "id": "K",
+          "name": "K",
+          "side": "right",
+          "x_offset": 70.21157481274258,
+          "y_offset": 19.51773470181118
+        }
+      ]
+    },
+    {
+      "id": 131,
+      "sheet_id": null,
+      "device_type": "group",
+      "label": "\"dash/Cluster",
+      "reference": "",
+      "x": 2099.815603007657,
+      "y": 646.63046824703,
+      "width": 1697.9784630737863,
+      "height": 976.5930596818248,
+      "properties": {
+        "fillColor": "#2828a0",
+        "fillOpacity": 0.15
+      },
+      "pins": []
+    },
+    {
+      "id": 132,
+      "sheet_id": null,
+      "device_type": "group",
+      "label": "VCU",
+      "reference": "",
+      "x": -448.24459213133923,
+      "y": -161.4233278331219,
+      "width": 1351.791423788707,
+      "height": 1483.4180699453564,
+      "properties": {
+        "fillColor": "#2828a0",
+        "fillOpacity": 0.15
+      },
+      "pins": []
     }
   ],
   "wires": [
@@ -3066,12 +3072,12 @@
       "notes": "",
       "waypoints": [
         {
-          "x": 2815.947908994324,
-          "y": 260.37587024636076
+          "x": 2812.4349184901957,
+          "y": 330.63568032892766
         },
         {
-          "x": 2523.0546132933696,
-          "y": 260.88205107083667
+          "x": 2259.580325483744,
+          "y": 323.2376325191148
         },
         {
           "x": 2257.226437003625,
@@ -3132,16 +3138,16 @@
       "notes": "",
       "waypoints": [
         {
-          "x": 2749.1546182859406,
-          "y": 271.82231324577066
+          "x": 2757.9370945462615,
+          "y": 345.59511383246576
         },
         {
-          "x": 2296.889798539009,
-          "y": 272.5752690294058
+          "x": 2171.300388016421,
+          "y": 345.46982199006885
         },
         {
-          "x": 2342.784157124551,
-          "y": -292.4495625100615
+          "x": 2168.8911271701977,
+          "y": -259.0761527208423
         }
       ],
       "twisted_pair": false,
@@ -3165,7 +3171,12 @@
       "length": null,
       "length_unit": "in",
       "notes": "",
-      "waypoints": [],
+      "waypoints": [
+        {
+          "x": 2851.9887480305356,
+          "y": 477.92553719289765
+        }
+      ],
       "twisted_pair": false,
       "twist_pitch": 16.0,
       "shielded": false,
@@ -3189,8 +3200,8 @@
       "notes": "",
       "waypoints": [
         {
-          "x": 2755.4623978916743,
-          "y": 544.7311097550808
+          "x": 2756.3406455177064,
+          "y": 607.964938829391
         },
         {
           "x": 2073.8612587483117,
@@ -4086,6 +4097,10 @@
         {
           "x": 2183.2930932934887,
           "y": 153.8721351199326
+        },
+        {
+          "x": 2295.179753126193,
+          "y": 215.3294970093041
         }
       ],
       "twisted_pair": false,
@@ -4591,7 +4606,7 @@
       "waypoints": [
         {
           "x": 2240.448095919807,
-          "y": -16.748084890171704
+          "y": -19.382827768267937
         },
         {
           "x": 2278.113966150787,
@@ -4694,7 +4709,12 @@
       "length": null,
       "length_unit": "in",
       "notes": "",
-      "waypoints": [],
+      "waypoints": [
+        {
+          "x": 2651.74828929522,
+          "y": -4.2324094987172876
+        }
+      ],
       "twisted_pair": false,
       "twist_pitch": 16.0,
       "shielded": false,
@@ -4745,8 +4765,8 @@
       "notes": "",
       "waypoints": [
         {
-          "x": 2842.3469461925483,
-          "y": 158.0767096309571
+          "x": 2873.9638607297034,
+          "y": 144.90299524047578
         },
         {
           "x": 2555.8552843639313,
@@ -4776,8 +4796,8 @@
       "notes": "",
       "waypoints": [
         {
-          "x": 2805.9144805264814,
-          "y": 56.231407882633604
+          "x": 2870.9048048528557,
+          "y": 13.19727420706134
         }
       ],
       "twisted_pair": false,
@@ -4825,8 +4845,8 @@
       "notes": "",
       "waypoints": [
         {
-          "x": 2941.708216190913,
-          "y": -63.83012669872329
+          "x": 2946.099454321073,
+          "y": -206.98448974195324
         },
         {
           "x": 2723.9414327778313,
@@ -5118,7 +5138,12 @@
       "length": null,
       "length_unit": "in",
       "notes": "",
-      "waypoints": [],
+      "waypoints": [
+        {
+          "x": -782.8249778191031,
+          "y": 276.33821689519857
+        }
+      ],
       "twisted_pair": false,
       "twist_pitch": 16.0,
       "shielded": false,
@@ -5184,6 +5209,33 @@
       "length": null,
       "length_unit": "in",
       "notes": "",
+      "waypoints": [
+        {
+          "x": -848.6698765937854,
+          "y": 259.5542230898875
+        }
+      ],
+      "twisted_pair": false,
+      "twist_pitch": 16.0,
+      "shielded": false,
+      "show_size_label": false,
+      "bundle_id": null,
+      "bundle_label": null
+    },
+    {
+      "id": 166,
+      "sheet_id": null,
+      "label": "",
+      "from_device_id": 116,
+      "from_pin": "Lpin_1",
+      "to_device_id": 128,
+      "to_pin": "Lpin_1",
+      "color_primary": "#CC0000",
+      "color_stripe": null,
+      "gauge": "18 AWG",
+      "length": null,
+      "length_unit": "in",
+      "notes": "",
       "waypoints": [],
       "twisted_pair": false,
       "twist_pitch": 16.0,
@@ -5191,6 +5243,255 @@
       "show_size_label": false,
       "bundle_id": null,
       "bundle_label": null
+    },
+    {
+      "id": 167,
+      "sheet_id": null,
+      "label": "",
+      "from_device_id": 116,
+      "from_pin": "Lpin_2",
+      "to_device_id": 128,
+      "to_pin": "Lpin_2",
+      "color_primary": "#8B4513",
+      "color_stripe": null,
+      "gauge": "18 AWG",
+      "length": null,
+      "length_unit": "in",
+      "notes": "",
+      "waypoints": [
+        {
+          "x": -1638.2653838123767,
+          "y": 742.7272883410935
+        }
+      ],
+      "twisted_pair": false,
+      "twist_pitch": 16.0,
+      "shielded": false,
+      "show_size_label": false,
+      "bundle_id": null,
+      "bundle_label": null
+    },
+    {
+      "id": 168,
+      "sheet_id": null,
+      "label": "",
+      "from_device_id": 128,
+      "from_pin": "Rpin_1",
+      "to_device_id": 119,
+      "to_pin": "pin_13",
+      "color_primary": "#000000",
+      "color_stripe": "#cccccc",
+      "gauge": "18 AWG",
+      "length": null,
+      "length_unit": "in",
+      "notes": "",
+      "waypoints": [
+        {
+          "x": -1602.6436262740308,
+          "y": 697.7467825855047
+        },
+        {
+          "x": -759.0822095238505,
+          "y": 313.0063063906632
+        }
+      ],
+      "twisted_pair": false,
+      "twist_pitch": 16.0,
+      "shielded": false,
+      "show_size_label": false,
+      "bundle_id": null,
+      "bundle_label": null
+    },
+    {
+      "id": 169,
+      "sheet_id": null,
+      "label": "",
+      "from_device_id": 119,
+      "from_pin": "pin_14",
+      "to_device_id": 128,
+      "to_pin": "Rpin_2",
+      "color_primary": "#DDDDDD",
+      "color_stripe": "#000000",
+      "gauge": "18 AWG",
+      "length": null,
+      "length_unit": "in",
+      "notes": "",
+      "waypoints": [
+        {
+          "x": -841.5265972798877,
+          "y": 713.2797831772219
+        },
+        {
+          "x": -1577.5518560874107,
+          "y": 781.3860165409051
+        }
+      ],
+      "twisted_pair": false,
+      "twist_pitch": 16.0,
+      "shielded": false,
+      "show_size_label": false,
+      "bundle_id": null,
+      "bundle_label": null
+    },
+    {
+      "id": 170,
+      "sheet_id": null,
+      "label": "",
+      "from_device_id": 129,
+      "from_pin": "Rpin_2",
+      "to_device_id": 38,
+      "to_pin": "pin_4",
+      "color_primary": "#007700",
+      "color_stripe": "#cccccc",
+      "gauge": "18 AWG",
+      "length": null,
+      "length_unit": "in",
+      "notes": "",
+      "waypoints": [
+        {
+          "x": 2047.460778657786,
+          "y": -1329.143123234895
+        },
+        {
+          "x": 2043.5894769718504,
+          "y": -972.983368128813
+        }
+      ],
+      "twisted_pair": true,
+      "twist_pitch": 16.0,
+      "shielded": false,
+      "show_size_label": false,
+      "bundle_id": null,
+      "bundle_label": null
+    },
+    {
+      "id": 171,
+      "sheet_id": null,
+      "label": "",
+      "from_device_id": 21,
+      "from_pin": "NO",
+      "to_device_id": 120,
+      "to_pin": "A",
+      "color_primary": "#CC0000",
+      "color_stripe": null,
+      "gauge": "18 AWG",
+      "length": null,
+      "length_unit": "in",
+      "notes": "",
+      "waypoints": [],
+      "twisted_pair": false,
+      "twist_pitch": 16.0,
+      "shielded": false,
+      "show_size_label": false,
+      "bundle_id": null,
+      "bundle_label": null
+    },
+    {
+      "id": 172,
+      "sheet_id": null,
+      "label": "",
+      "from_device_id": 21,
+      "from_pin": "NO",
+      "to_device_id": 130,
+      "to_pin": "A",
+      "color_primary": "#CC0000",
+      "color_stripe": null,
+      "gauge": "18 AWG",
+      "length": null,
+      "length_unit": "in",
+      "notes": "",
+      "waypoints": [],
+      "twisted_pair": false,
+      "twist_pitch": 16.0,
+      "shielded": false,
+      "show_size_label": false,
+      "bundle_id": null,
+      "bundle_label": null
+    },
+    {
+      "id": 173,
+      "sheet_id": null,
+      "label": "",
+      "from_device_id": 120,
+      "from_pin": "K",
+      "to_device_id": 17,
+      "to_pin": "NC",
+      "color_primary": "#FFD700",
+      "color_stripe": null,
+      "gauge": "18 AWG",
+      "length": null,
+      "length_unit": "in",
+      "notes": "",
+      "waypoints": [
+        {
+          "x": 2577.9754887085246,
+          "y": 68.66214346194586
+        }
+      ],
+      "twisted_pair": false,
+      "twist_pitch": 16.0,
+      "shielded": false,
+      "show_size_label": false,
+      "bundle_id": null,
+      "bundle_label": null
+    },
+    {
+      "id": 174,
+      "sheet_id": null,
+      "label": "",
+      "from_device_id": 130,
+      "from_pin": "K",
+      "to_device_id": 17,
+      "to_pin": "NO",
+      "color_primary": "#0000CC",
+      "color_stripe": null,
+      "gauge": "18 AWG",
+      "length": null,
+      "length_unit": "in",
+      "notes": "",
+      "waypoints": [
+        {
+          "x": 2591.149203099006,
+          "y": 33.532238420662395
+        }
+      ],
+      "twisted_pair": false,
+      "twist_pitch": 16.0,
+      "shielded": false,
+      "show_size_label": false,
+      "bundle_id": null,
+      "bundle_label": null
+    },
+    {
+      "id": 175,
+      "sheet_id": null,
+      "label": "",
+      "from_device_id": 119,
+      "from_pin": "pin_1",
+      "to_device_id": 61,
+      "to_pin": "B",
+      "color_primary": "#CC0000",
+      "color_stripe": null,
+      "gauge": "18 AWG",
+      "length": null,
+      "length_unit": "in",
+      "notes": "",
+      "waypoints": [
+        {
+          "x": -738.1797627515962,
+          "y": -231.11156168760812
+        },
+        {
+          "x": -606.4464749989238,
+          "y": -236.40228266312653
+        }
+      ],
+      "twisted_pair": false,
+      "twist_pitch": 16.0,
+      "shielded": false,
+      "show_size_label": false,
+      "bundle_id": null,
+      "bundle_label": null
     }
   ]
 }
\ No newline at end of file
diff --git a/diagrams/0005_VW_bms.json b/diagrams/0005_VW_bms.json
new file mode 100644
index 0000000..8881c15
--- /dev/null
+++ b/diagrams/0005_VW_bms.json
@@ -0,0 +1,530 @@
+{
+  "id": 5,
+  "name": "VW bms",
+  "description": "",
+  "sheets": [],
+  "wire_bundles": [],
+  "devices": [
+    {
+      "id": 121,
+      "sheet_id": null,
+      "device_type": "connector",
+      "label": "1",
+      "reference": "",
+      "x": 460.0,
+      "y": -1130.0,
+      "width": 100.0,
+      "height": 236.0,
+      "properties": {
+        "pinCount": 4,
+        "orientation": "right",
+        "partNumber": "",
+        "manufacturer": ""
+      },
+      "pins": [
+        {
+          "id": "pin_1",
+          "name": "1",
+          "side": "right",
+          "x_offset": 100,
+          "y_offset": 33.714285714285715
+        },
+        {
+          "id": "pin_2",
+          "name": "2",
+          "side": "right",
+          "x_offset": 100,
+          "y_offset": 67.42857142857143
+        },
+        {
+          "id": "pin_3",
+          "name": "3",
+          "side": "right",
+          "x_offset": 100,
+          "y_offset": 101.14285714285714
+        },
+        {
+          "id": "pin_4",
+          "name": "4",
+          "side": "right",
+          "x_offset": 100,
+          "y_offset": 134.85714285714286
+        },
+        {
+          "id": "pin_5",
+          "name": "5",
+          "side": "right",
+          "x_offset": 100,
+          "y_offset": 168.57142857142858
+        },
+        {
+          "id": "pin_6",
+          "name": "6",
+          "side": "right",
+          "x_offset": 100,
+          "y_offset": 202.28571428571428
+        },
+        {
+          "id": "pin_7",
+          "name": "7",
+          "side": "left",
+          "x_offset": 0,
+          "y_offset": 33.714285714285715
+        },
+        {
+          "id": "pin_8",
+          "name": "8",
+          "side": "left",
+          "x_offset": 0,
+          "y_offset": 67.42857142857143
+        },
+        {
+          "id": "pin_9",
+          "name": "9",
+          "side": "left",
+          "x_offset": 0,
+          "y_offset": 101.14285714285714
+        },
+        {
+          "id": "pin_10",
+          "name": "10",
+          "side": "left",
+          "x_offset": 0,
+          "y_offset": 134.85714285714286
+        },
+        {
+          "id": "pin_11",
+          "name": "11",
+          "side": "left",
+          "x_offset": 0,
+          "y_offset": 168.57142857142858
+        },
+        {
+          "id": "pin_12",
+          "name": "12",
+          "side": "left",
+          "x_offset": 0,
+          "y_offset": 202.28571428571428
+        }
+      ]
+    },
+    {
+      "id": 124,
+      "sheet_id": null,
+      "device_type": "ground",
+      "label": "?",
+      "reference": "",
+      "x": 200.0,
+      "y": -750.0,
+      "width": 60.0,
+      "height": 50.0,
+      "properties": {
+        "groundType": "chassis",
+        "reference": ""
+      },
+      "pins": [
+        {
+          "id": "GND",
+          "name": "GND",
+          "side": "top",
+          "x_offset": 30,
+          "y_offset": 0
+        }
+      ]
+    },
+    {
+      "id": 125,
+      "sheet_id": null,
+      "device_type": "connector",
+      "label": "pigtail",
+      "reference": "",
+      "x": -56.85155707019593,
+      "y": -1024.63127707672,
+      "width": 100.0,
+      "height": 110.0,
+      "properties": {
+        "pinCount": 4,
+        "orientation": "right",
+        "partNumber": "",
+        "manufacturer": ""
+      },
+      "pins": [
+        {
+          "id": "pin_1",
+          "name": "1",
+          "side": "right",
+          "x_offset": 100,
+          "y_offset": 18.333333333333332
+        },
+        {
+          "id": "pin_2",
+          "name": "2",
+          "side": "right",
+          "x_offset": 100,
+          "y_offset": 36.666666666666664
+        },
+        {
+          "id": "pin_3",
+          "name": "3",
+          "side": "right",
+          "x_offset": 100,
+          "y_offset": 55
+        },
+        {
+          "id": "pin_4",
+          "name": "4",
+          "side": "right",
+          "x_offset": 100,
+          "y_offset": 73.33333333333333
+        },
+        {
+          "id": "pin_5",
+          "name": "5",
+          "side": "right",
+          "x_offset": 100,
+          "y_offset": 91.66666666666667
+        }
+      ]
+    },
+    {
+      "id": 126,
+      "sheet_id": null,
+      "device_type": "connector",
+      "label": "2",
+      "reference": "",
+      "x": 840.0,
+      "y": -1130.0,
+      "width": 100.0,
+      "height": 236.0,
+      "properties": {
+        "pinCount": 4,
+        "orientation": "right",
+        "partNumber": "",
+        "manufacturer": ""
+      },
+      "pins": [
+        {
+          "id": "pin_1",
+          "name": "1",
+          "side": "right",
+          "x_offset": 100,
+          "y_offset": 33.714285714285715
+        },
+        {
+          "id": "pin_2",
+          "name": "2",
+          "side": "right",
+          "x_offset": 100,
+          "y_offset": 67.42857142857143
+        },
+        {
+          "id": "pin_3",
+          "name": "3",
+          "side": "right",
+          "x_offset": 100,
+          "y_offset": 101.14285714285714
+        },
+        {
+          "id": "pin_4",
+          "name": "4",
+          "side": "right",
+          "x_offset": 100,
+          "y_offset": 134.85714285714286
+        },
+        {
+          "id": "pin_5",
+          "name": "5",
+          "side": "right",
+          "x_offset": 100,
+          "y_offset": 168.57142857142858
+        },
+        {
+          "id": "pin_6",
+          "name": "6",
+          "side": "right",
+          "x_offset": 100,
+          "y_offset": 202.28571428571428
+        },
+        {
+          "id": "pin_7",
+          "name": "7",
+          "side": "left",
+          "x_offset": 0,
+          "y_offset": 33.714285714285715
+        },
+        {
+          "id": "pin_8",
+          "name": "8",
+          "side": "left",
+          "x_offset": 0,
+          "y_offset": 67.42857142857143
+        },
+        {
+          "id": "pin_9",
+          "name": "9",
+          "side": "left",
+          "x_offset": 0,
+          "y_offset": 101.14285714285714
+        },
+        {
+          "id": "pin_10",
+          "name": "10",
+          "side": "left",
+          "x_offset": 0,
+          "y_offset": 134.85714285714286
+        },
+        {
+          "id": "pin_11",
+          "name": "11",
+          "side": "left",
+          "x_offset": 0,
+          "y_offset": 168.57142857142858
+        },
+        {
+          "id": "pin_12",
+          "name": "12",
+          "side": "left",
+          "x_offset": 0,
+          "y_offset": 202.28571428571428
+        }
+      ]
+    },
+    {
+      "id": 127,
+      "sheet_id": null,
+      "device_type": "connector",
+      "label": "3",
+      "reference": "",
+      "x": 1220.0,
+      "y": -1130.0,
+      "width": 100.0,
+      "height": 236.0,
+      "properties": {
+        "pinCount": 4,
+        "orientation": "right",
+        "partNumber": "",
+        "manufacturer": ""
+      },
+      "pins": [
+        {
+          "id": "pin_1",
+          "name": "1",
+          "side": "right",
+          "x_offset": 100,
+          "y_offset": 33.714285714285715
+        },
+        {
+          "id": "pin_2",
+          "name": "2",
+          "side": "right",
+          "x_offset": 100,
+          "y_offset": 67.42857142857143
+        },
+        {
+          "id": "pin_3",
+          "name": "3",
+          "side": "right",
+          "x_offset": 100,
+          "y_offset": 101.14285714285714
+        },
+        {
+          "id": "pin_4",
+          "name": "4",
+          "side": "right",
+          "x_offset": 100,
+          "y_offset": 134.85714285714286
+        },
+        {
+          "id": "pin_5",
+          "name": "5",
+          "side": "right",
+          "x_offset": 100,
+          "y_offset": 168.57142857142858
+        },
+        {
+          "id": "pin_6",
+          "name": "6",
+          "side": "right",
+          "x_offset": 100,
+          "y_offset": 202.28571428571428
+        },
+        {
+          "id": "pin_7",
+          "name": "7",
+          "side": "left",
+          "x_offset": 0,
+          "y_offset": 33.714285714285715
+        },
+        {
+          "id": "pin_8",
+          "name": "8",
+          "side": "left",
+          "x_offset": 0,
+          "y_offset": 67.42857142857143
+        },
+        {
+          "id": "pin_9",
+          "name": "9",
+          "side": "left",
+          "x_offset": 0,
+          "y_offset": 101.14285714285714
+        },
+        {
+          "id": "pin_10",
+          "name": "10",
+          "side": "left",
+          "x_offset": 0,
+          "y_offset": 134.85714285714286
+        },
+        {
+          "id": "pin_11",
+          "name": "11",
+          "side": "left",
+          "x_offset": 0,
+          "y_offset": 168.57142857142858
+        },
+        {
+          "id": "pin_12",
+          "name": "12",
+          "side": "left",
+          "x_offset": 0,
+          "y_offset": 202.28571428571428
+        }
+      ]
+    }
+  ],
+  "wires": [
+    {
+      "id": 160,
+      "sheet_id": null,
+      "label": "",
+      "from_device_id": 121,
+      "from_pin": "pin_12",
+      "to_device_id": 125,
+      "to_pin": "pin_5",
+      "color_primary": "#8B4513",
+      "color_stripe": null,
+      "gauge": "18 AWG",
+      "length": null,
+      "length_unit": "in",
+      "notes": "",
+      "waypoints": [],
+      "twisted_pair": false,
+      "twist_pitch": 16.0,
+      "shielded": false,
+      "show_size_label": false,
+      "bundle_id": null,
+      "bundle_label": null
+    },
+    {
+      "id": 161,
+      "sheet_id": null,
+      "label": "",
+      "from_device_id": 121,
+      "from_pin": "pin_10",
+      "to_device_id": 125,
+      "to_pin": "pin_4",
+      "color_primary": "#007700",
+      "color_stripe": "#ff0000",
+      "gauge": "18 AWG",
+      "length": null,
+      "length_unit": "in",
+      "notes": "",
+      "waypoints": [],
+      "twisted_pair": false,
+      "twist_pitch": 16.0,
+      "shielded": false,
+      "show_size_label": false,
+      "bundle_id": null,
+      "bundle_label": null
+    },
+    {
+      "id": 162,
+      "sheet_id": null,
+      "label": "",
+      "from_device_id": 121,
+      "from_pin": "pin_9",
+      "to_device_id": 125,
+      "to_pin": "pin_3",
+      "color_primary": "#FF8C00",
+      "color_stripe": "#0000ff",
+      "gauge": "18 AWG",
+      "length": null,
+      "length_unit": "in",
+      "notes": "",
+      "waypoints": [],
+      "twisted_pair": false,
+      "twist_pitch": 16.0,
+      "shielded": false,
+      "show_size_label": false,
+      "bundle_id": null,
+      "bundle_label": null
+    },
+    {
+      "id": 163,
+      "sheet_id": null,
+      "label": "",
+      "from_device_id": 125,
+      "from_pin": "pin_2",
+      "to_device_id": 121,
+      "to_pin": "pin_8",
+      "color_primary": "#FF8C00",
+      "color_stripe": "#ff0000",
+      "gauge": "18 AWG",
+      "length": null,
+      "length_unit": "in",
+      "notes": "",
+      "waypoints": [],
+      "twisted_pair": false,
+      "twist_pitch": 16.0,
+      "shielded": false,
+      "show_size_label": false,
+      "bundle_id": null,
+      "bundle_label": null
+    },
+    {
+      "id": 164,
+      "sheet_id": null,
+      "label": "",
+      "from_device_id": 121,
+      "from_pin": "pin_7",
+      "to_device_id": 125,
+      "to_pin": "pin_1",
+      "color_primary": "#007700",
+      "color_stripe": "#cccccc",
+      "gauge": "18 AWG",
+      "length": null,
+      "length_unit": "in",
+      "notes": "",
+      "waypoints": [],
+      "twisted_pair": false,
+      "twist_pitch": 16.0,
+      "shielded": false,
+      "show_size_label": false,
+      "bundle_id": null,
+      "bundle_label": null
+    },
+    {
+      "id": 165,
+      "sheet_id": null,
+      "label": "",
+      "from_device_id": 121,
+      "from_pin": "pin_11",
+      "to_device_id": 124,
+      "to_pin": "GND",
+      "color_primary": "#007700",
+      "color_stripe": "#000000",
+      "gauge": "18 AWG",
+      "length": null,
+      "length_unit": "in",
+      "notes": "",
+      "waypoints": [],
+      "twisted_pair": false,
+      "twist_pitch": 16.0,
+      "shielded": false,
+      "show_size_label": false,
+      "bundle_id": null,
+      "bundle_label": null
+    }
+  ]
+}
\ No newline at end of file