diff --git a/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/325kW.vfld b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/325kW.vfld
new file mode 100644
index 0000000000000000000000000000000000000000..750d4048ef2da521d3c51bd0a8af39b6373c8575
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/325kW.vfld	
@@ -0,0 +1,202 @@
+engine speed [1/min], full load torque [Nm], motoring torque [Nm]
+600,1188,-138
+608,1206.92,-138.2
+616,1225.84,-138.4
+624,1244.76,-138.6
+632,1263.68,-138.8
+640,1282.6,-139
+648,1301.52,-139.2
+656,1320.44,-139.4
+664,1339.36,-139.6
+672,1358.28,-139.8
+680,1377.2,-140
+688,1396.12,-140.2
+696,1415.04,-140.4
+704,1433.96,-140.6
+712,1452.88,-140.8
+720,1471.8,-141
+728,1490.72,-141.2
+736,1509.64,-141.4
+744,1528.56,-141.6
+752,1547.48,-141.8
+760,1566.4,-142
+768,1585.32,-142.2
+776,1604.24,-142.4
+784,1623.16,-142.6
+792,1642.08,-142.8
+800,1661,-143
+808,1679.92,-143.36
+816,1698.84,-143.72
+824,1717.76,-144.08
+832,1736.68,-144.44
+840,1755.6,-144.8
+848,1774.52,-145.16
+856,1793.44,-145.52
+864,1812.36,-145.88
+872,1831.28,-146.24
+880,1850.2,-146.6
+888,1869.12,-146.96
+896,1888.04,-147.32
+904,1906.96,-147.68
+912,1925.88,-148.04
+920,1944.8,-148.4
+928,1963.72,-148.76
+936,1982.64,-149.12
+944,2001.56,-149.48
+952,2020.48,-149.84
+960,2039.4,-150.2
+968,2058.32,-150.56
+976,2077.24,-150.92
+984,2096.16,-151.28
+992,2115.08,-151.64
+1000,2134,-152
+1008,2134,-152.52
+1016,2134,-153.04
+1024,2134,-153.56
+1032,2134,-154.08
+1040,2134,-154.6
+1048,2134,-155.12
+1056,2134,-155.64
+1064,2134,-156.16
+1072,2134,-156.68
+1080,2134,-157.2
+1088,2134,-157.72
+1096,2134,-158.24
+1104,2134,-158.76
+1112,2134,-159.28
+1120,2134,-159.8
+1128,2134,-160.32
+1136,2134,-160.84
+1144,2134,-161.36
+1152,2134,-161.88
+1160,2134,-162.4
+1168,2134,-162.92
+1176,2134,-163.44
+1184,2134,-163.96
+1192,2134,-164.48
+1200,2134,-165
+1208,2134,-165.88
+1216,2134,-166.76
+1224,2134,-167.64
+1232,2134,-168.52
+1240,2134,-169.4
+1248,2134,-170.28
+1256,2134,-171.16
+1264,2134,-172.04
+1272,2134,-172.92
+1280,2134,-173.8
+1288,2134,-174.68
+1296,2134,-175.56
+1304,2134,-176.44
+1312,2134,-177.32
+1320,2134,-178.2
+1328,2134,-179.08
+1336,2134,-179.96
+1344,2134,-180.84
+1352,2134,-181.72
+1360,2134,-182.6
+1368,2134,-183.48
+1376,2134,-184.36
+1384,2134,-185.24
+1392,2134,-186.12
+1400,2134,-187
+1408,2125.76,-188.2
+1416,2117.52,-189.4
+1424,2109.28,-190.6
+1432,2101.04,-191.8
+1440,2092.8,-193
+1448,2084.56,-194.2
+1456,2076.32,-195.4
+1464,2068.08,-196.6
+1472,2059.84,-197.8
+1480,2051.6,-199
+1488,2043.36,-200.2
+1496,2035.12,-201.3911
+1504,2026.88,-202.5793
+1512,2018.64,-203.7675
+1520,2010.4,-204.9557
+1528,2002.16,-206.1439
+1536,1993.92,-207.3321
+1544,1985.68,-208.5203
+1552,1977.44,-209.7085
+1560,1969.2,-210.8967
+1568,1960.96,-212.0849
+1576,1952.72,-213.2731
+1584,1944.48,-214.4613
+1592,1936.24,-215.6495
+1600,1928,-216.8377
+1608,1919.76,-218.0259
+1616,1911.52,-219.16
+1624,1903.28,-220.24
+1632,1895.04,-221.32
+1640,1886.8,-222.4
+1648,1878.56,-223.48
+1656,1870.32,-224.56
+1664,1862.08,-225.64
+1672,1853.84,-226.72
+1680,1845.6,-227.8
+1688,1837.36,-228.88
+1696,1829.12,-229.96
+1704,1820.88,-231.04
+1712,1812.64,-232.12
+1720,1804.4,-233.2
+1728,1796.16,-234.28
+1736,1787.92,-235.36
+1744,1779.68,-236.44
+1752,1771.44,-237.52
+1760,1763.2,-238.6
+1768,1754.96,-239.68
+1776,1746.72,-240.76
+1784,1738.48,-241.84
+1792,1730.24,-242.92
+1800,1722,-244
+1808,1703.24,-245.36
+1816,1684.48,-246.72
+1824,1665.72,-248.08
+1832,1646.96,-249.44
+1840,1628.2,-250.8
+1848,1609.44,-252.16
+1856,1590.68,-253.52
+1864,1571.92,-254.88
+1872,1553.16,-256.24
+1880,1534.4,-257.6
+1888,1515.64,-258.96
+1896,1496.88,-260.32
+1904,1478.12,-261.68
+1912,1459.36,-263.04
+1920,1440.6,-264.4
+1928,1421.84,-265.76
+1936,1403.08,-267.12
+1944,1384.32,-268.48
+1952,1365.56,-269.84
+1960,1346.8,-271.2
+1968,1328.04,-272.56
+1976,1309.28,-273.92
+1984,1290.52,-275.28
+1992,1271.76,-276.64
+2000,1253,-278
+2008,1234.28,-279.36
+2016,1215.56,-280.72
+2024,1196.84,-282.08
+2032,1178.12,-283.44
+2040,1159.4,-284.8
+2048,1140.68,-286.16
+2056,1121.96,-287.52
+2064,1103.24,-288.88
+2072,1084.52,-290.24
+2080,1065.8,-291.6
+2088,1047.08,-292.96
+2096,1028.36,-294.32
+2104,978.24,-295.68
+2112,896.72,-297.04
+2120,815.2,-298.4
+2128,733.68,-299.76
+2136,652.16,-301.12
+2144,570.64,-302.48
+2152,489.12,-303.84
+2160,407.6,-305.2
+2168,326.08,-306.56
+2176,244.56,-307.92
+2184,163.04,-309.28
+2192,81.52,-310.64
+2200,0,-312
diff --git a/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/325kW.vmap b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/325kW.vmap
new file mode 100644
index 0000000000000000000000000000000000000000..0ecbc8ff14634e2ef3c86c90fb21bdcb0997dec2
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/325kW.vmap	
@@ -0,0 +1,151 @@
+engine speed [rpm], torque [Nm], fuel consumption [g/h]
+500,-235.5,0
+500,-135.5,0
+500,0,1355
+500,213.4,3412.291
+500,426.8,5830.1
+500,640.2,8316.426
+500,853.6,10439.87
+500,1067,12823.69
+500,1188,14228.79
+500,1401.4,16628.66
+600,-238,0
+600,-138,0
+600,0,1355
+600,213.4,3412.291
+600,426.8,5830.1
+600,640.2,8316.426
+600,853.6,10439.87
+600,1067,12823.69
+600,1188,14228.79
+600,1401.4,16628.66
+751,-241.775,0
+751,-141.775,0
+750.9,0,1649.255
+750.9,213.4,4157.795
+750.9,426.8,7149.494
+750.9,640.2,10037.08
+750.9,853.6,12957.07
+750.9,1067,16055.22
+750.9,1280.4,19231.36
+750.9,1493.8,22400.17
+750.9,1544.879,23213.92
+751,1758.279,26392.93
+902,-247.59,0
+902,-147.59,0
+901.8,0,2210.735
+901.8,213.4,5204.867
+901.8,426.8,8515.462
+901.8,640.2,11804.75
+901.8,853.6,15410.55
+901.8,1067,19081.7
+901.8,1280.4,22742.96
+901.8,1493.8,26543.87
+901.8,1707.2,30534.68
+901.8,1901.757,34352.75
+902,2115.157,38403.27
+1053,-255.445,0
+1053,-155.445,0
+1052.7,0,2768.035
+1052.7,213.4,6228.407
+1052.7,426.8,9836.041
+1052.7,640.2,13624.5
+1052.7,853.6,17854.95
+1052.7,1067,22072.71
+1052.7,1280.4,26161.13
+1052.7,1493.8,30525.55
+1052.7,1707.2,35019.18
+1052.7,1920.6,39913.3
+1052.7,2134,45438.16
+1053,2347.4,50542.53
+1204,-265.44,0
+1203.6,0,3086.704
+1203.6,213.4,6943.027
+1203.6,426.8,11040.37
+1203.6,640.2,15504.65
+1203.6,853.6,20335.89
+1203.6,1067,25176.6
+1203.6,1280.4,29782.22
+1203.6,1493.8,34642.24
+1203.6,1707.2,39786.14
+1203.6,1920.6,45254.8
+1203.6,2134,51129.03
+1204,2347.4,56732.88
+1367,-283.37,0
+1367,-183.37,0
+1367.1,0,3845.344
+1367.1,213.4,7981.742
+1367.1,426.8,12796.69
+1367.1,640.2,17789.2
+1367.1,853.6,22854.21
+1367.1,1067,28302.84
+1367.1,1280.4,33739.91
+1367.1,1493.8,39393.87
+1367.1,1707.2,45836.33
+1367.1,1920.6,52078.71
+1367.1,2134,58296.41
+1367,2347.4,64530.56
+1490,-300.5,0
+1490,-200.5,0
+1489.6,0,4373.424
+1489.6,213.4,8861.484
+1489.6,426.8,14090.86
+1489.6,640.2,19518.29
+1489.6,853.6,25092.8
+1489.6,1067,30873.69
+1489.6,1280.4,36865.42
+1489.6,1493.8,43095.57
+1489.6,1707.2,50249.81
+1489.6,1920.6,57035.25
+1489.6,2041.712,60609.5
+1490,2255.112,67311.83
+1612,-318.62,0
+1612,-218.62,0
+1612.2,0,4904.015
+1612.2,213.4,9810.482
+1612.2,426.8,15403.9
+1612.2,640.2,21301.35
+1612.2,853.6,27492.32
+1612.2,1067,33580.96
+1612.2,1280.4,40114.61
+1612.2,1493.8,46914.77
+1612.2,1707.2,54666.14
+1612.2,1915.434,61862.91
+1612,2128.834,69491.99
+1735,-335.225,0
+1735,-235.225,0
+1734.7,0,5586.953
+1734.7,213.4,11041.15
+1734.7,426.8,16949.24
+1734.7,640.2,23500.23
+1734.7,853.6,30159.59
+1734.7,1067,36741.18
+1734.7,1280.4,43923.85
+1734.7,1493.8,51295.21
+1734.7,1707.2,59469.31
+1734.7,1789.259,62731.31
+1735,2002.659,70935.23
+1857,-353.69,0
+1857,-253.69,0
+1857.3,0,6673.839
+1857.3,213.4,12518.56
+1857.3,426.8,18687.88
+1857.3,640.2,25652.39
+1857.3,853.6,33003.08
+1857.3,1067,40438.09
+1857.3,1280.4,48117.52
+1857.3,1493.8,55848.59
+1857.3,1587.631,59434.17
+1857,1801.031,67215.39
+1957,-370.69,0
+1957,-270.69,0
+1957.3,0,6673.839
+1957.3,213.4,12518.56
+1957.3,426.8,18687.88
+1957.3,640.2,25652.39
+1957.3,853.6,33003.08
+1957.3,1067,40438.09
+1957.3,1280.4,48117.52
+1957.3,1493.8,55848.59
+1957.3,1587.631,59434.17
+1957,1801.031,67215.39
diff --git a/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/AMT_12.vgbx b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/AMT_12.vgbx
new file mode 100644
index 0000000000000000000000000000000000000000..3a278ff6d6ac337eae15f158b517a89fb5119ae2
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/AMT_12.vgbx	
@@ -0,0 +1,104 @@
+{
+  "Header": {
+    "CreatedBy": " ()",
+    "Date": "2016-10-13T10:08:16.0566564Z",
+    "AppVersion": "3",
+    "FileVersion": 6
+  },
+  "Body": {
+    "SavedInDeclMode": true,
+    "ModelName": "tractor_12gear_example",
+    "Inertia": 0.0,
+    "TracInt": 1.0,
+    "Gears": [
+      {
+        "Ratio": 2.64,
+        "LossMap": "Axle_4x2_Tractor.vtlm"
+      },
+      {
+        "Ratio": 14.93,
+        "LossMap": "Gear_1.vtlm",
+        "ShiftPolygon": "",
+        "MaxTorque": ""
+      },
+      {
+        "Ratio": 11.64,
+        "LossMap": "Gear_2.vtlm",
+        "ShiftPolygon": "",
+        "MaxTorque": ""
+      },
+      {
+        "Ratio": 9.02,
+        "LossMap": "Gear_3.vtlm",
+        "ShiftPolygon": "",
+        "MaxTorque": ""
+      },
+      {
+        "Ratio": 7.04,
+        "LossMap": "Gear_4.vtlm",
+        "ShiftPolygon": "",
+        "MaxTorque": ""
+      },
+      {
+        "Ratio": 5.64,
+        "LossMap": "Gear_5.vtlm",
+        "ShiftPolygon": "",
+        "MaxTorque": ""
+      },
+      {
+        "Ratio": 4.4,
+        "LossMap": "Gear_6.vtlm",
+        "ShiftPolygon": "",
+        "MaxTorque": ""
+      },
+      {
+        "Ratio": 3.39,
+        "LossMap": "Gear_7.vtlm",
+        "ShiftPolygon": "",
+        "MaxTorque": ""
+      },
+      {
+        "Ratio": 2.65,
+        "LossMap": "Gear_8.vtlm",
+        "ShiftPolygon": "",
+        "MaxTorque": ""
+      },
+      {
+        "Ratio": 2.05,
+        "LossMap": "Gear_9.vtlm",
+        "ShiftPolygon": "",
+        "MaxTorque": ""
+      },
+      {
+        "Ratio": 1.6,
+        "LossMap": "Gear_10.vtlm",
+        "ShiftPolygon": "",
+        "MaxTorque": ""
+      },
+      {
+        "Ratio": 1.28,
+        "LossMap": "Gear_11.vtlm",
+        "ShiftPolygon": "",
+        "MaxTorque": ""
+      },
+      {
+        "Ratio": 1.0,
+        "LossMap": "Gear_12.vtlm",
+        "ShiftPolygon": "",
+        "MaxTorque": ""
+      }
+    ],
+    "TqReserve": 20.0,
+    "ShiftTime": 2.0,
+    "StartTqReserve": 20.0,
+    "StartSpeed": 2.0,
+    "StartAcc": 0.6,
+    "GearboxType": "AMT",
+    "TorqueConverter": {
+      "Enabled": false
+    },
+    "DownshiftAferUpshiftDelay": 10.0,
+    "UpshiftAfterDownshiftDelay": 10.0,
+    "UpshiftMinAcceleration": 0.1
+  }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Axle_4x2_Tractor.vtlm b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Axle_4x2_Tractor.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..1c6e1b5e4f8a3d575e4f69a44c7ac4ef914c0b5f
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Axle_4x2_Tractor.vtlm	
@@ -0,0 +1,834 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-11085.2,54.2
+0,-10343.1,58.1
+0,-9601.0,62.0
+0,-8858.9,69.7
+0,-8116.8,77.4
+0,-7374.6,85.2
+0,-6632.5,92.9
+0,-5890.4,100.6
+0,-5148.3,108.4
+0,-4406.2,116.1
+0,-3664.1,123.8
+0,-3293.0,116.1
+0,-2921.9,108.4
+0,-2550.9,100.6
+0,-2179.8,92.9
+0,-1808.8,85.2
+0,-1437.7,77.4
+0,-1066.7,69.7
+0,-695.6,62.0
+0,-510.1,58.1
+0,-324.5,54.2
+0,-231.8,52.3
+0,-139.0,50.4
+0,-46.2,48.4
+0,48.4,48.4
+0,143.1,48.4
+0,239.8,50.4
+0,336.4,52.3
+0,433.0,54.2
+0,626.3,58.1
+0,819.6,62.0
+0,1206.1,69.7
+0,1592.6,77.4
+0,1979.1,85.2
+0,2365.6,92.9
+0,2752.1,100.6
+0,3138.7,108.4
+0,3525.2,116.1
+0,3911.7,123.8
+0,4684.7,139.3
+0,5457.8,154.7
+0,6230.8,170.2
+0,7003.8,185.7
+0,7776.9,201.1
+0,8549.9,216.6
+0,9323.0,232.0
+0,10096.0,247.5
+0,10869.0,263.0
+0,11642.1,278.4
+132,-11085.2,54.2
+132,-10343.1,58.1
+132,-9601.0,62.0
+132,-8858.9,69.7
+132,-8116.8,77.4
+132,-7374.6,85.2
+132,-6632.5,92.9
+132,-5890.4,100.6
+132,-5148.3,108.4
+132,-4406.2,116.1
+132,-3664.1,123.8
+132,-3293.0,116.1
+132,-2921.9,108.4
+132,-2550.9,100.6
+132,-2179.8,92.9
+132,-1808.8,85.2
+132,-1437.7,77.4
+132,-1066.7,69.7
+132,-695.6,62.0
+132,-510.1,58.1
+132,-324.5,54.2
+132,-231.8,52.3
+132,-139.0,50.4
+132,-46.2,48.4
+132,48.4,48.4
+132,143.1,48.4
+132,239.8,50.4
+132,336.4,52.3
+132,433.0,54.2
+132,626.3,58.1
+132,819.6,62.0
+132,1206.1,69.7
+132,1592.6,77.4
+132,1979.1,85.2
+132,2365.6,92.9
+132,2752.1,100.6
+132,3138.7,108.4
+132,3525.2,116.1
+132,3911.7,123.8
+132,4684.7,139.3
+132,5457.8,154.7
+132,6230.8,170.2
+132,7003.8,185.7
+132,7776.9,201.1
+132,8549.9,216.6
+132,9323.0,232.0
+132,10096.0,247.5
+132,10869.0,263.0
+132,11642.1,278.4
+264,-11085.2,54.2
+264,-10343.1,58.1
+264,-9601.0,62.0
+264,-8858.9,69.7
+264,-8116.8,77.4
+264,-7374.6,85.2
+264,-6632.5,92.9
+264,-5890.4,100.6
+264,-5148.3,108.4
+264,-4406.2,116.1
+264,-3664.1,123.8
+264,-3293.0,116.1
+264,-2921.9,108.4
+264,-2550.9,100.6
+264,-2179.8,92.9
+264,-1808.8,85.2
+264,-1437.7,77.4
+264,-1066.7,69.7
+264,-695.6,62.0
+264,-510.1,58.1
+264,-324.5,54.2
+264,-231.8,52.3
+264,-139.0,50.4
+264,-46.2,48.4
+264,48.4,48.4
+264,143.1,48.4
+264,239.8,50.4
+264,336.4,52.3
+264,433.0,54.2
+264,626.3,58.1
+264,819.6,62.0
+264,1206.1,69.7
+264,1592.6,77.4
+264,1979.1,85.2
+264,2365.6,92.9
+264,2752.1,100.6
+264,3138.7,108.4
+264,3525.2,116.1
+264,3911.7,123.8
+264,4684.7,139.3
+264,5457.8,154.7
+264,6230.8,170.2
+264,7003.8,185.7
+264,7776.9,201.1
+264,8549.9,216.6
+264,9323.0,232.0
+264,10096.0,247.5
+264,10869.0,263.0
+264,11642.1,278.4
+396,-11085.2,54.2
+396,-10343.1,58.1
+396,-9601.0,62.0
+396,-8858.9,69.7
+396,-8116.8,77.4
+396,-7374.6,85.2
+396,-6632.5,92.9
+396,-5890.4,100.6
+396,-5148.3,108.4
+396,-4406.2,116.1
+396,-3664.1,123.8
+396,-3293.0,116.1
+396,-2921.9,108.4
+396,-2550.9,100.6
+396,-2179.8,92.9
+396,-1808.8,85.2
+396,-1437.7,77.4
+396,-1066.7,69.7
+396,-695.6,62.0
+396,-510.1,58.1
+396,-324.5,54.2
+396,-231.8,52.3
+396,-139.0,50.4
+396,-46.2,48.4
+396,48.4,48.4
+396,143.1,48.4
+396,239.8,50.4
+396,336.4,52.3
+396,433.0,54.2
+396,626.3,58.1
+396,819.6,62.0
+396,1206.1,69.7
+396,1592.6,77.4
+396,1979.1,85.2
+396,2365.6,92.9
+396,2752.1,100.6
+396,3138.7,108.4
+396,3525.2,116.1
+396,3911.7,123.8
+396,4684.7,139.3
+396,5457.8,154.7
+396,6230.8,170.2
+396,7003.8,185.7
+396,7776.9,201.1
+396,8549.9,216.6
+396,9323.0,232.0
+396,10096.0,247.5
+396,10869.0,263.0
+396,11642.1,278.4
+528,-11085.2,54.2
+528,-10343.1,58.1
+528,-9601.0,62.0
+528,-8858.9,69.7
+528,-8116.8,77.4
+528,-7374.6,85.2
+528,-6632.5,92.9
+528,-5890.4,100.6
+528,-5148.3,108.4
+528,-4406.2,116.1
+528,-3664.1,123.8
+528,-3293.0,116.1
+528,-2921.9,108.4
+528,-2550.9,100.6
+528,-2179.8,92.9
+528,-1808.8,85.2
+528,-1437.7,77.4
+528,-1066.7,69.7
+528,-695.6,62.0
+528,-510.1,58.1
+528,-324.5,54.2
+528,-231.8,52.3
+528,-139.0,50.4
+528,-46.2,48.4
+528,48.4,48.4
+528,143.1,48.4
+528,239.8,50.4
+528,336.4,52.3
+528,433.0,54.2
+528,626.3,58.1
+528,819.6,62.0
+528,1206.1,69.7
+528,1592.6,77.4
+528,1979.1,85.2
+528,2365.6,92.9
+528,2752.1,100.6
+528,3138.7,108.4
+528,3525.2,116.1
+528,3911.7,123.8
+528,4684.7,139.3
+528,5457.8,154.7
+528,6230.8,170.2
+528,7003.8,185.7
+528,7776.9,201.1
+528,8549.9,216.6
+528,9323.0,232.0
+528,10096.0,247.5
+528,10869.0,263.0
+528,11642.1,278.4
+660,-11085.2,54.2
+660,-10343.1,58.1
+660,-9601.0,62.0
+660,-8858.9,69.7
+660,-8116.8,77.4
+660,-7374.6,85.2
+660,-6632.5,92.9
+660,-5890.4,100.6
+660,-5148.3,108.4
+660,-4406.2,116.1
+660,-3664.1,123.8
+660,-3293.0,116.1
+660,-2921.9,108.4
+660,-2550.9,100.6
+660,-2179.8,92.9
+660,-1808.8,85.2
+660,-1437.7,77.4
+660,-1066.7,69.7
+660,-695.6,62.0
+660,-510.1,58.1
+660,-324.5,54.2
+660,-231.8,52.3
+660,-139.0,50.4
+660,-46.2,48.4
+660,48.4,48.4
+660,143.1,48.4
+660,239.8,50.4
+660,336.4,52.3
+660,433.0,54.2
+660,626.3,58.1
+660,819.6,62.0
+660,1206.1,69.7
+660,1592.6,77.4
+660,1979.1,85.2
+660,2365.6,92.9
+660,2752.1,100.6
+660,3138.7,108.4
+660,3525.2,116.1
+660,3911.7,123.8
+660,4684.7,139.3
+660,5457.8,154.7
+660,6230.8,170.2
+660,7003.8,185.7
+660,7776.9,201.1
+660,8549.9,216.6
+660,9323.0,232.0
+660,10096.0,247.5
+660,10869.0,263.0
+660,11642.1,278.4
+792,-11085.2,54.2
+792,-10343.1,58.1
+792,-9601.0,62.0
+792,-8858.9,69.7
+792,-8116.8,77.4
+792,-7374.6,85.2
+792,-6632.5,92.9
+792,-5890.4,100.6
+792,-5148.3,108.4
+792,-4406.2,116.1
+792,-3664.1,123.8
+792,-3293.0,116.1
+792,-2921.9,108.4
+792,-2550.9,100.6
+792,-2179.8,92.9
+792,-1808.8,85.2
+792,-1437.7,77.4
+792,-1066.7,69.7
+792,-695.6,62.0
+792,-510.1,58.1
+792,-324.5,54.2
+792,-231.8,52.3
+792,-139.0,50.4
+792,-46.2,48.4
+792,48.4,48.4
+792,143.1,48.4
+792,239.8,50.4
+792,336.4,52.3
+792,433.0,54.2
+792,626.3,58.1
+792,819.6,62.0
+792,1206.1,69.7
+792,1592.6,77.4
+792,1979.1,85.2
+792,2365.6,92.9
+792,2752.1,100.6
+792,3138.7,108.4
+792,3525.2,116.1
+792,3911.7,123.8
+792,4684.7,139.3
+792,5457.8,154.7
+792,6230.8,170.2
+792,7003.8,185.7
+792,7776.9,201.1
+792,8549.9,216.6
+792,9323.0,232.0
+792,10096.0,247.5
+792,10869.0,263.0
+792,11642.1,278.4
+924,-11085.2,54.2
+924,-10343.1,58.1
+924,-9601.0,62.0
+924,-8858.9,69.7
+924,-8116.8,77.4
+924,-7374.6,85.2
+924,-6632.5,92.9
+924,-5890.4,100.6
+924,-5148.3,108.4
+924,-4406.2,116.1
+924,-3664.1,123.8
+924,-3293.0,116.1
+924,-2921.9,108.4
+924,-2550.9,100.6
+924,-2179.8,92.9
+924,-1808.8,85.2
+924,-1437.7,77.4
+924,-1066.7,69.7
+924,-695.6,62.0
+924,-510.1,58.1
+924,-324.5,54.2
+924,-231.8,52.3
+924,-139.0,50.4
+924,-46.2,48.4
+924,48.4,48.4
+924,143.1,48.4
+924,239.8,50.4
+924,336.4,52.3
+924,433.0,54.2
+924,626.3,58.1
+924,819.6,62.0
+924,1206.1,69.7
+924,1592.6,77.4
+924,1979.1,85.2
+924,2365.6,92.9
+924,2752.1,100.6
+924,3138.7,108.4
+924,3525.2,116.1
+924,3911.7,123.8
+924,4684.7,139.3
+924,5457.8,154.7
+924,6230.8,170.2
+924,7003.8,185.7
+924,7776.9,201.1
+924,8549.9,216.6
+924,9323.0,232.0
+924,10096.0,247.5
+924,10869.0,263.0
+924,11642.1,278.4
+1056,-11085.2,54.2
+1056,-10343.1,58.1
+1056,-9601.0,62.0
+1056,-8858.9,69.7
+1056,-8116.8,77.4
+1056,-7374.6,85.2
+1056,-6632.5,92.9
+1056,-5890.4,100.6
+1056,-5148.3,108.4
+1056,-4406.2,116.1
+1056,-3664.1,123.8
+1056,-3293.0,116.1
+1056,-2921.9,108.4
+1056,-2550.9,100.6
+1056,-2179.8,92.9
+1056,-1808.8,85.2
+1056,-1437.7,77.4
+1056,-1066.7,69.7
+1056,-695.6,62.0
+1056,-510.1,58.1
+1056,-324.5,54.2
+1056,-231.8,52.3
+1056,-139.0,50.4
+1056,-46.2,48.4
+1056,48.4,48.4
+1056,143.1,48.4
+1056,239.8,50.4
+1056,336.4,52.3
+1056,433.0,54.2
+1056,626.3,58.1
+1056,819.6,62.0
+1056,1206.1,69.7
+1056,1592.6,77.4
+1056,1979.1,85.2
+1056,2365.6,92.9
+1056,2752.1,100.6
+1056,3138.7,108.4
+1056,3525.2,116.1
+1056,3911.7,123.8
+1056,4684.7,139.3
+1056,5457.8,154.7
+1056,6230.8,170.2
+1056,7003.8,185.7
+1056,7776.9,201.1
+1056,8549.9,216.6
+1056,9323.0,232.0
+1056,10096.0,247.5
+1056,10869.0,263.0
+1056,11642.1,278.4
+1188,-11085.2,54.2
+1188,-10343.1,58.1
+1188,-9601.0,62.0
+1188,-8858.9,69.7
+1188,-8116.8,77.4
+1188,-7374.6,85.2
+1188,-6632.5,92.9
+1188,-5890.4,100.6
+1188,-5148.3,108.4
+1188,-4406.2,116.1
+1188,-3664.1,123.8
+1188,-3293.0,116.1
+1188,-2921.9,108.4
+1188,-2550.9,100.6
+1188,-2179.8,92.9
+1188,-1808.8,85.2
+1188,-1437.7,77.4
+1188,-1066.7,69.7
+1188,-695.6,62.0
+1188,-510.1,58.1
+1188,-324.5,54.2
+1188,-231.8,52.3
+1188,-139.0,50.4
+1188,-46.2,48.4
+1188,48.4,48.4
+1188,143.1,48.4
+1188,239.8,50.4
+1188,336.4,52.3
+1188,433.0,54.2
+1188,626.3,58.1
+1188,819.6,62.0
+1188,1206.1,69.7
+1188,1592.6,77.4
+1188,1979.1,85.2
+1188,2365.6,92.9
+1188,2752.1,100.6
+1188,3138.7,108.4
+1188,3525.2,116.1
+1188,3911.7,123.8
+1188,4684.7,139.3
+1188,5457.8,154.7
+1188,6230.8,170.2
+1188,7003.8,185.7
+1188,7776.9,201.1
+1188,8549.9,216.6
+1188,9323.0,232.0
+1188,10096.0,247.5
+1188,10869.0,263.0
+1188,11642.1,278.4
+1320,-11085.2,54.2
+1320,-10343.1,58.1
+1320,-9601.0,62.0
+1320,-8858.9,69.7
+1320,-8116.8,77.4
+1320,-7374.6,85.2
+1320,-6632.5,92.9
+1320,-5890.4,100.6
+1320,-5148.3,108.4
+1320,-4406.2,116.1
+1320,-3664.1,123.8
+1320,-3293.0,116.1
+1320,-2921.9,108.4
+1320,-2550.9,100.6
+1320,-2179.8,92.9
+1320,-1808.8,85.2
+1320,-1437.7,77.4
+1320,-1066.7,69.7
+1320,-695.6,62.0
+1320,-510.1,58.1
+1320,-324.5,54.2
+1320,-231.8,52.3
+1320,-139.0,50.4
+1320,-46.2,48.4
+1320,48.4,48.4
+1320,143.1,48.4
+1320,239.8,50.4
+1320,336.4,52.3
+1320,433.0,54.2
+1320,626.3,58.1
+1320,819.6,62.0
+1320,1206.1,69.7
+1320,1592.6,77.4
+1320,1979.1,85.2
+1320,2365.6,92.9
+1320,2752.1,100.6
+1320,3138.7,108.4
+1320,3525.2,116.1
+1320,3911.7,123.8
+1320,4684.7,139.3
+1320,5457.8,154.7
+1320,6230.8,170.2
+1320,7003.8,185.7
+1320,7776.9,201.1
+1320,8549.9,216.6
+1320,9323.0,232.0
+1320,10096.0,247.5
+1320,10869.0,263.0
+1320,11642.1,278.4
+1452,-11085.2,54.2
+1452,-10343.1,58.1
+1452,-9601.0,62.0
+1452,-8858.9,69.7
+1452,-8116.8,77.4
+1452,-7374.6,85.2
+1452,-6632.5,92.9
+1452,-5890.4,100.6
+1452,-5148.3,108.4
+1452,-4406.2,116.1
+1452,-3664.1,123.8
+1452,-3293.0,116.1
+1452,-2921.9,108.4
+1452,-2550.9,100.6
+1452,-2179.8,92.9
+1452,-1808.8,85.2
+1452,-1437.7,77.4
+1452,-1066.7,69.7
+1452,-695.6,62.0
+1452,-510.1,58.1
+1452,-324.5,54.2
+1452,-231.8,52.3
+1452,-139.0,50.4
+1452,-46.2,48.4
+1452,48.4,48.4
+1452,143.1,48.4
+1452,239.8,50.4
+1452,336.4,52.3
+1452,433.0,54.2
+1452,626.3,58.1
+1452,819.6,62.0
+1452,1206.1,69.7
+1452,1592.6,77.4
+1452,1979.1,85.2
+1452,2365.6,92.9
+1452,2752.1,100.6
+1452,3138.7,108.4
+1452,3525.2,116.1
+1452,3911.7,123.8
+1452,4684.7,139.3
+1452,5457.8,154.7
+1452,6230.8,170.2
+1452,7003.8,185.7
+1452,7776.9,201.1
+1452,8549.9,216.6
+1452,9323.0,232.0
+1452,10096.0,247.5
+1452,10869.0,263.0
+1452,11642.1,278.4
+1584,-11085.2,54.2
+1584,-10343.1,58.1
+1584,-9601.0,62.0
+1584,-8858.9,69.7
+1584,-8116.8,77.4
+1584,-7374.6,85.2
+1584,-6632.5,92.9
+1584,-5890.4,100.6
+1584,-5148.3,108.4
+1584,-4406.2,116.1
+1584,-3664.1,123.8
+1584,-3293.0,116.1
+1584,-2921.9,108.4
+1584,-2550.9,100.6
+1584,-2179.8,92.9
+1584,-1808.8,85.2
+1584,-1437.7,77.4
+1584,-1066.7,69.7
+1584,-695.6,62.0
+1584,-510.1,58.1
+1584,-324.5,54.2
+1584,-231.8,52.3
+1584,-139.0,50.4
+1584,-46.2,48.4
+1584,48.4,48.4
+1584,143.1,48.4
+1584,239.8,50.4
+1584,336.4,52.3
+1584,433.0,54.2
+1584,626.3,58.1
+1584,819.6,62.0
+1584,1206.1,69.7
+1584,1592.6,77.4
+1584,1979.1,85.2
+1584,2365.6,92.9
+1584,2752.1,100.6
+1584,3138.7,108.4
+1584,3525.2,116.1
+1584,3911.7,123.8
+1584,4684.7,139.3
+1584,5457.8,154.7
+1584,6230.8,170.2
+1584,7003.8,185.7
+1584,7776.9,201.1
+1584,8549.9,216.6
+1584,9323.0,232.0
+1584,10096.0,247.5
+1584,10869.0,263.0
+1584,11642.1,278.4
+1716,-11085.2,54.2
+1716,-10343.1,58.1
+1716,-9601.0,62.0
+1716,-8858.9,69.7
+1716,-8116.8,77.4
+1716,-7374.6,85.2
+1716,-6632.5,92.9
+1716,-5890.4,100.6
+1716,-5148.3,108.4
+1716,-4406.2,116.1
+1716,-3664.1,123.8
+1716,-3293.0,116.1
+1716,-2921.9,108.4
+1716,-2550.9,100.6
+1716,-2179.8,92.9
+1716,-1808.8,85.2
+1716,-1437.7,77.4
+1716,-1066.7,69.7
+1716,-695.6,62.0
+1716,-510.1,58.1
+1716,-324.5,54.2
+1716,-231.8,52.3
+1716,-139.0,50.4
+1716,-46.2,48.4
+1716,48.4,48.4
+1716,143.1,48.4
+1716,239.8,50.4
+1716,336.4,52.3
+1716,433.0,54.2
+1716,626.3,58.1
+1716,819.6,62.0
+1716,1206.1,69.7
+1716,1592.6,77.4
+1716,1979.1,85.2
+1716,2365.6,92.9
+1716,2752.1,100.6
+1716,3138.7,108.4
+1716,3525.2,116.1
+1716,3911.7,123.8
+1716,4684.7,139.3
+1716,5457.8,154.7
+1716,6230.8,170.2
+1716,7003.8,185.7
+1716,7776.9,201.1
+1716,8549.9,216.6
+1716,9323.0,232.0
+1716,10096.0,247.5
+1716,10869.0,263.0
+1716,11642.1,278.4
+1848,-11085.2,54.2
+1848,-10343.1,58.1
+1848,-9601.0,62.0
+1848,-8858.9,69.7
+1848,-8116.8,77.4
+1848,-7374.6,85.2
+1848,-6632.5,92.9
+1848,-5890.4,100.6
+1848,-5148.3,108.4
+1848,-4406.2,116.1
+1848,-3664.1,123.8
+1848,-3293.0,116.1
+1848,-2921.9,108.4
+1848,-2550.9,100.6
+1848,-2179.8,92.9
+1848,-1808.8,85.2
+1848,-1437.7,77.4
+1848,-1066.7,69.7
+1848,-695.6,62.0
+1848,-510.1,58.1
+1848,-324.5,54.2
+1848,-231.8,52.3
+1848,-139.0,50.4
+1848,-46.2,48.4
+1848,48.4,48.4
+1848,143.1,48.4
+1848,239.8,50.4
+1848,336.4,52.3
+1848,433.0,54.2
+1848,626.3,58.1
+1848,819.6,62.0
+1848,1206.1,69.7
+1848,1592.6,77.4
+1848,1979.1,85.2
+1848,2365.6,92.9
+1848,2752.1,100.6
+1848,3138.7,108.4
+1848,3525.2,116.1
+1848,3911.7,123.8
+1848,4684.7,139.3
+1848,5457.8,154.7
+1848,6230.8,170.2
+1848,7003.8,185.7
+1848,7776.9,201.1
+1848,8549.9,216.6
+1848,9323.0,232.0
+1848,10096.0,247.5
+1848,10869.0,263.0
+1848,11642.1,278.4
+1980,-11085.2,54.2
+1980,-10343.1,58.1
+1980,-9601.0,62.0
+1980,-8858.9,69.7
+1980,-8116.8,77.4
+1980,-7374.6,85.2
+1980,-6632.5,92.9
+1980,-5890.4,100.6
+1980,-5148.3,108.4
+1980,-4406.2,116.1
+1980,-3664.1,123.8
+1980,-3293.0,116.1
+1980,-2921.9,108.4
+1980,-2550.9,100.6
+1980,-2179.8,92.9
+1980,-1808.8,85.2
+1980,-1437.7,77.4
+1980,-1066.7,69.7
+1980,-695.6,62.0
+1980,-510.1,58.1
+1980,-324.5,54.2
+1980,-231.8,52.3
+1980,-139.0,50.4
+1980,-46.2,48.4
+1980,48.4,48.4
+1980,143.1,48.4
+1980,239.8,50.4
+1980,336.4,52.3
+1980,433.0,54.2
+1980,626.3,58.1
+1980,819.6,62.0
+1980,1206.1,69.7
+1980,1592.6,77.4
+1980,1979.1,85.2
+1980,2365.6,92.9
+1980,2752.1,100.6
+1980,3138.7,108.4
+1980,3525.2,116.1
+1980,3911.7,123.8
+1980,4684.7,139.3
+1980,5457.8,154.7
+1980,6230.8,170.2
+1980,7003.8,185.7
+1980,7776.9,201.1
+1980,8549.9,216.6
+1980,9323.0,232.0
+1980,10096.0,247.5
+1980,10869.0,263.0
+1980,11642.1,278.4
+2112,-11085.2,54.2
+2112,-10343.1,58.1
+2112,-9601.0,62.0
+2112,-8858.9,69.7
+2112,-8116.8,77.4
+2112,-7374.6,85.2
+2112,-6632.5,92.9
+2112,-5890.4,100.6
+2112,-5148.3,108.4
+2112,-4406.2,116.1
+2112,-3664.1,123.8
+2112,-3293.0,116.1
+2112,-2921.9,108.4
+2112,-2550.9,100.6
+2112,-2179.8,92.9
+2112,-1808.8,85.2
+2112,-1437.7,77.4
+2112,-1066.7,69.7
+2112,-695.6,62.0
+2112,-510.1,58.1
+2112,-324.5,54.2
+2112,-231.8,52.3
+2112,-139.0,50.4
+2112,-46.2,48.4
+2112,48.4,48.4
+2112,143.1,48.4
+2112,239.8,50.4
+2112,336.4,52.3
+2112,433.0,54.2
+2112,626.3,58.1
+2112,819.6,62.0
+2112,1206.1,69.7
+2112,1592.6,77.4
+2112,1979.1,85.2
+2112,2365.6,92.9
+2112,2752.1,100.6
+2112,3138.7,108.4
+2112,3525.2,116.1
+2112,3911.7,123.8
+2112,4684.7,139.3
+2112,5457.8,154.7
+2112,6230.8,170.2
+2112,7003.8,185.7
+2112,7776.9,201.1
+2112,8549.9,216.6
+2112,9323.0,232.0
+2112,10096.0,247.5
+2112,10869.0,263.0
+2112,11642.1,278.4
diff --git a/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Default.vrlm b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Default.vrlm
new file mode 100644
index 0000000000000000000000000000000000000000..daade504df0188b3c571e651a2a1570b69968a47
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Default.vrlm	
@@ -0,0 +1,15 @@
+Retarder Speed [1/min],Torque Loss [Nm]
+0,10.00
+200,10.08
+400,10.32
+600,10.72
+900,11.62
+1200,12.88
+1600,15.12
+2000,18.00
+2500,22.50
+3000,28.00
+3500,34.50
+4000,42.00
+4500,50.50
+5000,60.00
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Engine_325kW_12.7l.veng b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Engine_325kW_12.7l.veng
new file mode 100644
index 0000000000000000000000000000000000000000..0252f9b63d184a6461058010111f14d4bcc9a94b
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Engine_325kW_12.7l.veng	
@@ -0,0 +1,28 @@
+{
+  "Header": {
+    "CreatedBy": "",
+    "Date": "2017-06-22T11:14:03.7167543Z",
+    "AppVersion": "3",
+    "FileVersion": 4
+  },
+  "Body": {
+    "SavedInDeclMode": true,
+    "ModelName": "325kW 12.7l Engine",
+    "Displacement": "12740",
+    "IdlingSpeed": 600.0,
+    "Inertia": 5.1498,
+    "WHTC-Urban": 1.04,
+    "WHTC-Rural": 1.01,
+    "WHTC-Motorway": 1.0,
+    "WHTC-Engineering": 1.0,
+    "ColdHotBalancingFactor": 1.0,
+    "CFRegPer": 1.0,
+    "CFNCV": 1.0,
+    "RatedPower": 325000.0,
+    "RatedSpeed": 1800.0,
+    "MaxTorque": 2400.0,
+    "FuelType": 0,
+    "FullLoadCurve": "325kW.vfld",
+    "FuelMap": "325kW.vmap"
+  }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Gear_1.vtlm b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Gear_1.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..ea00afe57cd1fa0d4f058cced560bd1bd482dd1a
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Gear_1.vtlm	
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,239.2
+0,-5000.0,219.2
+0,-4500.0,179.2
+0,-4000.0,179.2
+0,-3500.0,159.2
+0,-3000.0,139.2
+0,-2500.0,119.2
+0,-2000.0,99.2
+0,-1600.0,83.2
+0,-1200.0,67.2
+0,-900.0,55.2
+0,-600.0,43.2
+0,-400.0,35.2
+0,-200.0,27.2
+0,0.0,27.2
+0,200.0,27.2
+0,400.0,35.2
+0,600.0,43.2
+0,900.0,55.2
+0,1200.0,67.2
+0,1600.0,83.2
+0,2000.0,99.2
+0,2500.0,119.2
+0,3000.0,139.2
+0,3500.0,159.2
+0,4000.0,179.2
+0,4500.0,199.2
+0,5000.0,219.2
+0,5500.0,239.2
+600,-5500.0,239.2
+600,-5000.0,219.2
+600,-4500.0,179.2
+600,-4000.0,179.2
+600,-3500.0,159.2
+600,-3000.0,139.2
+600,-2500.0,119.2
+600,-2000.0,99.2
+600,-1600.0,83.2
+600,-1200.0,67.2
+600,-900.0,55.2
+600,-600.0,43.2
+600,-400.0,35.2
+600,-200.0,27.2
+600,0.0,27.2
+600,200.0,27.2
+600,400.0,35.2
+600,600.0,43.2
+600,900.0,55.2
+600,1200.0,67.2
+600,1600.0,83.2
+600,2000.0,99.2
+600,2500.0,119.2
+600,3000.0,139.2
+600,3500.0,159.2
+600,4000.0,179.2
+600,4500.0,199.2
+600,5000.0,219.2
+600,5500.0,239.2
+900,-5500.0,242.8
+900,-5000.0,222.8
+900,-4500.0,182.8
+900,-4000.0,182.8
+900,-3500.0,162.8
+900,-3000.0,142.8
+900,-2500.0,122.8
+900,-2000.0,102.8
+900,-1600.0,86.8
+900,-1200.0,70.8
+900,-900.0,58.8
+900,-600.0,46.8
+900,-400.0,38.8
+900,-200.0,30.8
+900,0.0,30.8
+900,200.0,30.8
+900,400.0,38.8
+900,600.0,46.8
+900,900.0,58.8
+900,1200.0,70.8
+900,1600.0,86.8
+900,2000.0,102.8
+900,2500.0,122.8
+900,3000.0,142.8
+900,3500.0,162.8
+900,4000.0,182.8
+900,4500.0,202.8
+900,5000.0,222.8
+900,5500.0,242.8
+1200,-5500.0,246.4
+1200,-5000.0,226.4
+1200,-4500.0,186.4
+1200,-4000.0,186.4
+1200,-3500.0,166.4
+1200,-3000.0,146.4
+1200,-2500.0,126.4
+1200,-2000.0,106.4
+1200,-1600.0,90.4
+1200,-1200.0,74.4
+1200,-900.0,62.4
+1200,-600.0,50.4
+1200,-400.0,42.4
+1200,-200.0,34.4
+1200,0.0,34.4
+1200,200.0,34.4
+1200,400.0,42.4
+1200,600.0,50.4
+1200,900.0,62.4
+1200,1200.0,74.4
+1200,1600.0,90.4
+1200,2000.0,106.4
+1200,2500.0,126.4
+1200,3000.0,146.4
+1200,3500.0,166.4
+1200,4000.0,186.4
+1200,4500.0,206.4
+1200,5000.0,226.4
+1200,5500.0,246.4
+1600,-5500.0,251.2
+1600,-5000.0,231.2
+1600,-4500.0,191.2
+1600,-4000.0,191.2
+1600,-3500.0,171.2
+1600,-3000.0,151.2
+1600,-2500.0,131.2
+1600,-2000.0,111.2
+1600,-1600.0,95.2
+1600,-1200.0,79.2
+1600,-900.0,67.2
+1600,-600.0,55.2
+1600,-400.0,47.2
+1600,-200.0,39.2
+1600,0.0,39.2
+1600,200.0,39.2
+1600,400.0,47.2
+1600,600.0,55.2
+1600,900.0,67.2
+1600,1200.0,79.2
+1600,1600.0,95.2
+1600,2000.0,111.2
+1600,2500.0,131.2
+1600,3000.0,151.2
+1600,3500.0,171.2
+1600,4000.0,191.2
+1600,4500.0,211.2
+1600,5000.0,231.2
+1600,5500.0,251.2
+2000,-5500.0,256.0
+2000,-5000.0,236.0
+2000,-4500.0,196.0
+2000,-4000.0,196.0
+2000,-3500.0,176.0
+2000,-3000.0,156.0
+2000,-2500.0,136.0
+2000,-2000.0,116.0
+2000,-1600.0,100.0
+2000,-1200.0,84.0
+2000,-900.0,72.0
+2000,-600.0,60.0
+2000,-400.0,52.0
+2000,-200.0,44.0
+2000,0.0,44.0
+2000,200.0,44.0
+2000,400.0,52.0
+2000,600.0,60.0
+2000,900.0,72.0
+2000,1200.0,84.0
+2000,1600.0,100.0
+2000,2000.0,116.0
+2000,2500.0,136.0
+2000,3000.0,156.0
+2000,3500.0,176.0
+2000,4000.0,196.0
+2000,4500.0,216.0
+2000,5000.0,236.0
+2000,5500.0,256.0
+2500,-5500.0,262.0
+2500,-5000.0,242.0
+2500,-4500.0,202.0
+2500,-4000.0,202.0
+2500,-3500.0,182.0
+2500,-3000.0,162.0
+2500,-2500.0,142.0
+2500,-2000.0,122.0
+2500,-1600.0,106.0
+2500,-1200.0,90.0
+2500,-900.0,78.0
+2500,-600.0,66.0
+2500,-400.0,58.0
+2500,-200.0,50.0
+2500,0.0,50.0
+2500,200.0,50.0
+2500,400.0,58.0
+2500,600.0,66.0
+2500,900.0,78.0
+2500,1200.0,90.0
+2500,1600.0,106.0
+2500,2000.0,122.0
+2500,2500.0,142.0
+2500,3000.0,162.0
+2500,3500.0,182.0
+2500,4000.0,202.0
+2500,4500.0,222.0
+2500,5000.0,242.0
+2500,5500.0,262.0
+3000,-5500.0,268.0
+3000,-5000.0,248.0
+3000,-4500.0,208.0
+3000,-4000.0,208.0
+3000,-3500.0,188.0
+3000,-3000.0,168.0
+3000,-2500.0,148.0
+3000,-2000.0,128.0
+3000,-1600.0,112.0
+3000,-1200.0,96.0
+3000,-900.0,84.0
+3000,-600.0,72.0
+3000,-400.0,64.0
+3000,-200.0,56.0
+3000,0.0,56.0
+3000,200.0,56.0
+3000,400.0,64.0
+3000,600.0,72.0
+3000,900.0,84.0
+3000,1200.0,96.0
+3000,1600.0,112.0
+3000,2000.0,128.0
+3000,2500.0,148.0
+3000,3000.0,168.0
+3000,3500.0,188.0
+3000,4000.0,208.0
+3000,4500.0,228.0
+3000,5000.0,248.0
+3000,5500.0,268.0
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Gear_10.vtlm b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Gear_10.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..ea00afe57cd1fa0d4f058cced560bd1bd482dd1a
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Gear_10.vtlm	
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,239.2
+0,-5000.0,219.2
+0,-4500.0,179.2
+0,-4000.0,179.2
+0,-3500.0,159.2
+0,-3000.0,139.2
+0,-2500.0,119.2
+0,-2000.0,99.2
+0,-1600.0,83.2
+0,-1200.0,67.2
+0,-900.0,55.2
+0,-600.0,43.2
+0,-400.0,35.2
+0,-200.0,27.2
+0,0.0,27.2
+0,200.0,27.2
+0,400.0,35.2
+0,600.0,43.2
+0,900.0,55.2
+0,1200.0,67.2
+0,1600.0,83.2
+0,2000.0,99.2
+0,2500.0,119.2
+0,3000.0,139.2
+0,3500.0,159.2
+0,4000.0,179.2
+0,4500.0,199.2
+0,5000.0,219.2
+0,5500.0,239.2
+600,-5500.0,239.2
+600,-5000.0,219.2
+600,-4500.0,179.2
+600,-4000.0,179.2
+600,-3500.0,159.2
+600,-3000.0,139.2
+600,-2500.0,119.2
+600,-2000.0,99.2
+600,-1600.0,83.2
+600,-1200.0,67.2
+600,-900.0,55.2
+600,-600.0,43.2
+600,-400.0,35.2
+600,-200.0,27.2
+600,0.0,27.2
+600,200.0,27.2
+600,400.0,35.2
+600,600.0,43.2
+600,900.0,55.2
+600,1200.0,67.2
+600,1600.0,83.2
+600,2000.0,99.2
+600,2500.0,119.2
+600,3000.0,139.2
+600,3500.0,159.2
+600,4000.0,179.2
+600,4500.0,199.2
+600,5000.0,219.2
+600,5500.0,239.2
+900,-5500.0,242.8
+900,-5000.0,222.8
+900,-4500.0,182.8
+900,-4000.0,182.8
+900,-3500.0,162.8
+900,-3000.0,142.8
+900,-2500.0,122.8
+900,-2000.0,102.8
+900,-1600.0,86.8
+900,-1200.0,70.8
+900,-900.0,58.8
+900,-600.0,46.8
+900,-400.0,38.8
+900,-200.0,30.8
+900,0.0,30.8
+900,200.0,30.8
+900,400.0,38.8
+900,600.0,46.8
+900,900.0,58.8
+900,1200.0,70.8
+900,1600.0,86.8
+900,2000.0,102.8
+900,2500.0,122.8
+900,3000.0,142.8
+900,3500.0,162.8
+900,4000.0,182.8
+900,4500.0,202.8
+900,5000.0,222.8
+900,5500.0,242.8
+1200,-5500.0,246.4
+1200,-5000.0,226.4
+1200,-4500.0,186.4
+1200,-4000.0,186.4
+1200,-3500.0,166.4
+1200,-3000.0,146.4
+1200,-2500.0,126.4
+1200,-2000.0,106.4
+1200,-1600.0,90.4
+1200,-1200.0,74.4
+1200,-900.0,62.4
+1200,-600.0,50.4
+1200,-400.0,42.4
+1200,-200.0,34.4
+1200,0.0,34.4
+1200,200.0,34.4
+1200,400.0,42.4
+1200,600.0,50.4
+1200,900.0,62.4
+1200,1200.0,74.4
+1200,1600.0,90.4
+1200,2000.0,106.4
+1200,2500.0,126.4
+1200,3000.0,146.4
+1200,3500.0,166.4
+1200,4000.0,186.4
+1200,4500.0,206.4
+1200,5000.0,226.4
+1200,5500.0,246.4
+1600,-5500.0,251.2
+1600,-5000.0,231.2
+1600,-4500.0,191.2
+1600,-4000.0,191.2
+1600,-3500.0,171.2
+1600,-3000.0,151.2
+1600,-2500.0,131.2
+1600,-2000.0,111.2
+1600,-1600.0,95.2
+1600,-1200.0,79.2
+1600,-900.0,67.2
+1600,-600.0,55.2
+1600,-400.0,47.2
+1600,-200.0,39.2
+1600,0.0,39.2
+1600,200.0,39.2
+1600,400.0,47.2
+1600,600.0,55.2
+1600,900.0,67.2
+1600,1200.0,79.2
+1600,1600.0,95.2
+1600,2000.0,111.2
+1600,2500.0,131.2
+1600,3000.0,151.2
+1600,3500.0,171.2
+1600,4000.0,191.2
+1600,4500.0,211.2
+1600,5000.0,231.2
+1600,5500.0,251.2
+2000,-5500.0,256.0
+2000,-5000.0,236.0
+2000,-4500.0,196.0
+2000,-4000.0,196.0
+2000,-3500.0,176.0
+2000,-3000.0,156.0
+2000,-2500.0,136.0
+2000,-2000.0,116.0
+2000,-1600.0,100.0
+2000,-1200.0,84.0
+2000,-900.0,72.0
+2000,-600.0,60.0
+2000,-400.0,52.0
+2000,-200.0,44.0
+2000,0.0,44.0
+2000,200.0,44.0
+2000,400.0,52.0
+2000,600.0,60.0
+2000,900.0,72.0
+2000,1200.0,84.0
+2000,1600.0,100.0
+2000,2000.0,116.0
+2000,2500.0,136.0
+2000,3000.0,156.0
+2000,3500.0,176.0
+2000,4000.0,196.0
+2000,4500.0,216.0
+2000,5000.0,236.0
+2000,5500.0,256.0
+2500,-5500.0,262.0
+2500,-5000.0,242.0
+2500,-4500.0,202.0
+2500,-4000.0,202.0
+2500,-3500.0,182.0
+2500,-3000.0,162.0
+2500,-2500.0,142.0
+2500,-2000.0,122.0
+2500,-1600.0,106.0
+2500,-1200.0,90.0
+2500,-900.0,78.0
+2500,-600.0,66.0
+2500,-400.0,58.0
+2500,-200.0,50.0
+2500,0.0,50.0
+2500,200.0,50.0
+2500,400.0,58.0
+2500,600.0,66.0
+2500,900.0,78.0
+2500,1200.0,90.0
+2500,1600.0,106.0
+2500,2000.0,122.0
+2500,2500.0,142.0
+2500,3000.0,162.0
+2500,3500.0,182.0
+2500,4000.0,202.0
+2500,4500.0,222.0
+2500,5000.0,242.0
+2500,5500.0,262.0
+3000,-5500.0,268.0
+3000,-5000.0,248.0
+3000,-4500.0,208.0
+3000,-4000.0,208.0
+3000,-3500.0,188.0
+3000,-3000.0,168.0
+3000,-2500.0,148.0
+3000,-2000.0,128.0
+3000,-1600.0,112.0
+3000,-1200.0,96.0
+3000,-900.0,84.0
+3000,-600.0,72.0
+3000,-400.0,64.0
+3000,-200.0,56.0
+3000,0.0,56.0
+3000,200.0,56.0
+3000,400.0,64.0
+3000,600.0,72.0
+3000,900.0,84.0
+3000,1200.0,96.0
+3000,1600.0,112.0
+3000,2000.0,128.0
+3000,2500.0,148.0
+3000,3000.0,168.0
+3000,3500.0,188.0
+3000,4000.0,208.0
+3000,4500.0,228.0
+3000,5000.0,248.0
+3000,5500.0,268.0
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Gear_11.vtlm b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Gear_11.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..ea00afe57cd1fa0d4f058cced560bd1bd482dd1a
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Gear_11.vtlm	
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,239.2
+0,-5000.0,219.2
+0,-4500.0,179.2
+0,-4000.0,179.2
+0,-3500.0,159.2
+0,-3000.0,139.2
+0,-2500.0,119.2
+0,-2000.0,99.2
+0,-1600.0,83.2
+0,-1200.0,67.2
+0,-900.0,55.2
+0,-600.0,43.2
+0,-400.0,35.2
+0,-200.0,27.2
+0,0.0,27.2
+0,200.0,27.2
+0,400.0,35.2
+0,600.0,43.2
+0,900.0,55.2
+0,1200.0,67.2
+0,1600.0,83.2
+0,2000.0,99.2
+0,2500.0,119.2
+0,3000.0,139.2
+0,3500.0,159.2
+0,4000.0,179.2
+0,4500.0,199.2
+0,5000.0,219.2
+0,5500.0,239.2
+600,-5500.0,239.2
+600,-5000.0,219.2
+600,-4500.0,179.2
+600,-4000.0,179.2
+600,-3500.0,159.2
+600,-3000.0,139.2
+600,-2500.0,119.2
+600,-2000.0,99.2
+600,-1600.0,83.2
+600,-1200.0,67.2
+600,-900.0,55.2
+600,-600.0,43.2
+600,-400.0,35.2
+600,-200.0,27.2
+600,0.0,27.2
+600,200.0,27.2
+600,400.0,35.2
+600,600.0,43.2
+600,900.0,55.2
+600,1200.0,67.2
+600,1600.0,83.2
+600,2000.0,99.2
+600,2500.0,119.2
+600,3000.0,139.2
+600,3500.0,159.2
+600,4000.0,179.2
+600,4500.0,199.2
+600,5000.0,219.2
+600,5500.0,239.2
+900,-5500.0,242.8
+900,-5000.0,222.8
+900,-4500.0,182.8
+900,-4000.0,182.8
+900,-3500.0,162.8
+900,-3000.0,142.8
+900,-2500.0,122.8
+900,-2000.0,102.8
+900,-1600.0,86.8
+900,-1200.0,70.8
+900,-900.0,58.8
+900,-600.0,46.8
+900,-400.0,38.8
+900,-200.0,30.8
+900,0.0,30.8
+900,200.0,30.8
+900,400.0,38.8
+900,600.0,46.8
+900,900.0,58.8
+900,1200.0,70.8
+900,1600.0,86.8
+900,2000.0,102.8
+900,2500.0,122.8
+900,3000.0,142.8
+900,3500.0,162.8
+900,4000.0,182.8
+900,4500.0,202.8
+900,5000.0,222.8
+900,5500.0,242.8
+1200,-5500.0,246.4
+1200,-5000.0,226.4
+1200,-4500.0,186.4
+1200,-4000.0,186.4
+1200,-3500.0,166.4
+1200,-3000.0,146.4
+1200,-2500.0,126.4
+1200,-2000.0,106.4
+1200,-1600.0,90.4
+1200,-1200.0,74.4
+1200,-900.0,62.4
+1200,-600.0,50.4
+1200,-400.0,42.4
+1200,-200.0,34.4
+1200,0.0,34.4
+1200,200.0,34.4
+1200,400.0,42.4
+1200,600.0,50.4
+1200,900.0,62.4
+1200,1200.0,74.4
+1200,1600.0,90.4
+1200,2000.0,106.4
+1200,2500.0,126.4
+1200,3000.0,146.4
+1200,3500.0,166.4
+1200,4000.0,186.4
+1200,4500.0,206.4
+1200,5000.0,226.4
+1200,5500.0,246.4
+1600,-5500.0,251.2
+1600,-5000.0,231.2
+1600,-4500.0,191.2
+1600,-4000.0,191.2
+1600,-3500.0,171.2
+1600,-3000.0,151.2
+1600,-2500.0,131.2
+1600,-2000.0,111.2
+1600,-1600.0,95.2
+1600,-1200.0,79.2
+1600,-900.0,67.2
+1600,-600.0,55.2
+1600,-400.0,47.2
+1600,-200.0,39.2
+1600,0.0,39.2
+1600,200.0,39.2
+1600,400.0,47.2
+1600,600.0,55.2
+1600,900.0,67.2
+1600,1200.0,79.2
+1600,1600.0,95.2
+1600,2000.0,111.2
+1600,2500.0,131.2
+1600,3000.0,151.2
+1600,3500.0,171.2
+1600,4000.0,191.2
+1600,4500.0,211.2
+1600,5000.0,231.2
+1600,5500.0,251.2
+2000,-5500.0,256.0
+2000,-5000.0,236.0
+2000,-4500.0,196.0
+2000,-4000.0,196.0
+2000,-3500.0,176.0
+2000,-3000.0,156.0
+2000,-2500.0,136.0
+2000,-2000.0,116.0
+2000,-1600.0,100.0
+2000,-1200.0,84.0
+2000,-900.0,72.0
+2000,-600.0,60.0
+2000,-400.0,52.0
+2000,-200.0,44.0
+2000,0.0,44.0
+2000,200.0,44.0
+2000,400.0,52.0
+2000,600.0,60.0
+2000,900.0,72.0
+2000,1200.0,84.0
+2000,1600.0,100.0
+2000,2000.0,116.0
+2000,2500.0,136.0
+2000,3000.0,156.0
+2000,3500.0,176.0
+2000,4000.0,196.0
+2000,4500.0,216.0
+2000,5000.0,236.0
+2000,5500.0,256.0
+2500,-5500.0,262.0
+2500,-5000.0,242.0
+2500,-4500.0,202.0
+2500,-4000.0,202.0
+2500,-3500.0,182.0
+2500,-3000.0,162.0
+2500,-2500.0,142.0
+2500,-2000.0,122.0
+2500,-1600.0,106.0
+2500,-1200.0,90.0
+2500,-900.0,78.0
+2500,-600.0,66.0
+2500,-400.0,58.0
+2500,-200.0,50.0
+2500,0.0,50.0
+2500,200.0,50.0
+2500,400.0,58.0
+2500,600.0,66.0
+2500,900.0,78.0
+2500,1200.0,90.0
+2500,1600.0,106.0
+2500,2000.0,122.0
+2500,2500.0,142.0
+2500,3000.0,162.0
+2500,3500.0,182.0
+2500,4000.0,202.0
+2500,4500.0,222.0
+2500,5000.0,242.0
+2500,5500.0,262.0
+3000,-5500.0,268.0
+3000,-5000.0,248.0
+3000,-4500.0,208.0
+3000,-4000.0,208.0
+3000,-3500.0,188.0
+3000,-3000.0,168.0
+3000,-2500.0,148.0
+3000,-2000.0,128.0
+3000,-1600.0,112.0
+3000,-1200.0,96.0
+3000,-900.0,84.0
+3000,-600.0,72.0
+3000,-400.0,64.0
+3000,-200.0,56.0
+3000,0.0,56.0
+3000,200.0,56.0
+3000,400.0,64.0
+3000,600.0,72.0
+3000,900.0,84.0
+3000,1200.0,96.0
+3000,1600.0,112.0
+3000,2000.0,128.0
+3000,2500.0,148.0
+3000,3000.0,168.0
+3000,3500.0,188.0
+3000,4000.0,208.0
+3000,4500.0,228.0
+3000,5000.0,248.0
+3000,5500.0,268.0
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Gear_12.vtlm b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Gear_12.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..d30c0dbb042ca6d2235b4febe01b31292e5593c0
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Gear_12.vtlm	
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,74.2
+0,-5000.0,69.2
+0,-4500.0,59.2
+0,-4000.0,59.2
+0,-3500.0,54.2
+0,-3000.0,49.2
+0,-2500.0,44.2
+0,-2000.0,39.2
+0,-1600.0,35.2
+0,-1200.0,31.2
+0,-900.0,28.2
+0,-600.0,25.2
+0,-400.0,23.2
+0,-200.0,21.2
+0,0.0,21.2
+0,200.0,21.2
+0,400.0,23.2
+0,600.0,25.2
+0,900.0,28.2
+0,1200.0,31.2
+0,1600.0,35.2
+0,2000.0,39.2
+0,2500.0,44.2
+0,3000.0,49.2
+0,3500.0,54.2
+0,4000.0,59.2
+0,4500.0,64.2
+0,5000.0,69.2
+0,5500.0,74.2
+600,-5500.0,74.2
+600,-5000.0,69.2
+600,-4500.0,59.2
+600,-4000.0,59.2
+600,-3500.0,54.2
+600,-3000.0,49.2
+600,-2500.0,44.2
+600,-2000.0,39.2
+600,-1600.0,35.2
+600,-1200.0,31.2
+600,-900.0,28.2
+600,-600.0,25.2
+600,-400.0,23.2
+600,-200.0,21.2
+600,0.0,21.2
+600,200.0,21.2
+600,400.0,23.2
+600,600.0,25.2
+600,900.0,28.2
+600,1200.0,31.2
+600,1600.0,35.2
+600,2000.0,39.2
+600,2500.0,44.2
+600,3000.0,49.2
+600,3500.0,54.2
+600,4000.0,59.2
+600,4500.0,64.2
+600,5000.0,69.2
+600,5500.0,74.2
+900,-5500.0,77.8
+900,-5000.0,72.8
+900,-4500.0,62.8
+900,-4000.0,62.8
+900,-3500.0,57.8
+900,-3000.0,52.8
+900,-2500.0,47.8
+900,-2000.0,42.8
+900,-1600.0,38.8
+900,-1200.0,34.8
+900,-900.0,31.8
+900,-600.0,28.8
+900,-400.0,26.8
+900,-200.0,24.8
+900,0.0,24.8
+900,200.0,24.8
+900,400.0,26.8
+900,600.0,28.8
+900,900.0,31.8
+900,1200.0,34.8
+900,1600.0,38.8
+900,2000.0,42.8
+900,2500.0,47.8
+900,3000.0,52.8
+900,3500.0,57.8
+900,4000.0,62.8
+900,4500.0,67.8
+900,5000.0,72.8
+900,5500.0,77.8
+1200,-5500.0,81.4
+1200,-5000.0,76.4
+1200,-4500.0,66.4
+1200,-4000.0,66.4
+1200,-3500.0,61.4
+1200,-3000.0,56.4
+1200,-2500.0,51.4
+1200,-2000.0,46.4
+1200,-1600.0,42.4
+1200,-1200.0,38.4
+1200,-900.0,35.4
+1200,-600.0,32.4
+1200,-400.0,30.4
+1200,-200.0,28.4
+1200,0.0,28.4
+1200,200.0,28.4
+1200,400.0,30.4
+1200,600.0,32.4
+1200,900.0,35.4
+1200,1200.0,38.4
+1200,1600.0,42.4
+1200,2000.0,46.4
+1200,2500.0,51.4
+1200,3000.0,56.4
+1200,3500.0,61.4
+1200,4000.0,66.4
+1200,4500.0,71.4
+1200,5000.0,76.4
+1200,5500.0,81.4
+1600,-5500.0,86.2
+1600,-5000.0,81.2
+1600,-4500.0,71.2
+1600,-4000.0,71.2
+1600,-3500.0,66.2
+1600,-3000.0,61.2
+1600,-2500.0,56.2
+1600,-2000.0,51.2
+1600,-1600.0,47.2
+1600,-1200.0,43.2
+1600,-900.0,40.2
+1600,-600.0,37.2
+1600,-400.0,35.2
+1600,-200.0,33.2
+1600,0.0,33.2
+1600,200.0,33.2
+1600,400.0,35.2
+1600,600.0,37.2
+1600,900.0,40.2
+1600,1200.0,43.2
+1600,1600.0,47.2
+1600,2000.0,51.2
+1600,2500.0,56.2
+1600,3000.0,61.2
+1600,3500.0,66.2
+1600,4000.0,71.2
+1600,4500.0,76.2
+1600,5000.0,81.2
+1600,5500.0,86.2
+2000,-5500.0,91.0
+2000,-5000.0,86.0
+2000,-4500.0,76.0
+2000,-4000.0,76.0
+2000,-3500.0,71.0
+2000,-3000.0,66.0
+2000,-2500.0,61.0
+2000,-2000.0,56.0
+2000,-1600.0,52.0
+2000,-1200.0,48.0
+2000,-900.0,45.0
+2000,-600.0,42.0
+2000,-400.0,40.0
+2000,-200.0,38.0
+2000,0.0,38.0
+2000,200.0,38.0
+2000,400.0,40.0
+2000,600.0,42.0
+2000,900.0,45.0
+2000,1200.0,48.0
+2000,1600.0,52.0
+2000,2000.0,56.0
+2000,2500.0,61.0
+2000,3000.0,66.0
+2000,3500.0,71.0
+2000,4000.0,76.0
+2000,4500.0,81.0
+2000,5000.0,86.0
+2000,5500.0,91.0
+2500,-5500.0,97.0
+2500,-5000.0,92.0
+2500,-4500.0,82.0
+2500,-4000.0,82.0
+2500,-3500.0,77.0
+2500,-3000.0,72.0
+2500,-2500.0,67.0
+2500,-2000.0,62.0
+2500,-1600.0,58.0
+2500,-1200.0,54.0
+2500,-900.0,51.0
+2500,-600.0,48.0
+2500,-400.0,46.0
+2500,-200.0,44.0
+2500,0.0,44.0
+2500,200.0,44.0
+2500,400.0,46.0
+2500,600.0,48.0
+2500,900.0,51.0
+2500,1200.0,54.0
+2500,1600.0,58.0
+2500,2000.0,62.0
+2500,2500.0,67.0
+2500,3000.0,72.0
+2500,3500.0,77.0
+2500,4000.0,82.0
+2500,4500.0,87.0
+2500,5000.0,92.0
+2500,5500.0,97.0
+3000,-5500.0,103.0
+3000,-5000.0,98.0
+3000,-4500.0,88.0
+3000,-4000.0,88.0
+3000,-3500.0,83.0
+3000,-3000.0,78.0
+3000,-2500.0,73.0
+3000,-2000.0,68.0
+3000,-1600.0,64.0
+3000,-1200.0,60.0
+3000,-900.0,57.0
+3000,-600.0,54.0
+3000,-400.0,52.0
+3000,-200.0,50.0
+3000,0.0,50.0
+3000,200.0,50.0
+3000,400.0,52.0
+3000,600.0,54.0
+3000,900.0,57.0
+3000,1200.0,60.0
+3000,1600.0,64.0
+3000,2000.0,68.0
+3000,2500.0,73.0
+3000,3000.0,78.0
+3000,3500.0,83.0
+3000,4000.0,88.0
+3000,4500.0,93.0
+3000,5000.0,98.0
+3000,5500.0,103.0
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Gear_2.vtlm b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Gear_2.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..ea00afe57cd1fa0d4f058cced560bd1bd482dd1a
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Gear_2.vtlm	
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,239.2
+0,-5000.0,219.2
+0,-4500.0,179.2
+0,-4000.0,179.2
+0,-3500.0,159.2
+0,-3000.0,139.2
+0,-2500.0,119.2
+0,-2000.0,99.2
+0,-1600.0,83.2
+0,-1200.0,67.2
+0,-900.0,55.2
+0,-600.0,43.2
+0,-400.0,35.2
+0,-200.0,27.2
+0,0.0,27.2
+0,200.0,27.2
+0,400.0,35.2
+0,600.0,43.2
+0,900.0,55.2
+0,1200.0,67.2
+0,1600.0,83.2
+0,2000.0,99.2
+0,2500.0,119.2
+0,3000.0,139.2
+0,3500.0,159.2
+0,4000.0,179.2
+0,4500.0,199.2
+0,5000.0,219.2
+0,5500.0,239.2
+600,-5500.0,239.2
+600,-5000.0,219.2
+600,-4500.0,179.2
+600,-4000.0,179.2
+600,-3500.0,159.2
+600,-3000.0,139.2
+600,-2500.0,119.2
+600,-2000.0,99.2
+600,-1600.0,83.2
+600,-1200.0,67.2
+600,-900.0,55.2
+600,-600.0,43.2
+600,-400.0,35.2
+600,-200.0,27.2
+600,0.0,27.2
+600,200.0,27.2
+600,400.0,35.2
+600,600.0,43.2
+600,900.0,55.2
+600,1200.0,67.2
+600,1600.0,83.2
+600,2000.0,99.2
+600,2500.0,119.2
+600,3000.0,139.2
+600,3500.0,159.2
+600,4000.0,179.2
+600,4500.0,199.2
+600,5000.0,219.2
+600,5500.0,239.2
+900,-5500.0,242.8
+900,-5000.0,222.8
+900,-4500.0,182.8
+900,-4000.0,182.8
+900,-3500.0,162.8
+900,-3000.0,142.8
+900,-2500.0,122.8
+900,-2000.0,102.8
+900,-1600.0,86.8
+900,-1200.0,70.8
+900,-900.0,58.8
+900,-600.0,46.8
+900,-400.0,38.8
+900,-200.0,30.8
+900,0.0,30.8
+900,200.0,30.8
+900,400.0,38.8
+900,600.0,46.8
+900,900.0,58.8
+900,1200.0,70.8
+900,1600.0,86.8
+900,2000.0,102.8
+900,2500.0,122.8
+900,3000.0,142.8
+900,3500.0,162.8
+900,4000.0,182.8
+900,4500.0,202.8
+900,5000.0,222.8
+900,5500.0,242.8
+1200,-5500.0,246.4
+1200,-5000.0,226.4
+1200,-4500.0,186.4
+1200,-4000.0,186.4
+1200,-3500.0,166.4
+1200,-3000.0,146.4
+1200,-2500.0,126.4
+1200,-2000.0,106.4
+1200,-1600.0,90.4
+1200,-1200.0,74.4
+1200,-900.0,62.4
+1200,-600.0,50.4
+1200,-400.0,42.4
+1200,-200.0,34.4
+1200,0.0,34.4
+1200,200.0,34.4
+1200,400.0,42.4
+1200,600.0,50.4
+1200,900.0,62.4
+1200,1200.0,74.4
+1200,1600.0,90.4
+1200,2000.0,106.4
+1200,2500.0,126.4
+1200,3000.0,146.4
+1200,3500.0,166.4
+1200,4000.0,186.4
+1200,4500.0,206.4
+1200,5000.0,226.4
+1200,5500.0,246.4
+1600,-5500.0,251.2
+1600,-5000.0,231.2
+1600,-4500.0,191.2
+1600,-4000.0,191.2
+1600,-3500.0,171.2
+1600,-3000.0,151.2
+1600,-2500.0,131.2
+1600,-2000.0,111.2
+1600,-1600.0,95.2
+1600,-1200.0,79.2
+1600,-900.0,67.2
+1600,-600.0,55.2
+1600,-400.0,47.2
+1600,-200.0,39.2
+1600,0.0,39.2
+1600,200.0,39.2
+1600,400.0,47.2
+1600,600.0,55.2
+1600,900.0,67.2
+1600,1200.0,79.2
+1600,1600.0,95.2
+1600,2000.0,111.2
+1600,2500.0,131.2
+1600,3000.0,151.2
+1600,3500.0,171.2
+1600,4000.0,191.2
+1600,4500.0,211.2
+1600,5000.0,231.2
+1600,5500.0,251.2
+2000,-5500.0,256.0
+2000,-5000.0,236.0
+2000,-4500.0,196.0
+2000,-4000.0,196.0
+2000,-3500.0,176.0
+2000,-3000.0,156.0
+2000,-2500.0,136.0
+2000,-2000.0,116.0
+2000,-1600.0,100.0
+2000,-1200.0,84.0
+2000,-900.0,72.0
+2000,-600.0,60.0
+2000,-400.0,52.0
+2000,-200.0,44.0
+2000,0.0,44.0
+2000,200.0,44.0
+2000,400.0,52.0
+2000,600.0,60.0
+2000,900.0,72.0
+2000,1200.0,84.0
+2000,1600.0,100.0
+2000,2000.0,116.0
+2000,2500.0,136.0
+2000,3000.0,156.0
+2000,3500.0,176.0
+2000,4000.0,196.0
+2000,4500.0,216.0
+2000,5000.0,236.0
+2000,5500.0,256.0
+2500,-5500.0,262.0
+2500,-5000.0,242.0
+2500,-4500.0,202.0
+2500,-4000.0,202.0
+2500,-3500.0,182.0
+2500,-3000.0,162.0
+2500,-2500.0,142.0
+2500,-2000.0,122.0
+2500,-1600.0,106.0
+2500,-1200.0,90.0
+2500,-900.0,78.0
+2500,-600.0,66.0
+2500,-400.0,58.0
+2500,-200.0,50.0
+2500,0.0,50.0
+2500,200.0,50.0
+2500,400.0,58.0
+2500,600.0,66.0
+2500,900.0,78.0
+2500,1200.0,90.0
+2500,1600.0,106.0
+2500,2000.0,122.0
+2500,2500.0,142.0
+2500,3000.0,162.0
+2500,3500.0,182.0
+2500,4000.0,202.0
+2500,4500.0,222.0
+2500,5000.0,242.0
+2500,5500.0,262.0
+3000,-5500.0,268.0
+3000,-5000.0,248.0
+3000,-4500.0,208.0
+3000,-4000.0,208.0
+3000,-3500.0,188.0
+3000,-3000.0,168.0
+3000,-2500.0,148.0
+3000,-2000.0,128.0
+3000,-1600.0,112.0
+3000,-1200.0,96.0
+3000,-900.0,84.0
+3000,-600.0,72.0
+3000,-400.0,64.0
+3000,-200.0,56.0
+3000,0.0,56.0
+3000,200.0,56.0
+3000,400.0,64.0
+3000,600.0,72.0
+3000,900.0,84.0
+3000,1200.0,96.0
+3000,1600.0,112.0
+3000,2000.0,128.0
+3000,2500.0,148.0
+3000,3000.0,168.0
+3000,3500.0,188.0
+3000,4000.0,208.0
+3000,4500.0,228.0
+3000,5000.0,248.0
+3000,5500.0,268.0
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Gear_3.vtlm b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Gear_3.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..ea00afe57cd1fa0d4f058cced560bd1bd482dd1a
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Gear_3.vtlm	
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,239.2
+0,-5000.0,219.2
+0,-4500.0,179.2
+0,-4000.0,179.2
+0,-3500.0,159.2
+0,-3000.0,139.2
+0,-2500.0,119.2
+0,-2000.0,99.2
+0,-1600.0,83.2
+0,-1200.0,67.2
+0,-900.0,55.2
+0,-600.0,43.2
+0,-400.0,35.2
+0,-200.0,27.2
+0,0.0,27.2
+0,200.0,27.2
+0,400.0,35.2
+0,600.0,43.2
+0,900.0,55.2
+0,1200.0,67.2
+0,1600.0,83.2
+0,2000.0,99.2
+0,2500.0,119.2
+0,3000.0,139.2
+0,3500.0,159.2
+0,4000.0,179.2
+0,4500.0,199.2
+0,5000.0,219.2
+0,5500.0,239.2
+600,-5500.0,239.2
+600,-5000.0,219.2
+600,-4500.0,179.2
+600,-4000.0,179.2
+600,-3500.0,159.2
+600,-3000.0,139.2
+600,-2500.0,119.2
+600,-2000.0,99.2
+600,-1600.0,83.2
+600,-1200.0,67.2
+600,-900.0,55.2
+600,-600.0,43.2
+600,-400.0,35.2
+600,-200.0,27.2
+600,0.0,27.2
+600,200.0,27.2
+600,400.0,35.2
+600,600.0,43.2
+600,900.0,55.2
+600,1200.0,67.2
+600,1600.0,83.2
+600,2000.0,99.2
+600,2500.0,119.2
+600,3000.0,139.2
+600,3500.0,159.2
+600,4000.0,179.2
+600,4500.0,199.2
+600,5000.0,219.2
+600,5500.0,239.2
+900,-5500.0,242.8
+900,-5000.0,222.8
+900,-4500.0,182.8
+900,-4000.0,182.8
+900,-3500.0,162.8
+900,-3000.0,142.8
+900,-2500.0,122.8
+900,-2000.0,102.8
+900,-1600.0,86.8
+900,-1200.0,70.8
+900,-900.0,58.8
+900,-600.0,46.8
+900,-400.0,38.8
+900,-200.0,30.8
+900,0.0,30.8
+900,200.0,30.8
+900,400.0,38.8
+900,600.0,46.8
+900,900.0,58.8
+900,1200.0,70.8
+900,1600.0,86.8
+900,2000.0,102.8
+900,2500.0,122.8
+900,3000.0,142.8
+900,3500.0,162.8
+900,4000.0,182.8
+900,4500.0,202.8
+900,5000.0,222.8
+900,5500.0,242.8
+1200,-5500.0,246.4
+1200,-5000.0,226.4
+1200,-4500.0,186.4
+1200,-4000.0,186.4
+1200,-3500.0,166.4
+1200,-3000.0,146.4
+1200,-2500.0,126.4
+1200,-2000.0,106.4
+1200,-1600.0,90.4
+1200,-1200.0,74.4
+1200,-900.0,62.4
+1200,-600.0,50.4
+1200,-400.0,42.4
+1200,-200.0,34.4
+1200,0.0,34.4
+1200,200.0,34.4
+1200,400.0,42.4
+1200,600.0,50.4
+1200,900.0,62.4
+1200,1200.0,74.4
+1200,1600.0,90.4
+1200,2000.0,106.4
+1200,2500.0,126.4
+1200,3000.0,146.4
+1200,3500.0,166.4
+1200,4000.0,186.4
+1200,4500.0,206.4
+1200,5000.0,226.4
+1200,5500.0,246.4
+1600,-5500.0,251.2
+1600,-5000.0,231.2
+1600,-4500.0,191.2
+1600,-4000.0,191.2
+1600,-3500.0,171.2
+1600,-3000.0,151.2
+1600,-2500.0,131.2
+1600,-2000.0,111.2
+1600,-1600.0,95.2
+1600,-1200.0,79.2
+1600,-900.0,67.2
+1600,-600.0,55.2
+1600,-400.0,47.2
+1600,-200.0,39.2
+1600,0.0,39.2
+1600,200.0,39.2
+1600,400.0,47.2
+1600,600.0,55.2
+1600,900.0,67.2
+1600,1200.0,79.2
+1600,1600.0,95.2
+1600,2000.0,111.2
+1600,2500.0,131.2
+1600,3000.0,151.2
+1600,3500.0,171.2
+1600,4000.0,191.2
+1600,4500.0,211.2
+1600,5000.0,231.2
+1600,5500.0,251.2
+2000,-5500.0,256.0
+2000,-5000.0,236.0
+2000,-4500.0,196.0
+2000,-4000.0,196.0
+2000,-3500.0,176.0
+2000,-3000.0,156.0
+2000,-2500.0,136.0
+2000,-2000.0,116.0
+2000,-1600.0,100.0
+2000,-1200.0,84.0
+2000,-900.0,72.0
+2000,-600.0,60.0
+2000,-400.0,52.0
+2000,-200.0,44.0
+2000,0.0,44.0
+2000,200.0,44.0
+2000,400.0,52.0
+2000,600.0,60.0
+2000,900.0,72.0
+2000,1200.0,84.0
+2000,1600.0,100.0
+2000,2000.0,116.0
+2000,2500.0,136.0
+2000,3000.0,156.0
+2000,3500.0,176.0
+2000,4000.0,196.0
+2000,4500.0,216.0
+2000,5000.0,236.0
+2000,5500.0,256.0
+2500,-5500.0,262.0
+2500,-5000.0,242.0
+2500,-4500.0,202.0
+2500,-4000.0,202.0
+2500,-3500.0,182.0
+2500,-3000.0,162.0
+2500,-2500.0,142.0
+2500,-2000.0,122.0
+2500,-1600.0,106.0
+2500,-1200.0,90.0
+2500,-900.0,78.0
+2500,-600.0,66.0
+2500,-400.0,58.0
+2500,-200.0,50.0
+2500,0.0,50.0
+2500,200.0,50.0
+2500,400.0,58.0
+2500,600.0,66.0
+2500,900.0,78.0
+2500,1200.0,90.0
+2500,1600.0,106.0
+2500,2000.0,122.0
+2500,2500.0,142.0
+2500,3000.0,162.0
+2500,3500.0,182.0
+2500,4000.0,202.0
+2500,4500.0,222.0
+2500,5000.0,242.0
+2500,5500.0,262.0
+3000,-5500.0,268.0
+3000,-5000.0,248.0
+3000,-4500.0,208.0
+3000,-4000.0,208.0
+3000,-3500.0,188.0
+3000,-3000.0,168.0
+3000,-2500.0,148.0
+3000,-2000.0,128.0
+3000,-1600.0,112.0
+3000,-1200.0,96.0
+3000,-900.0,84.0
+3000,-600.0,72.0
+3000,-400.0,64.0
+3000,-200.0,56.0
+3000,0.0,56.0
+3000,200.0,56.0
+3000,400.0,64.0
+3000,600.0,72.0
+3000,900.0,84.0
+3000,1200.0,96.0
+3000,1600.0,112.0
+3000,2000.0,128.0
+3000,2500.0,148.0
+3000,3000.0,168.0
+3000,3500.0,188.0
+3000,4000.0,208.0
+3000,4500.0,228.0
+3000,5000.0,248.0
+3000,5500.0,268.0
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Gear_4.vtlm b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Gear_4.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..ea00afe57cd1fa0d4f058cced560bd1bd482dd1a
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Gear_4.vtlm	
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,239.2
+0,-5000.0,219.2
+0,-4500.0,179.2
+0,-4000.0,179.2
+0,-3500.0,159.2
+0,-3000.0,139.2
+0,-2500.0,119.2
+0,-2000.0,99.2
+0,-1600.0,83.2
+0,-1200.0,67.2
+0,-900.0,55.2
+0,-600.0,43.2
+0,-400.0,35.2
+0,-200.0,27.2
+0,0.0,27.2
+0,200.0,27.2
+0,400.0,35.2
+0,600.0,43.2
+0,900.0,55.2
+0,1200.0,67.2
+0,1600.0,83.2
+0,2000.0,99.2
+0,2500.0,119.2
+0,3000.0,139.2
+0,3500.0,159.2
+0,4000.0,179.2
+0,4500.0,199.2
+0,5000.0,219.2
+0,5500.0,239.2
+600,-5500.0,239.2
+600,-5000.0,219.2
+600,-4500.0,179.2
+600,-4000.0,179.2
+600,-3500.0,159.2
+600,-3000.0,139.2
+600,-2500.0,119.2
+600,-2000.0,99.2
+600,-1600.0,83.2
+600,-1200.0,67.2
+600,-900.0,55.2
+600,-600.0,43.2
+600,-400.0,35.2
+600,-200.0,27.2
+600,0.0,27.2
+600,200.0,27.2
+600,400.0,35.2
+600,600.0,43.2
+600,900.0,55.2
+600,1200.0,67.2
+600,1600.0,83.2
+600,2000.0,99.2
+600,2500.0,119.2
+600,3000.0,139.2
+600,3500.0,159.2
+600,4000.0,179.2
+600,4500.0,199.2
+600,5000.0,219.2
+600,5500.0,239.2
+900,-5500.0,242.8
+900,-5000.0,222.8
+900,-4500.0,182.8
+900,-4000.0,182.8
+900,-3500.0,162.8
+900,-3000.0,142.8
+900,-2500.0,122.8
+900,-2000.0,102.8
+900,-1600.0,86.8
+900,-1200.0,70.8
+900,-900.0,58.8
+900,-600.0,46.8
+900,-400.0,38.8
+900,-200.0,30.8
+900,0.0,30.8
+900,200.0,30.8
+900,400.0,38.8
+900,600.0,46.8
+900,900.0,58.8
+900,1200.0,70.8
+900,1600.0,86.8
+900,2000.0,102.8
+900,2500.0,122.8
+900,3000.0,142.8
+900,3500.0,162.8
+900,4000.0,182.8
+900,4500.0,202.8
+900,5000.0,222.8
+900,5500.0,242.8
+1200,-5500.0,246.4
+1200,-5000.0,226.4
+1200,-4500.0,186.4
+1200,-4000.0,186.4
+1200,-3500.0,166.4
+1200,-3000.0,146.4
+1200,-2500.0,126.4
+1200,-2000.0,106.4
+1200,-1600.0,90.4
+1200,-1200.0,74.4
+1200,-900.0,62.4
+1200,-600.0,50.4
+1200,-400.0,42.4
+1200,-200.0,34.4
+1200,0.0,34.4
+1200,200.0,34.4
+1200,400.0,42.4
+1200,600.0,50.4
+1200,900.0,62.4
+1200,1200.0,74.4
+1200,1600.0,90.4
+1200,2000.0,106.4
+1200,2500.0,126.4
+1200,3000.0,146.4
+1200,3500.0,166.4
+1200,4000.0,186.4
+1200,4500.0,206.4
+1200,5000.0,226.4
+1200,5500.0,246.4
+1600,-5500.0,251.2
+1600,-5000.0,231.2
+1600,-4500.0,191.2
+1600,-4000.0,191.2
+1600,-3500.0,171.2
+1600,-3000.0,151.2
+1600,-2500.0,131.2
+1600,-2000.0,111.2
+1600,-1600.0,95.2
+1600,-1200.0,79.2
+1600,-900.0,67.2
+1600,-600.0,55.2
+1600,-400.0,47.2
+1600,-200.0,39.2
+1600,0.0,39.2
+1600,200.0,39.2
+1600,400.0,47.2
+1600,600.0,55.2
+1600,900.0,67.2
+1600,1200.0,79.2
+1600,1600.0,95.2
+1600,2000.0,111.2
+1600,2500.0,131.2
+1600,3000.0,151.2
+1600,3500.0,171.2
+1600,4000.0,191.2
+1600,4500.0,211.2
+1600,5000.0,231.2
+1600,5500.0,251.2
+2000,-5500.0,256.0
+2000,-5000.0,236.0
+2000,-4500.0,196.0
+2000,-4000.0,196.0
+2000,-3500.0,176.0
+2000,-3000.0,156.0
+2000,-2500.0,136.0
+2000,-2000.0,116.0
+2000,-1600.0,100.0
+2000,-1200.0,84.0
+2000,-900.0,72.0
+2000,-600.0,60.0
+2000,-400.0,52.0
+2000,-200.0,44.0
+2000,0.0,44.0
+2000,200.0,44.0
+2000,400.0,52.0
+2000,600.0,60.0
+2000,900.0,72.0
+2000,1200.0,84.0
+2000,1600.0,100.0
+2000,2000.0,116.0
+2000,2500.0,136.0
+2000,3000.0,156.0
+2000,3500.0,176.0
+2000,4000.0,196.0
+2000,4500.0,216.0
+2000,5000.0,236.0
+2000,5500.0,256.0
+2500,-5500.0,262.0
+2500,-5000.0,242.0
+2500,-4500.0,202.0
+2500,-4000.0,202.0
+2500,-3500.0,182.0
+2500,-3000.0,162.0
+2500,-2500.0,142.0
+2500,-2000.0,122.0
+2500,-1600.0,106.0
+2500,-1200.0,90.0
+2500,-900.0,78.0
+2500,-600.0,66.0
+2500,-400.0,58.0
+2500,-200.0,50.0
+2500,0.0,50.0
+2500,200.0,50.0
+2500,400.0,58.0
+2500,600.0,66.0
+2500,900.0,78.0
+2500,1200.0,90.0
+2500,1600.0,106.0
+2500,2000.0,122.0
+2500,2500.0,142.0
+2500,3000.0,162.0
+2500,3500.0,182.0
+2500,4000.0,202.0
+2500,4500.0,222.0
+2500,5000.0,242.0
+2500,5500.0,262.0
+3000,-5500.0,268.0
+3000,-5000.0,248.0
+3000,-4500.0,208.0
+3000,-4000.0,208.0
+3000,-3500.0,188.0
+3000,-3000.0,168.0
+3000,-2500.0,148.0
+3000,-2000.0,128.0
+3000,-1600.0,112.0
+3000,-1200.0,96.0
+3000,-900.0,84.0
+3000,-600.0,72.0
+3000,-400.0,64.0
+3000,-200.0,56.0
+3000,0.0,56.0
+3000,200.0,56.0
+3000,400.0,64.0
+3000,600.0,72.0
+3000,900.0,84.0
+3000,1200.0,96.0
+3000,1600.0,112.0
+3000,2000.0,128.0
+3000,2500.0,148.0
+3000,3000.0,168.0
+3000,3500.0,188.0
+3000,4000.0,208.0
+3000,4500.0,228.0
+3000,5000.0,248.0
+3000,5500.0,268.0
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Gear_5.vtlm b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Gear_5.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..ea00afe57cd1fa0d4f058cced560bd1bd482dd1a
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Gear_5.vtlm	
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,239.2
+0,-5000.0,219.2
+0,-4500.0,179.2
+0,-4000.0,179.2
+0,-3500.0,159.2
+0,-3000.0,139.2
+0,-2500.0,119.2
+0,-2000.0,99.2
+0,-1600.0,83.2
+0,-1200.0,67.2
+0,-900.0,55.2
+0,-600.0,43.2
+0,-400.0,35.2
+0,-200.0,27.2
+0,0.0,27.2
+0,200.0,27.2
+0,400.0,35.2
+0,600.0,43.2
+0,900.0,55.2
+0,1200.0,67.2
+0,1600.0,83.2
+0,2000.0,99.2
+0,2500.0,119.2
+0,3000.0,139.2
+0,3500.0,159.2
+0,4000.0,179.2
+0,4500.0,199.2
+0,5000.0,219.2
+0,5500.0,239.2
+600,-5500.0,239.2
+600,-5000.0,219.2
+600,-4500.0,179.2
+600,-4000.0,179.2
+600,-3500.0,159.2
+600,-3000.0,139.2
+600,-2500.0,119.2
+600,-2000.0,99.2
+600,-1600.0,83.2
+600,-1200.0,67.2
+600,-900.0,55.2
+600,-600.0,43.2
+600,-400.0,35.2
+600,-200.0,27.2
+600,0.0,27.2
+600,200.0,27.2
+600,400.0,35.2
+600,600.0,43.2
+600,900.0,55.2
+600,1200.0,67.2
+600,1600.0,83.2
+600,2000.0,99.2
+600,2500.0,119.2
+600,3000.0,139.2
+600,3500.0,159.2
+600,4000.0,179.2
+600,4500.0,199.2
+600,5000.0,219.2
+600,5500.0,239.2
+900,-5500.0,242.8
+900,-5000.0,222.8
+900,-4500.0,182.8
+900,-4000.0,182.8
+900,-3500.0,162.8
+900,-3000.0,142.8
+900,-2500.0,122.8
+900,-2000.0,102.8
+900,-1600.0,86.8
+900,-1200.0,70.8
+900,-900.0,58.8
+900,-600.0,46.8
+900,-400.0,38.8
+900,-200.0,30.8
+900,0.0,30.8
+900,200.0,30.8
+900,400.0,38.8
+900,600.0,46.8
+900,900.0,58.8
+900,1200.0,70.8
+900,1600.0,86.8
+900,2000.0,102.8
+900,2500.0,122.8
+900,3000.0,142.8
+900,3500.0,162.8
+900,4000.0,182.8
+900,4500.0,202.8
+900,5000.0,222.8
+900,5500.0,242.8
+1200,-5500.0,246.4
+1200,-5000.0,226.4
+1200,-4500.0,186.4
+1200,-4000.0,186.4
+1200,-3500.0,166.4
+1200,-3000.0,146.4
+1200,-2500.0,126.4
+1200,-2000.0,106.4
+1200,-1600.0,90.4
+1200,-1200.0,74.4
+1200,-900.0,62.4
+1200,-600.0,50.4
+1200,-400.0,42.4
+1200,-200.0,34.4
+1200,0.0,34.4
+1200,200.0,34.4
+1200,400.0,42.4
+1200,600.0,50.4
+1200,900.0,62.4
+1200,1200.0,74.4
+1200,1600.0,90.4
+1200,2000.0,106.4
+1200,2500.0,126.4
+1200,3000.0,146.4
+1200,3500.0,166.4
+1200,4000.0,186.4
+1200,4500.0,206.4
+1200,5000.0,226.4
+1200,5500.0,246.4
+1600,-5500.0,251.2
+1600,-5000.0,231.2
+1600,-4500.0,191.2
+1600,-4000.0,191.2
+1600,-3500.0,171.2
+1600,-3000.0,151.2
+1600,-2500.0,131.2
+1600,-2000.0,111.2
+1600,-1600.0,95.2
+1600,-1200.0,79.2
+1600,-900.0,67.2
+1600,-600.0,55.2
+1600,-400.0,47.2
+1600,-200.0,39.2
+1600,0.0,39.2
+1600,200.0,39.2
+1600,400.0,47.2
+1600,600.0,55.2
+1600,900.0,67.2
+1600,1200.0,79.2
+1600,1600.0,95.2
+1600,2000.0,111.2
+1600,2500.0,131.2
+1600,3000.0,151.2
+1600,3500.0,171.2
+1600,4000.0,191.2
+1600,4500.0,211.2
+1600,5000.0,231.2
+1600,5500.0,251.2
+2000,-5500.0,256.0
+2000,-5000.0,236.0
+2000,-4500.0,196.0
+2000,-4000.0,196.0
+2000,-3500.0,176.0
+2000,-3000.0,156.0
+2000,-2500.0,136.0
+2000,-2000.0,116.0
+2000,-1600.0,100.0
+2000,-1200.0,84.0
+2000,-900.0,72.0
+2000,-600.0,60.0
+2000,-400.0,52.0
+2000,-200.0,44.0
+2000,0.0,44.0
+2000,200.0,44.0
+2000,400.0,52.0
+2000,600.0,60.0
+2000,900.0,72.0
+2000,1200.0,84.0
+2000,1600.0,100.0
+2000,2000.0,116.0
+2000,2500.0,136.0
+2000,3000.0,156.0
+2000,3500.0,176.0
+2000,4000.0,196.0
+2000,4500.0,216.0
+2000,5000.0,236.0
+2000,5500.0,256.0
+2500,-5500.0,262.0
+2500,-5000.0,242.0
+2500,-4500.0,202.0
+2500,-4000.0,202.0
+2500,-3500.0,182.0
+2500,-3000.0,162.0
+2500,-2500.0,142.0
+2500,-2000.0,122.0
+2500,-1600.0,106.0
+2500,-1200.0,90.0
+2500,-900.0,78.0
+2500,-600.0,66.0
+2500,-400.0,58.0
+2500,-200.0,50.0
+2500,0.0,50.0
+2500,200.0,50.0
+2500,400.0,58.0
+2500,600.0,66.0
+2500,900.0,78.0
+2500,1200.0,90.0
+2500,1600.0,106.0
+2500,2000.0,122.0
+2500,2500.0,142.0
+2500,3000.0,162.0
+2500,3500.0,182.0
+2500,4000.0,202.0
+2500,4500.0,222.0
+2500,5000.0,242.0
+2500,5500.0,262.0
+3000,-5500.0,268.0
+3000,-5000.0,248.0
+3000,-4500.0,208.0
+3000,-4000.0,208.0
+3000,-3500.0,188.0
+3000,-3000.0,168.0
+3000,-2500.0,148.0
+3000,-2000.0,128.0
+3000,-1600.0,112.0
+3000,-1200.0,96.0
+3000,-900.0,84.0
+3000,-600.0,72.0
+3000,-400.0,64.0
+3000,-200.0,56.0
+3000,0.0,56.0
+3000,200.0,56.0
+3000,400.0,64.0
+3000,600.0,72.0
+3000,900.0,84.0
+3000,1200.0,96.0
+3000,1600.0,112.0
+3000,2000.0,128.0
+3000,2500.0,148.0
+3000,3000.0,168.0
+3000,3500.0,188.0
+3000,4000.0,208.0
+3000,4500.0,228.0
+3000,5000.0,248.0
+3000,5500.0,268.0
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Gear_6.vtlm b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Gear_6.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..ea00afe57cd1fa0d4f058cced560bd1bd482dd1a
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Gear_6.vtlm	
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,239.2
+0,-5000.0,219.2
+0,-4500.0,179.2
+0,-4000.0,179.2
+0,-3500.0,159.2
+0,-3000.0,139.2
+0,-2500.0,119.2
+0,-2000.0,99.2
+0,-1600.0,83.2
+0,-1200.0,67.2
+0,-900.0,55.2
+0,-600.0,43.2
+0,-400.0,35.2
+0,-200.0,27.2
+0,0.0,27.2
+0,200.0,27.2
+0,400.0,35.2
+0,600.0,43.2
+0,900.0,55.2
+0,1200.0,67.2
+0,1600.0,83.2
+0,2000.0,99.2
+0,2500.0,119.2
+0,3000.0,139.2
+0,3500.0,159.2
+0,4000.0,179.2
+0,4500.0,199.2
+0,5000.0,219.2
+0,5500.0,239.2
+600,-5500.0,239.2
+600,-5000.0,219.2
+600,-4500.0,179.2
+600,-4000.0,179.2
+600,-3500.0,159.2
+600,-3000.0,139.2
+600,-2500.0,119.2
+600,-2000.0,99.2
+600,-1600.0,83.2
+600,-1200.0,67.2
+600,-900.0,55.2
+600,-600.0,43.2
+600,-400.0,35.2
+600,-200.0,27.2
+600,0.0,27.2
+600,200.0,27.2
+600,400.0,35.2
+600,600.0,43.2
+600,900.0,55.2
+600,1200.0,67.2
+600,1600.0,83.2
+600,2000.0,99.2
+600,2500.0,119.2
+600,3000.0,139.2
+600,3500.0,159.2
+600,4000.0,179.2
+600,4500.0,199.2
+600,5000.0,219.2
+600,5500.0,239.2
+900,-5500.0,242.8
+900,-5000.0,222.8
+900,-4500.0,182.8
+900,-4000.0,182.8
+900,-3500.0,162.8
+900,-3000.0,142.8
+900,-2500.0,122.8
+900,-2000.0,102.8
+900,-1600.0,86.8
+900,-1200.0,70.8
+900,-900.0,58.8
+900,-600.0,46.8
+900,-400.0,38.8
+900,-200.0,30.8
+900,0.0,30.8
+900,200.0,30.8
+900,400.0,38.8
+900,600.0,46.8
+900,900.0,58.8
+900,1200.0,70.8
+900,1600.0,86.8
+900,2000.0,102.8
+900,2500.0,122.8
+900,3000.0,142.8
+900,3500.0,162.8
+900,4000.0,182.8
+900,4500.0,202.8
+900,5000.0,222.8
+900,5500.0,242.8
+1200,-5500.0,246.4
+1200,-5000.0,226.4
+1200,-4500.0,186.4
+1200,-4000.0,186.4
+1200,-3500.0,166.4
+1200,-3000.0,146.4
+1200,-2500.0,126.4
+1200,-2000.0,106.4
+1200,-1600.0,90.4
+1200,-1200.0,74.4
+1200,-900.0,62.4
+1200,-600.0,50.4
+1200,-400.0,42.4
+1200,-200.0,34.4
+1200,0.0,34.4
+1200,200.0,34.4
+1200,400.0,42.4
+1200,600.0,50.4
+1200,900.0,62.4
+1200,1200.0,74.4
+1200,1600.0,90.4
+1200,2000.0,106.4
+1200,2500.0,126.4
+1200,3000.0,146.4
+1200,3500.0,166.4
+1200,4000.0,186.4
+1200,4500.0,206.4
+1200,5000.0,226.4
+1200,5500.0,246.4
+1600,-5500.0,251.2
+1600,-5000.0,231.2
+1600,-4500.0,191.2
+1600,-4000.0,191.2
+1600,-3500.0,171.2
+1600,-3000.0,151.2
+1600,-2500.0,131.2
+1600,-2000.0,111.2
+1600,-1600.0,95.2
+1600,-1200.0,79.2
+1600,-900.0,67.2
+1600,-600.0,55.2
+1600,-400.0,47.2
+1600,-200.0,39.2
+1600,0.0,39.2
+1600,200.0,39.2
+1600,400.0,47.2
+1600,600.0,55.2
+1600,900.0,67.2
+1600,1200.0,79.2
+1600,1600.0,95.2
+1600,2000.0,111.2
+1600,2500.0,131.2
+1600,3000.0,151.2
+1600,3500.0,171.2
+1600,4000.0,191.2
+1600,4500.0,211.2
+1600,5000.0,231.2
+1600,5500.0,251.2
+2000,-5500.0,256.0
+2000,-5000.0,236.0
+2000,-4500.0,196.0
+2000,-4000.0,196.0
+2000,-3500.0,176.0
+2000,-3000.0,156.0
+2000,-2500.0,136.0
+2000,-2000.0,116.0
+2000,-1600.0,100.0
+2000,-1200.0,84.0
+2000,-900.0,72.0
+2000,-600.0,60.0
+2000,-400.0,52.0
+2000,-200.0,44.0
+2000,0.0,44.0
+2000,200.0,44.0
+2000,400.0,52.0
+2000,600.0,60.0
+2000,900.0,72.0
+2000,1200.0,84.0
+2000,1600.0,100.0
+2000,2000.0,116.0
+2000,2500.0,136.0
+2000,3000.0,156.0
+2000,3500.0,176.0
+2000,4000.0,196.0
+2000,4500.0,216.0
+2000,5000.0,236.0
+2000,5500.0,256.0
+2500,-5500.0,262.0
+2500,-5000.0,242.0
+2500,-4500.0,202.0
+2500,-4000.0,202.0
+2500,-3500.0,182.0
+2500,-3000.0,162.0
+2500,-2500.0,142.0
+2500,-2000.0,122.0
+2500,-1600.0,106.0
+2500,-1200.0,90.0
+2500,-900.0,78.0
+2500,-600.0,66.0
+2500,-400.0,58.0
+2500,-200.0,50.0
+2500,0.0,50.0
+2500,200.0,50.0
+2500,400.0,58.0
+2500,600.0,66.0
+2500,900.0,78.0
+2500,1200.0,90.0
+2500,1600.0,106.0
+2500,2000.0,122.0
+2500,2500.0,142.0
+2500,3000.0,162.0
+2500,3500.0,182.0
+2500,4000.0,202.0
+2500,4500.0,222.0
+2500,5000.0,242.0
+2500,5500.0,262.0
+3000,-5500.0,268.0
+3000,-5000.0,248.0
+3000,-4500.0,208.0
+3000,-4000.0,208.0
+3000,-3500.0,188.0
+3000,-3000.0,168.0
+3000,-2500.0,148.0
+3000,-2000.0,128.0
+3000,-1600.0,112.0
+3000,-1200.0,96.0
+3000,-900.0,84.0
+3000,-600.0,72.0
+3000,-400.0,64.0
+3000,-200.0,56.0
+3000,0.0,56.0
+3000,200.0,56.0
+3000,400.0,64.0
+3000,600.0,72.0
+3000,900.0,84.0
+3000,1200.0,96.0
+3000,1600.0,112.0
+3000,2000.0,128.0
+3000,2500.0,148.0
+3000,3000.0,168.0
+3000,3500.0,188.0
+3000,4000.0,208.0
+3000,4500.0,228.0
+3000,5000.0,248.0
+3000,5500.0,268.0
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Gear_7.vtlm b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Gear_7.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..ea00afe57cd1fa0d4f058cced560bd1bd482dd1a
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Gear_7.vtlm	
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,239.2
+0,-5000.0,219.2
+0,-4500.0,179.2
+0,-4000.0,179.2
+0,-3500.0,159.2
+0,-3000.0,139.2
+0,-2500.0,119.2
+0,-2000.0,99.2
+0,-1600.0,83.2
+0,-1200.0,67.2
+0,-900.0,55.2
+0,-600.0,43.2
+0,-400.0,35.2
+0,-200.0,27.2
+0,0.0,27.2
+0,200.0,27.2
+0,400.0,35.2
+0,600.0,43.2
+0,900.0,55.2
+0,1200.0,67.2
+0,1600.0,83.2
+0,2000.0,99.2
+0,2500.0,119.2
+0,3000.0,139.2
+0,3500.0,159.2
+0,4000.0,179.2
+0,4500.0,199.2
+0,5000.0,219.2
+0,5500.0,239.2
+600,-5500.0,239.2
+600,-5000.0,219.2
+600,-4500.0,179.2
+600,-4000.0,179.2
+600,-3500.0,159.2
+600,-3000.0,139.2
+600,-2500.0,119.2
+600,-2000.0,99.2
+600,-1600.0,83.2
+600,-1200.0,67.2
+600,-900.0,55.2
+600,-600.0,43.2
+600,-400.0,35.2
+600,-200.0,27.2
+600,0.0,27.2
+600,200.0,27.2
+600,400.0,35.2
+600,600.0,43.2
+600,900.0,55.2
+600,1200.0,67.2
+600,1600.0,83.2
+600,2000.0,99.2
+600,2500.0,119.2
+600,3000.0,139.2
+600,3500.0,159.2
+600,4000.0,179.2
+600,4500.0,199.2
+600,5000.0,219.2
+600,5500.0,239.2
+900,-5500.0,242.8
+900,-5000.0,222.8
+900,-4500.0,182.8
+900,-4000.0,182.8
+900,-3500.0,162.8
+900,-3000.0,142.8
+900,-2500.0,122.8
+900,-2000.0,102.8
+900,-1600.0,86.8
+900,-1200.0,70.8
+900,-900.0,58.8
+900,-600.0,46.8
+900,-400.0,38.8
+900,-200.0,30.8
+900,0.0,30.8
+900,200.0,30.8
+900,400.0,38.8
+900,600.0,46.8
+900,900.0,58.8
+900,1200.0,70.8
+900,1600.0,86.8
+900,2000.0,102.8
+900,2500.0,122.8
+900,3000.0,142.8
+900,3500.0,162.8
+900,4000.0,182.8
+900,4500.0,202.8
+900,5000.0,222.8
+900,5500.0,242.8
+1200,-5500.0,246.4
+1200,-5000.0,226.4
+1200,-4500.0,186.4
+1200,-4000.0,186.4
+1200,-3500.0,166.4
+1200,-3000.0,146.4
+1200,-2500.0,126.4
+1200,-2000.0,106.4
+1200,-1600.0,90.4
+1200,-1200.0,74.4
+1200,-900.0,62.4
+1200,-600.0,50.4
+1200,-400.0,42.4
+1200,-200.0,34.4
+1200,0.0,34.4
+1200,200.0,34.4
+1200,400.0,42.4
+1200,600.0,50.4
+1200,900.0,62.4
+1200,1200.0,74.4
+1200,1600.0,90.4
+1200,2000.0,106.4
+1200,2500.0,126.4
+1200,3000.0,146.4
+1200,3500.0,166.4
+1200,4000.0,186.4
+1200,4500.0,206.4
+1200,5000.0,226.4
+1200,5500.0,246.4
+1600,-5500.0,251.2
+1600,-5000.0,231.2
+1600,-4500.0,191.2
+1600,-4000.0,191.2
+1600,-3500.0,171.2
+1600,-3000.0,151.2
+1600,-2500.0,131.2
+1600,-2000.0,111.2
+1600,-1600.0,95.2
+1600,-1200.0,79.2
+1600,-900.0,67.2
+1600,-600.0,55.2
+1600,-400.0,47.2
+1600,-200.0,39.2
+1600,0.0,39.2
+1600,200.0,39.2
+1600,400.0,47.2
+1600,600.0,55.2
+1600,900.0,67.2
+1600,1200.0,79.2
+1600,1600.0,95.2
+1600,2000.0,111.2
+1600,2500.0,131.2
+1600,3000.0,151.2
+1600,3500.0,171.2
+1600,4000.0,191.2
+1600,4500.0,211.2
+1600,5000.0,231.2
+1600,5500.0,251.2
+2000,-5500.0,256.0
+2000,-5000.0,236.0
+2000,-4500.0,196.0
+2000,-4000.0,196.0
+2000,-3500.0,176.0
+2000,-3000.0,156.0
+2000,-2500.0,136.0
+2000,-2000.0,116.0
+2000,-1600.0,100.0
+2000,-1200.0,84.0
+2000,-900.0,72.0
+2000,-600.0,60.0
+2000,-400.0,52.0
+2000,-200.0,44.0
+2000,0.0,44.0
+2000,200.0,44.0
+2000,400.0,52.0
+2000,600.0,60.0
+2000,900.0,72.0
+2000,1200.0,84.0
+2000,1600.0,100.0
+2000,2000.0,116.0
+2000,2500.0,136.0
+2000,3000.0,156.0
+2000,3500.0,176.0
+2000,4000.0,196.0
+2000,4500.0,216.0
+2000,5000.0,236.0
+2000,5500.0,256.0
+2500,-5500.0,262.0
+2500,-5000.0,242.0
+2500,-4500.0,202.0
+2500,-4000.0,202.0
+2500,-3500.0,182.0
+2500,-3000.0,162.0
+2500,-2500.0,142.0
+2500,-2000.0,122.0
+2500,-1600.0,106.0
+2500,-1200.0,90.0
+2500,-900.0,78.0
+2500,-600.0,66.0
+2500,-400.0,58.0
+2500,-200.0,50.0
+2500,0.0,50.0
+2500,200.0,50.0
+2500,400.0,58.0
+2500,600.0,66.0
+2500,900.0,78.0
+2500,1200.0,90.0
+2500,1600.0,106.0
+2500,2000.0,122.0
+2500,2500.0,142.0
+2500,3000.0,162.0
+2500,3500.0,182.0
+2500,4000.0,202.0
+2500,4500.0,222.0
+2500,5000.0,242.0
+2500,5500.0,262.0
+3000,-5500.0,268.0
+3000,-5000.0,248.0
+3000,-4500.0,208.0
+3000,-4000.0,208.0
+3000,-3500.0,188.0
+3000,-3000.0,168.0
+3000,-2500.0,148.0
+3000,-2000.0,128.0
+3000,-1600.0,112.0
+3000,-1200.0,96.0
+3000,-900.0,84.0
+3000,-600.0,72.0
+3000,-400.0,64.0
+3000,-200.0,56.0
+3000,0.0,56.0
+3000,200.0,56.0
+3000,400.0,64.0
+3000,600.0,72.0
+3000,900.0,84.0
+3000,1200.0,96.0
+3000,1600.0,112.0
+3000,2000.0,128.0
+3000,2500.0,148.0
+3000,3000.0,168.0
+3000,3500.0,188.0
+3000,4000.0,208.0
+3000,4500.0,228.0
+3000,5000.0,248.0
+3000,5500.0,268.0
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Gear_8.vtlm b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Gear_8.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..ea00afe57cd1fa0d4f058cced560bd1bd482dd1a
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Gear_8.vtlm	
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,239.2
+0,-5000.0,219.2
+0,-4500.0,179.2
+0,-4000.0,179.2
+0,-3500.0,159.2
+0,-3000.0,139.2
+0,-2500.0,119.2
+0,-2000.0,99.2
+0,-1600.0,83.2
+0,-1200.0,67.2
+0,-900.0,55.2
+0,-600.0,43.2
+0,-400.0,35.2
+0,-200.0,27.2
+0,0.0,27.2
+0,200.0,27.2
+0,400.0,35.2
+0,600.0,43.2
+0,900.0,55.2
+0,1200.0,67.2
+0,1600.0,83.2
+0,2000.0,99.2
+0,2500.0,119.2
+0,3000.0,139.2
+0,3500.0,159.2
+0,4000.0,179.2
+0,4500.0,199.2
+0,5000.0,219.2
+0,5500.0,239.2
+600,-5500.0,239.2
+600,-5000.0,219.2
+600,-4500.0,179.2
+600,-4000.0,179.2
+600,-3500.0,159.2
+600,-3000.0,139.2
+600,-2500.0,119.2
+600,-2000.0,99.2
+600,-1600.0,83.2
+600,-1200.0,67.2
+600,-900.0,55.2
+600,-600.0,43.2
+600,-400.0,35.2
+600,-200.0,27.2
+600,0.0,27.2
+600,200.0,27.2
+600,400.0,35.2
+600,600.0,43.2
+600,900.0,55.2
+600,1200.0,67.2
+600,1600.0,83.2
+600,2000.0,99.2
+600,2500.0,119.2
+600,3000.0,139.2
+600,3500.0,159.2
+600,4000.0,179.2
+600,4500.0,199.2
+600,5000.0,219.2
+600,5500.0,239.2
+900,-5500.0,242.8
+900,-5000.0,222.8
+900,-4500.0,182.8
+900,-4000.0,182.8
+900,-3500.0,162.8
+900,-3000.0,142.8
+900,-2500.0,122.8
+900,-2000.0,102.8
+900,-1600.0,86.8
+900,-1200.0,70.8
+900,-900.0,58.8
+900,-600.0,46.8
+900,-400.0,38.8
+900,-200.0,30.8
+900,0.0,30.8
+900,200.0,30.8
+900,400.0,38.8
+900,600.0,46.8
+900,900.0,58.8
+900,1200.0,70.8
+900,1600.0,86.8
+900,2000.0,102.8
+900,2500.0,122.8
+900,3000.0,142.8
+900,3500.0,162.8
+900,4000.0,182.8
+900,4500.0,202.8
+900,5000.0,222.8
+900,5500.0,242.8
+1200,-5500.0,246.4
+1200,-5000.0,226.4
+1200,-4500.0,186.4
+1200,-4000.0,186.4
+1200,-3500.0,166.4
+1200,-3000.0,146.4
+1200,-2500.0,126.4
+1200,-2000.0,106.4
+1200,-1600.0,90.4
+1200,-1200.0,74.4
+1200,-900.0,62.4
+1200,-600.0,50.4
+1200,-400.0,42.4
+1200,-200.0,34.4
+1200,0.0,34.4
+1200,200.0,34.4
+1200,400.0,42.4
+1200,600.0,50.4
+1200,900.0,62.4
+1200,1200.0,74.4
+1200,1600.0,90.4
+1200,2000.0,106.4
+1200,2500.0,126.4
+1200,3000.0,146.4
+1200,3500.0,166.4
+1200,4000.0,186.4
+1200,4500.0,206.4
+1200,5000.0,226.4
+1200,5500.0,246.4
+1600,-5500.0,251.2
+1600,-5000.0,231.2
+1600,-4500.0,191.2
+1600,-4000.0,191.2
+1600,-3500.0,171.2
+1600,-3000.0,151.2
+1600,-2500.0,131.2
+1600,-2000.0,111.2
+1600,-1600.0,95.2
+1600,-1200.0,79.2
+1600,-900.0,67.2
+1600,-600.0,55.2
+1600,-400.0,47.2
+1600,-200.0,39.2
+1600,0.0,39.2
+1600,200.0,39.2
+1600,400.0,47.2
+1600,600.0,55.2
+1600,900.0,67.2
+1600,1200.0,79.2
+1600,1600.0,95.2
+1600,2000.0,111.2
+1600,2500.0,131.2
+1600,3000.0,151.2
+1600,3500.0,171.2
+1600,4000.0,191.2
+1600,4500.0,211.2
+1600,5000.0,231.2
+1600,5500.0,251.2
+2000,-5500.0,256.0
+2000,-5000.0,236.0
+2000,-4500.0,196.0
+2000,-4000.0,196.0
+2000,-3500.0,176.0
+2000,-3000.0,156.0
+2000,-2500.0,136.0
+2000,-2000.0,116.0
+2000,-1600.0,100.0
+2000,-1200.0,84.0
+2000,-900.0,72.0
+2000,-600.0,60.0
+2000,-400.0,52.0
+2000,-200.0,44.0
+2000,0.0,44.0
+2000,200.0,44.0
+2000,400.0,52.0
+2000,600.0,60.0
+2000,900.0,72.0
+2000,1200.0,84.0
+2000,1600.0,100.0
+2000,2000.0,116.0
+2000,2500.0,136.0
+2000,3000.0,156.0
+2000,3500.0,176.0
+2000,4000.0,196.0
+2000,4500.0,216.0
+2000,5000.0,236.0
+2000,5500.0,256.0
+2500,-5500.0,262.0
+2500,-5000.0,242.0
+2500,-4500.0,202.0
+2500,-4000.0,202.0
+2500,-3500.0,182.0
+2500,-3000.0,162.0
+2500,-2500.0,142.0
+2500,-2000.0,122.0
+2500,-1600.0,106.0
+2500,-1200.0,90.0
+2500,-900.0,78.0
+2500,-600.0,66.0
+2500,-400.0,58.0
+2500,-200.0,50.0
+2500,0.0,50.0
+2500,200.0,50.0
+2500,400.0,58.0
+2500,600.0,66.0
+2500,900.0,78.0
+2500,1200.0,90.0
+2500,1600.0,106.0
+2500,2000.0,122.0
+2500,2500.0,142.0
+2500,3000.0,162.0
+2500,3500.0,182.0
+2500,4000.0,202.0
+2500,4500.0,222.0
+2500,5000.0,242.0
+2500,5500.0,262.0
+3000,-5500.0,268.0
+3000,-5000.0,248.0
+3000,-4500.0,208.0
+3000,-4000.0,208.0
+3000,-3500.0,188.0
+3000,-3000.0,168.0
+3000,-2500.0,148.0
+3000,-2000.0,128.0
+3000,-1600.0,112.0
+3000,-1200.0,96.0
+3000,-900.0,84.0
+3000,-600.0,72.0
+3000,-400.0,64.0
+3000,-200.0,56.0
+3000,0.0,56.0
+3000,200.0,56.0
+3000,400.0,64.0
+3000,600.0,72.0
+3000,900.0,84.0
+3000,1200.0,96.0
+3000,1600.0,112.0
+3000,2000.0,128.0
+3000,2500.0,148.0
+3000,3000.0,168.0
+3000,3500.0,188.0
+3000,4000.0,208.0
+3000,4500.0,228.0
+3000,5000.0,248.0
+3000,5500.0,268.0
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Gear_9.vtlm b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Gear_9.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..ea00afe57cd1fa0d4f058cced560bd1bd482dd1a
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/Gear_9.vtlm	
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,239.2
+0,-5000.0,219.2
+0,-4500.0,179.2
+0,-4000.0,179.2
+0,-3500.0,159.2
+0,-3000.0,139.2
+0,-2500.0,119.2
+0,-2000.0,99.2
+0,-1600.0,83.2
+0,-1200.0,67.2
+0,-900.0,55.2
+0,-600.0,43.2
+0,-400.0,35.2
+0,-200.0,27.2
+0,0.0,27.2
+0,200.0,27.2
+0,400.0,35.2
+0,600.0,43.2
+0,900.0,55.2
+0,1200.0,67.2
+0,1600.0,83.2
+0,2000.0,99.2
+0,2500.0,119.2
+0,3000.0,139.2
+0,3500.0,159.2
+0,4000.0,179.2
+0,4500.0,199.2
+0,5000.0,219.2
+0,5500.0,239.2
+600,-5500.0,239.2
+600,-5000.0,219.2
+600,-4500.0,179.2
+600,-4000.0,179.2
+600,-3500.0,159.2
+600,-3000.0,139.2
+600,-2500.0,119.2
+600,-2000.0,99.2
+600,-1600.0,83.2
+600,-1200.0,67.2
+600,-900.0,55.2
+600,-600.0,43.2
+600,-400.0,35.2
+600,-200.0,27.2
+600,0.0,27.2
+600,200.0,27.2
+600,400.0,35.2
+600,600.0,43.2
+600,900.0,55.2
+600,1200.0,67.2
+600,1600.0,83.2
+600,2000.0,99.2
+600,2500.0,119.2
+600,3000.0,139.2
+600,3500.0,159.2
+600,4000.0,179.2
+600,4500.0,199.2
+600,5000.0,219.2
+600,5500.0,239.2
+900,-5500.0,242.8
+900,-5000.0,222.8
+900,-4500.0,182.8
+900,-4000.0,182.8
+900,-3500.0,162.8
+900,-3000.0,142.8
+900,-2500.0,122.8
+900,-2000.0,102.8
+900,-1600.0,86.8
+900,-1200.0,70.8
+900,-900.0,58.8
+900,-600.0,46.8
+900,-400.0,38.8
+900,-200.0,30.8
+900,0.0,30.8
+900,200.0,30.8
+900,400.0,38.8
+900,600.0,46.8
+900,900.0,58.8
+900,1200.0,70.8
+900,1600.0,86.8
+900,2000.0,102.8
+900,2500.0,122.8
+900,3000.0,142.8
+900,3500.0,162.8
+900,4000.0,182.8
+900,4500.0,202.8
+900,5000.0,222.8
+900,5500.0,242.8
+1200,-5500.0,246.4
+1200,-5000.0,226.4
+1200,-4500.0,186.4
+1200,-4000.0,186.4
+1200,-3500.0,166.4
+1200,-3000.0,146.4
+1200,-2500.0,126.4
+1200,-2000.0,106.4
+1200,-1600.0,90.4
+1200,-1200.0,74.4
+1200,-900.0,62.4
+1200,-600.0,50.4
+1200,-400.0,42.4
+1200,-200.0,34.4
+1200,0.0,34.4
+1200,200.0,34.4
+1200,400.0,42.4
+1200,600.0,50.4
+1200,900.0,62.4
+1200,1200.0,74.4
+1200,1600.0,90.4
+1200,2000.0,106.4
+1200,2500.0,126.4
+1200,3000.0,146.4
+1200,3500.0,166.4
+1200,4000.0,186.4
+1200,4500.0,206.4
+1200,5000.0,226.4
+1200,5500.0,246.4
+1600,-5500.0,251.2
+1600,-5000.0,231.2
+1600,-4500.0,191.2
+1600,-4000.0,191.2
+1600,-3500.0,171.2
+1600,-3000.0,151.2
+1600,-2500.0,131.2
+1600,-2000.0,111.2
+1600,-1600.0,95.2
+1600,-1200.0,79.2
+1600,-900.0,67.2
+1600,-600.0,55.2
+1600,-400.0,47.2
+1600,-200.0,39.2
+1600,0.0,39.2
+1600,200.0,39.2
+1600,400.0,47.2
+1600,600.0,55.2
+1600,900.0,67.2
+1600,1200.0,79.2
+1600,1600.0,95.2
+1600,2000.0,111.2
+1600,2500.0,131.2
+1600,3000.0,151.2
+1600,3500.0,171.2
+1600,4000.0,191.2
+1600,4500.0,211.2
+1600,5000.0,231.2
+1600,5500.0,251.2
+2000,-5500.0,256.0
+2000,-5000.0,236.0
+2000,-4500.0,196.0
+2000,-4000.0,196.0
+2000,-3500.0,176.0
+2000,-3000.0,156.0
+2000,-2500.0,136.0
+2000,-2000.0,116.0
+2000,-1600.0,100.0
+2000,-1200.0,84.0
+2000,-900.0,72.0
+2000,-600.0,60.0
+2000,-400.0,52.0
+2000,-200.0,44.0
+2000,0.0,44.0
+2000,200.0,44.0
+2000,400.0,52.0
+2000,600.0,60.0
+2000,900.0,72.0
+2000,1200.0,84.0
+2000,1600.0,100.0
+2000,2000.0,116.0
+2000,2500.0,136.0
+2000,3000.0,156.0
+2000,3500.0,176.0
+2000,4000.0,196.0
+2000,4500.0,216.0
+2000,5000.0,236.0
+2000,5500.0,256.0
+2500,-5500.0,262.0
+2500,-5000.0,242.0
+2500,-4500.0,202.0
+2500,-4000.0,202.0
+2500,-3500.0,182.0
+2500,-3000.0,162.0
+2500,-2500.0,142.0
+2500,-2000.0,122.0
+2500,-1600.0,106.0
+2500,-1200.0,90.0
+2500,-900.0,78.0
+2500,-600.0,66.0
+2500,-400.0,58.0
+2500,-200.0,50.0
+2500,0.0,50.0
+2500,200.0,50.0
+2500,400.0,58.0
+2500,600.0,66.0
+2500,900.0,78.0
+2500,1200.0,90.0
+2500,1600.0,106.0
+2500,2000.0,122.0
+2500,2500.0,142.0
+2500,3000.0,162.0
+2500,3500.0,182.0
+2500,4000.0,202.0
+2500,4500.0,222.0
+2500,5000.0,242.0
+2500,5500.0,262.0
+3000,-5500.0,268.0
+3000,-5000.0,248.0
+3000,-4500.0,208.0
+3000,-4000.0,208.0
+3000,-3500.0,188.0
+3000,-3000.0,168.0
+3000,-2500.0,148.0
+3000,-2000.0,128.0
+3000,-1600.0,112.0
+3000,-1200.0,96.0
+3000,-900.0,84.0
+3000,-600.0,72.0
+3000,-400.0,64.0
+3000,-200.0,56.0
+3000,0.0,56.0
+3000,200.0,56.0
+3000,400.0,64.0
+3000,600.0,72.0
+3000,900.0,84.0
+3000,1200.0,96.0
+3000,1600.0,112.0
+3000,2000.0,128.0
+3000,2500.0,148.0
+3000,3000.0,168.0
+3000,3500.0,188.0
+3000,4000.0,208.0
+3000,4500.0,228.0
+3000,5000.0,248.0
+3000,5500.0,268.0
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/HeavyBusPrimaryVehicle.vveh b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/HeavyBusPrimaryVehicle.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..17081731e89bae938b501819947c7955e0432143
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/HeavyBusPrimaryVehicle.vveh	
@@ -0,0 +1,108 @@
+{
+  "Header": {
+    "CreatedBy": "",
+    "Date": "2017-07-03T14:47:35.9436880Z",
+    "AppVersion": "3",
+    "FileVersion": 7
+  },
+  "Body": {
+    "SavedInDeclMode": true,
+    "VehCat": "HeavyBusPrimaryVehicle",
+    "LegislativeClass": "N3",
+    "CurbWeight": 8229.0,
+    "CurbWeightExtra": 0.0,
+    "Loading": 0.0,
+    "MassMax": 18.0,
+    "rdyn": 0.0,
+    "CdCorrMode": "CdofVdecl",
+    "CdCorrFile": "",
+    "Retarder": {
+      "Type": "secondary",
+      "Ratio": 1.0,
+      "File": "Default.vrlm"
+    },
+    "Angledrive": {
+      "Type": "None",
+      "Ratio": 0.0,
+      "LossMap": ""
+    },
+    "PTO": {
+      "Type": "None",
+      "LossMap": "",
+      "Cycle": ""
+    },
+    "TorqueLimits": {},
+    "IdlingSpeed": 600.0,
+    "AxleConfig": {
+      "Type": "4x2",
+      "Axles": [
+        {
+          "Inertia": 14.9,
+          "Wheels": "315/70 R22.5",
+          "AxleWeightShare": 0.0,
+          "TwinTyres": false,
+          "RRCISO": 0.0055,
+          "FzISO": 33350.0,
+          "Type": "VehicleNonDriven"
+        },
+        {
+          "Inertia": 14.9,
+          "Wheels": "315/70 R22.5",
+          "AxleWeightShare": 0.0,
+          "TwinTyres": true,
+          "RRCISO": 0.0065,
+          "FzISO": 33350.0,
+          "Type": "VehicleDriven"
+        }
+      ]
+    },
+    "CdA": 5.3,
+	"Aux" {
+		"FanTechnology": "Electrically driven - Electronically controlled",
+		"SteeringPumpTechnology": [
+			"Dual displacement with mech. control"
+		],
+		"ElectricSupply": {
+			"Alternators": [
+				{
+					"Technology": "standard alternator",
+					"Ratio": 1.0,
+				}
+			],
+			"ResultCards": {
+				"Idle": [
+					{"Current": 0, "SmartCurrent": 0},
+					{"Current": 20, "SmartCurrent": 25},
+					{"Current": 50, "SmartCurrent": 60},
+				],
+				"Traction": [
+					{"Current": 0, "SmartCurrent": 0},
+					{"Current": 20, "SmartCurrent": 25},
+					{"Current": 50, "SmartCurrent": 60},
+				],
+				"Overrun": [
+					{"Current": 0, "SmartCurrent": 0},
+					{"Current": 20, "SmartCurrent": 25},
+					{"Current": 50, "SmartCurrent": 60},
+				]
+			},
+			"SmartElectrics": false
+		},
+		"ElectricConsumers": {
+			
+		}
+		"PneumaticSupply": {
+			"CompressorSize": "",
+			"Ratio": 1.0,
+		}
+		"PneumaticConsumers": {
+			"AirsuspensionControl": "mechanically",
+			"AdBlueDosing": "pneumatically"
+		},
+		"HVAC": {
+			"AdjustableCoolantThermostat": true,
+			"EngineWasteGasHeatExchanger": true,
+		}
+	}
+  }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/HeavyBusPrimary_DECL.vecto b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/HeavyBusPrimary_DECL.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..dc662a7ee6fdab97646f9e7abd2c3875b9eda307
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/HeavyBusPrimaryVehicle/HeavyBusPrimary_DECL.vecto	
@@ -0,0 +1,23 @@
+{
+  "Header": {
+    "CreatedBy": "",
+    "Date": "2017-07-03T14:47:43.6586880Z",
+    "AppVersion": "3",
+    "FileVersion": 3
+  },
+  "Body": {
+    "SavedInDeclMode": true,
+    "EngineOnlyMode": false,
+    "VehicleFile": "HeavyBusPrimaryVehicle.vveh",
+    "EngineFile": "Engine_325kW_12.7l.veng",
+    "GearboxFile": "AMT_12.vgbx",
+    "AuxiliaryAssembly": "Classic",
+    "AuxiliaryVersion": "CLASSIC",
+    "OverSpeedEcoRoll": {
+      "Mode": "Overspeed",
+      "MinSpeed": 50.0,
+      "OverSpeed": 5.0,
+      "UnderSpeed": 5.0
+    }
+  }
+}
\ No newline at end of file