diff --git a/EMBPiggyBackAndrewsSylva/AndrewsIndustry.json b/EMBPiggyBackAndrewsSylva/AndrewsIndustry.json
index f6f68d25..ca1c849f 100644
--- a/EMBPiggyBackAndrewsSylva/AndrewsIndustry.json
+++ b/EMBPiggyBackAndrewsSylva/AndrewsIndustry.json
@@ -1,4 +1,372 @@
 {
+  "areas": {
+    "andrews": {
+      "industries": {
+        "Andrews-Piggyback-Service": {
+          "name": "Andrews Piggyback Service",
+          "usesContract": true,
+          "components": {
+            "formula": {
+              "type": "Model.Ops.FormulaicIndustryComponent",
+              "name": "Andrews Piggyback Terminal",
+              "carTypeFilter": "",
+              "sharedStorage": true,
+              "inputTermsPerDay": {
+                "PiggyBack-Trailers": 2000000,
+                "boxcar-parts": 100000,
+                "boxcar-metal-stock": 150000,
+                "boxcar-furniture": 15000
+              },
+              "outputTermsPerDay": {
+                "PiggyBack-Trailers": 2000000
+              }
+            },
+            "LT1": {
+              "type": "Model.Ops.IndustryUnloader",
+              "name": "Andrews Piggyback Terminal Unloading Tracks",
+              "trackSpans": [ "EMB_ADW_PBT_L1", "EMB_ADW_PBT_L3" ],
+              "carTypeFilter": "PBF*",
+              "sharedStorage": true,
+              "loadId": "PiggyBack-Trailers",
+              "storageChangeRate": 0,
+              "maxStorage": 5000000,
+              "orderAroundEmpties": true,
+              "carTransferRate": 5000000,
+              "orderAroundLoaded": true
+            },
+            "LT2": {
+              "type": "Model.Ops.IndustryLoader",
+              "name": "Andrews Piggyback Terminal Loading Tracks",
+              "trackSpans": [ "EMB_ADW_PBT_U2", "EMB_ADW_PBT_U4" ],
+              "carTypeFilter": "PBF*",
+              "sharedStorage": true,
+              "loadId": "PiggyBack-Trailers",
+              "storageChangeRate": 0,
+              "maxStorage": 5000000,
+              "orderAroundEmpties": true,
+              "carTransferRate": 5000000,
+              "orderAroundLoaded": true
+            },
+            "BU1": {
+              "type": "Model.Ops.IndustryUnloader",
+              "name": "Andrews Piggyback Terminal Boxcar Tracks",
+              "trackSpans": [ "EMB_ADW_BXP_U1" ],
+              "carTypeFilter": "XM",
+              "sharedStorage": true,
+              "loadId": "boxcar-parts",
+              "storageChangeRate": 0,
+              "maxStorage": 200000,
+              "orderAroundEmpties": true,
+              "carTransferRate": 50000,
+              "orderAroundLoaded": true
+            },
+            "BU2": {
+              "type": "Model.Ops.IndustryUnloader",
+              "name": "Andrews Piggyback Terminal Boxcar Tracks",
+              "trackSpans": [ "EMB_ADW_BXP_U1" ],
+              "carTypeFilter": "XM",
+              "sharedStorage": true,
+              "loadId": "boxcar-metal-stock",
+              "storageChangeRate": 0,
+              "maxStorage": 400000,
+              "orderAroundEmpties": true,
+              "carTransferRate": 100000,
+              "orderAroundLoaded": true
+            },
+            "BU3": {
+              "type": "Model.Ops.IndustryUnloader",
+              "name": "Andrews Piggyback Terminal Boxcar Tracks",
+              "trackSpans": [ "EMB_ADW_BXP_U1" ],
+              "carTypeFilter": "XM",
+              "sharedStorage": true,
+              "loadId": "boxcar-furniture",
+              "storageChangeRate": 0,
+              "maxStorage": 700000,
+              "orderAroundEmpties": true,
+              "carTransferRate": 75000,
+              "orderAroundLoaded": true
+            }
+          }
+        }
+      }
+    }
+  },
+  "loads": {},
+  "texts": {},
+  "scenery": {
+    "EMBObject_A1": {
+      "modelIdentifier": "EMBEndPlatform",
+      "position": { "x": -27951.291, "y": 549.0, "z": -19977.365 },
+      "rotation": { "x": 0.0, "y": 123.451, "z": 0.0 },
+      "scale": {
+        "x": 1.0,
+        "y": 1.0,
+        "z": 1.0
+      }
+    },
+    "EMBObject_A2": {
+      "modelIdentifier": "EMB10MPlatform",
+      "position": { "x": -27965.894, "y": 549.0, "z": -19967.719 },
+      "rotation": { "x": 0.0, "y": 123.451, "z": 0.0 },
+      "scale": {
+        "x": 1.0,
+        "y": 1.0,
+        "z": 1.0
+      }
+    },
+    "EMBObject_A3": {
+      "modelIdentifier": "EMB10MPlatform",
+      "position": { "x": -27974.238, "y": 549.0, "z": -19962.207 },
+      "rotation": { "x": 0.0, "y": 123.451, "z": 0.0 },
+      "scale": {
+        "x": 1.0,
+        "y": 1.0,
+        "z": 1.0
+      }
+    },
+    "EMBObject_A4": {
+      "modelIdentifier": "EMB10MPlatform",
+      "position": { "x": -27982.584, "y": 549.0, "z": -19956.7 },
+      "rotation": { "x": 0.0, "y": 123.451, "z": 0.0 },
+      "scale": {
+        "x": 1.0,
+        "y": 1.0,
+        "z": 1.0
+      }
+    },
+    "EMBObject_A5": {
+      "modelIdentifier": "EMB10MPlatform",
+      "position": { "x": -27990.926, "y": 549.0, "z": -19951.18 },
+      "rotation": { "x": 0.0, "y": 123.451, "z": 0.0 },
+      "scale": {
+        "x": 1.0,
+        "y": 1.0,
+        "z": 1.0
+      }
+    },
+    "EMBObject_A6": {
+      "modelIdentifier": "EMBEndPlatform",
+      "position": { "x": -28005.527, "y": 549.0, "z": -19941.533 },
+      "rotation": { "x": 0.0, "y": 303.451, "z": 0.0 },
+      "scale": {
+        "x": 1.0,
+        "y": 1.0,
+        "z": 1.0
+      }
+    },
+    "EMBObject_A7": {
+      "modelIdentifier": "EMBPBRamp2",
+      "position": { "x": -27960.629, "y": 549.46, "z": -20012.424 },
+      "rotation": { "x": 0.0, "y": 303.451, "z": 0.0 },
+      "scale": {
+        "x": 1.0,
+        "y": 1.0,
+        "z": 1.0
+      }
+    },
+    "EMBObject_A8": {
+      "modelIdentifier": "EMBPBRamp2",
+      "position": { "x": -27970.994, "y": 549.46, "z": -20028.074 },
+      "rotation": { "x": 0.0, "y": 303.451, "z": 0.0 },
+      "scale": {
+        "x": 1.0,
+        "y": 1.0,
+        "z": 1.0
+      }
+    },
+    "EMBObject_A9": {
+      "modelIdentifier": "telegraph-office",
+      "position": { "x": -27941.348, "y": 548.78, "z": -19951.413 },
+      "rotation": { "x": 0.0, "y": 123.451, "z": 0.0 },
+      "scale": {
+        "x": 1.0,
+        "y": 1.0,
+        "z": 1.0
+      }
+    },
+    "EMBObject_AT1": {
+      "modelIdentifier": "EMBATSF24PB",
+      "position": { "x": -27971.034, "y": 548.83, "z": -19971.874 },
+      "rotation": { "x": -0.7, "y": 213.451, "z": 0.0 },
+      "scale": {
+        "x": 1.0,
+        "y": 1.0,
+        "z": 1.0
+      }
+    },
+    "EMBObject_AT2": {
+      "modelIdentifier": "EMBATSF24PB",
+      "position": { "x": -28012.752, "y": 548.83, "z": -19944.313 },
+      "rotation": { "x": -0.7, "y": 213.451, "z": 0.0 },
+      "scale": {
+        "x": 1.0,
+        "y": 1.0,
+        "z": 1.0
+      }
+    },
+    "EMBObject_AT3": {
+      "modelIdentifier": "EMBPRR26PB",
+      "position": { "x": -27993.451, "y": 549.79, "z": -19956.826 },
+      "rotation": { "x": -0.1, "y": 213.451, "z": 0.0 },
+      "scale": {
+        "x": 1.0,
+        "y": 1.0,
+        "z": 1.0
+      }
+    },
+    "EMBObject_AT4": {
+      "modelIdentifier": "EMBPRR26PB",
+      "position": { "x": -27973.426, "y": 549.79, "z": -19970.056 },
+      "rotation": { "x": -0.1, "y": 213.451, "z": 0.0 },
+      "scale": {
+        "x": 1.0,
+        "y": 1.0,
+        "z": 1.0
+      }
+    },
+    "EMBObject_AT5": {
+      "modelIdentifier": "EMBSP22PB",
+      "position": { "x": -27976.762, "y": 548.81, "z": -19967.852 },
+      "rotation": { "x": -0.1, "y": 213.451, "z": 0.0 },
+      "scale": {
+        "x": 1.0,
+        "y": 1.0,
+        "z": 1.0
+      }
+    },
+    "EMBObject_AT6": {
+      "modelIdentifier": "EMBSP22PB",
+      "position": { "x": -27997.621, "y": 548.81, "z": -19954.071 },
+      "rotation": { "x": -0.1, "y": 213.451, "z": 0.0 },
+      "scale": {
+        "x": 1.0,
+        "y": 1.0,
+        "z": 1.0
+      }
+    },
+    "EMBObject_AT7": {
+      "modelIdentifier": "EMBATSF24PB",
+      "position": { "x": -28010.248, "y": 548.83, "z": -19945.967 },
+      "rotation": { "x": -0.7, "y": 213.451, "z": 0.0 },
+      "scale": {
+        "x": 1.0,
+        "y": 1.0,
+        "z": 1.0
+      }
+    },
+    "EMBObject_AT8": {
+      "modelIdentifier": "EMBPRR26PB",
+      "position": { "x": -27951.733, "y": 549.79, "z": -19984.388 },
+      "rotation": { "x": -0.1, "y": 213.451, "z": 0.0 },
+      "scale": {
+        "x": 1.0,
+        "y": 1.0,
+        "z": 1.0
+      }
+    },
+    "EMBObject_AT9": {
+      "modelIdentifier": "EMBSP22PB",
+      "position": { "x": -27983.438, "y": 548.81, "z": -19963.442 },
+      "rotation": { "x": -0.1, "y": 213.451, "z": 0.0 },
+      "scale": {
+        "x": 1.0,
+        "y": 1.0,
+        "z": 1.0
+      }
+    }
+  },
+  "splineys": {
+    "Andrews Track Road 1": {
+      "handler": "StrangeCustoms.FlowyThingBuilder",
+      "profile": "Railroader Paved Road",
+      "style": "Road",
+      "points": [
+        {
+          "position": { "x": -28098.132, "y": 548.8, "z": -19921.584 },
+          "rotation": { "x": 0.0, "y": 123.451, "z": 0.0 },
+          "width": 19.0
+        },
+        {
+          "position": { "x": -27924.34, "y": 548.8, "z": -20036.408 },
+          "rotation": { "x": 0.0, "y": 123.451, "z": 0.0 },
+          "width": 19.0
+        }
+      ]
+    },
+    "Andrews Track Road 2": {
+      "handler": "StrangeCustoms.FlowyThingBuilder",
+      "profile": "Railroader Paved Road",
+      "style": "Road",
+      "points": [
+        {
+          "position": { "x": -27934.7, "y": 548.8, "z": -20052.057 },
+          "rotation": { "x": 0.0, "y": 303.451, "z": 0.0 },
+          "width": 19.0
+        },
+        {
+          "position": { "x": -28151.466, "y": 548.8, "z": -19908.85 },
+          "rotation": { "x": 0.0, "y": 303.451, "z": 0.0 },
+          "width": 19.0
+        }
+      ]
+    },
+    "Andrews Track Road 3": {
+      "handler": "StrangeCustoms.FlowyThingBuilder",
+      "profile": "Railroader Paved Road",
+      "style": "Road",
+      "points": [
+        {
+          "position": { "x": -27913.987, "y": 548.8, "z": -20020.737 },
+          "rotation": { "x": 0.0, "y": 303.451, "z": 0.0 },
+          "width": 19.0
+        },
+        {
+          "position": { "x": -28087.789, "y": 548.8, "z": -19905.916 },
+          "rotation": { "x": 0.0, "y": 303.451, "z": 0.0 },
+          "width": 19.0
+        }
+      ]
+    },
+    "Andrews Track Road 4": {
+      "handler": "StrangeCustoms.FlowyThingBuilder",
+      "profile": "Railroader Paved Road",
+      "style": "Road",
+      "points": [
+        {
+          "position": { "x": -27903.79, "y": 548.8, "z": -20005.319 },
+          "rotation": { "x": 0.0, "y": 303.451, "z": 0.0 },
+          "width": 19.0
+        },
+        {
+          "position": { "x": -28077.587, "y": 548.8, "z": -19890.499 },
+          "rotation": { "x": 0.0, "y": 303.451, "z": 0.0 },
+          "width": 19.0
+        }
+      ]
+    },
+    "Andrews Track Road 5": {
+      "handler": "StrangeCustoms.FlowyThingBuilder",
+      "profile": "Railroader Paved Road",
+      "style": "Road",
+      "points": [
+        {
+          "position": { "x": -28059.547, "y": 548.8, "z": -19863.178 },
+          "rotation": { "x": 0.0, "y": 123.451, "z": 0.0 },
+          "width": 10.0
+        },
+        {
+          "position": { "x": -27918.54, "y": 548.8, "z": -19956.334 },
+          "rotation": { "x": 0.0, "y": 123.451, "z": 0.0 },
+          "width": 10.0
+        },
+        {
+          "position": { "x": -27907.09, "y": 548.8, "z": -19992.262 },
+          "rotation": { "x": 0.0, "y": 221.451, "z": 0.0 },
+          "width": 20.0
+        }
+      ]
+    }
+  },
   "tracks": {
     "nodes": {
       "EMB_Node_hqeg": {
@@ -563,374 +931,6 @@
       }
     }
   },
-  "areas": {
-    "andrews": {
-      "industries": {
-        "Andrews-Piggyback-Service": {
-          "name": "Andrews Piggyback Service",
-          "usesContract": true,
-          "components": {
-            "formula": {
-              "type": "Model.Ops.FormulaicIndustryComponent",
-              "name": "Andrews Piggyback Terminal",
-              "carTypeFilter": "",
-              "sharedStorage": true,
-              "inputTermsPerDay": {
-                "PiggyBack-Trailers": 2000000,
-                "boxcar-parts": 100000,
-                "boxcar-metal-stock": 200000,
-                "boxcar-furniture": 15000
-              },
-              "outputTermsPerDay": {
-                "PiggyBack-Trailers": 2000000
-              }
-            },
-            "LT1": {
-              "type": "Model.Ops.IndustryUnloader",
-              "name": "Andrews Unloading Tracks",
-              "trackSpans": [ "EMB_ADW_PBT_L1", "EMB_ADW_PBT_L3" ],
-              "carTypeFilter": "PBF*",
-              "sharedStorage": true,
-              "loadId": "PiggyBack-Trailers",
-              "storageChangeRate": 0,
-              "maxStorage": 5000000,
-              "orderAroundEmpties": true,
-              "carTransferRate": 2000000,
-              "orderAroundLoaded": true
-            },
-            "LT2": {
-              "type": "Model.Ops.IndustryLoader",
-              "name": "Andrews Loading Tracks",
-              "trackSpans": [ "EMB_ADW_PBT_U2", "EMB_ADW_PBT_U4" ],
-              "carTypeFilter": "PBF*",
-              "sharedStorage": true,
-              "loadId": "PiggyBack-Trailers",
-              "storageChangeRate": 0,
-              "maxStorage": 5000000,
-              "orderAroundEmpties": true,
-              "carTransferRate": 2000000,
-              "orderAroundLoaded": true
-            },
-            "BU1": {
-              "type": "Model.Ops.IndustryUnloader",
-              "name": "Andrews Boxcar Tracks",
-              "trackSpans": [ "EMB_ADW_BXP_U1" ],
-              "carTypeFilter": "XM",
-              "sharedStorage": true,
-              "loadId": "boxcar-parts",
-              "storageChangeRate": 0,
-              "maxStorage": 200000,
-              "orderAroundEmpties": true,
-              "carTransferRate": 50000,
-              "orderAroundLoaded": true
-            },
-            "BU2": {
-              "type": "Model.Ops.IndustryUnloader",
-              "name": "Andrews Boxcar Tracks",
-              "trackSpans": [ "EMB_ADW_BXP_U1" ],
-              "carTypeFilter": "XM",
-              "sharedStorage": true,
-              "loadId": "boxcar-metal-stock",
-              "storageChangeRate": 0,
-              "maxStorage": 400000,
-              "orderAroundEmpties": true,
-              "carTransferRate": 100000,
-              "orderAroundLoaded": true
-            },
-            "BU3": {
-              "type": "Model.Ops.IndustryUnloader",
-              "name": "Andrews Boxcar Tracks",
-              "trackSpans": [ "EMB_ADW_BXP_U1" ],
-              "carTypeFilter": "XM",
-              "sharedStorage": true,
-              "loadId": "boxcar-furniture",
-              "storageChangeRate": 0,
-              "maxStorage": 700000,
-              "orderAroundEmpties": true,
-              "carTransferRate": 75000,
-              "orderAroundLoaded": true
-            }
-          }
-        }
-      }
-    }
-  },
-  "loads": {},
-  "texts": {},
-  "scenery": {
-    "EMBObject_A1": {
-      "modelIdentifier": "EMBEndPlatform",
-      "position": { "x": -27951.291, "y": 549.0, "z": -19977.365 },
-      "rotation": { "x": 0.0, "y": 123.451, "z": 0.0 },
-      "scale": {
-        "x": 1.0,
-        "y": 1.0,
-        "z": 1.0
-      }
-    },
-    "EMBObject_A2": {
-      "modelIdentifier": "EMB10MPlatform",
-      "position": { "x": -27965.894, "y": 549.0, "z": -19967.719 },
-      "rotation": { "x": 0.0, "y": 123.451, "z": 0.0 },
-      "scale": {
-        "x": 1.0,
-        "y": 1.0,
-        "z": 1.0
-      }
-    },
-    "EMBObject_A3": {
-      "modelIdentifier": "EMB10MPlatform",
-      "position": { "x": -27974.238, "y": 549.0, "z": -19962.207 },
-      "rotation": { "x": 0.0, "y": 123.451, "z": 0.0 },
-      "scale": {
-        "x": 1.0,
-        "y": 1.0,
-        "z": 1.0
-      }
-    },
-    "EMBObject_A4": {
-      "modelIdentifier": "EMB10MPlatform",
-      "position": { "x": -27982.584, "y": 549.0, "z": -19956.7 },
-      "rotation": { "x": 0.0, "y": 123.451, "z": 0.0 },
-      "scale": {
-        "x": 1.0,
-        "y": 1.0,
-        "z": 1.0
-      }
-    },
-    "EMBObject_A5": {
-      "modelIdentifier": "EMB10MPlatform",
-      "position": { "x": -27990.926, "y": 549.0, "z": -19951.18 },
-      "rotation": { "x": 0.0, "y": 123.451, "z": 0.0 },
-      "scale": {
-        "x": 1.0,
-        "y": 1.0,
-        "z": 1.0
-      }
-    },
-    "EMBObject_A6": {
-      "modelIdentifier": "EMBEndPlatform",
-      "position": { "x": -28005.527, "y": 549.0, "z": -19941.533 },
-      "rotation": { "x": 0.0, "y": 303.451, "z": 0.0 },
-      "scale": {
-        "x": 1.0,
-        "y": 1.0,
-        "z": 1.0
-      }
-    },
-    "EMBObject_A7": {
-      "modelIdentifier": "EMBPBRamp2",
-      "position": { "x": -27960.629, "y": 549.46, "z": -20012.424 },
-      "rotation": { "x": 0.0, "y": 303.451, "z": 0.0 },
-      "scale": {
-        "x": 1.0,
-        "y": 1.0,
-        "z": 1.0
-      }
-    },
-    "EMBObject_A8": {
-      "modelIdentifier": "EMBPBRamp2",
-      "position": { "x": -27970.994, "y": 549.46, "z": -20028.074 },
-      "rotation": { "x": 0.0, "y": 303.451, "z": 0.0 },
-      "scale": {
-        "x": 1.0,
-        "y": 1.0,
-        "z": 1.0
-      }
-    },
-    "EMBObject_A9": {
-      "modelIdentifier": "telegraph-office",
-      "position": { "x": -27941.348, "y": 548.78, "z": -19951.413 },
-      "rotation": { "x": 0.0, "y": 123.451, "z": 0.0 },
-      "scale": {
-        "x": 1.0,
-        "y": 1.0,
-        "z": 1.0
-      }
-    },
-    "EMBObject_AT1": {
-      "modelIdentifier": "EMBATSF24PB",
-      "position": { "x": -27971.034, "y": 548.83, "z": -19971.874 },
-      "rotation": { "x": -0.7, "y": 213.451, "z": 0.0 },
-      "scale": {
-        "x": 1.0,
-        "y": 1.0,
-        "z": 1.0
-      }
-    },
-    "EMBObject_AT2": {
-      "modelIdentifier": "EMBATSF24PB",
-      "position": { "x": -28012.752, "y": 548.83, "z": -19944.313 },
-      "rotation": { "x": -0.7, "y": 213.451, "z": 0.0 },
-      "scale": {
-        "x": 1.0,
-        "y": 1.0,
-        "z": 1.0
-      }
-    },
-    "EMBObject_AT3": {
-      "modelIdentifier": "EMBPRR26PB",
-      "position": { "x": -27993.451, "y": 549.79, "z": -19956.826 },
-      "rotation": { "x": -0.1, "y": 213.451, "z": 0.0 },
-      "scale": {
-        "x": 1.0,
-        "y": 1.0,
-        "z": 1.0
-      }
-    },
-    "EMBObject_AT4": {
-      "modelIdentifier": "EMBPRR26PB",
-      "position": { "x": -27973.426, "y": 549.79, "z": -19970.056 },
-      "rotation": { "x": -0.1, "y": 213.451, "z": 0.0 },
-      "scale": {
-        "x": 1.0,
-        "y": 1.0,
-        "z": 1.0
-      }
-    },
-    "EMBObject_AT5": {
-      "modelIdentifier": "EMBSP22PB",
-      "position": { "x": -27976.762, "y": 548.81, "z": -19967.852 },
-      "rotation": { "x": -0.1, "y": 213.451, "z": 0.0 },
-      "scale": {
-        "x": 1.0,
-        "y": 1.0,
-        "z": 1.0
-      }
-    },
-    "EMBObject_AT6": {
-      "modelIdentifier": "EMBSP22PB",
-      "position": { "x": -27997.621, "y": 548.81, "z": -19954.071 },
-      "rotation": { "x": -0.1, "y": 213.451, "z": 0.0 },
-      "scale": {
-        "x": 1.0,
-        "y": 1.0,
-        "z": 1.0
-      }
-    },
-    "EMBObject_AT7": {
-      "modelIdentifier": "EMBATSF24PB",
-      "position": { "x": -28010.248, "y": 548.83, "z": -19945.967 },
-      "rotation": { "x": -0.7, "y": 213.451, "z": 0.0 },
-      "scale": {
-        "x": 1.0,
-        "y": 1.0,
-        "z": 1.0
-      }
-    },
-    "EMBObject_AT8": {
-      "modelIdentifier": "EMBPRR26PB",
-      "position": { "x": -27951.733, "y": 549.79, "z": -19984.388 },
-      "rotation": { "x": -0.1, "y": 213.451, "z": 0.0 },
-      "scale": {
-        "x": 1.0,
-        "y": 1.0,
-        "z": 1.0
-      }
-    },
-    "EMBObject_AT9": {
-      "modelIdentifier": "EMBSP22PB",
-      "position": { "x": -27983.438, "y": 548.81, "z": -19963.442 },
-      "rotation": { "x": -0.1, "y": 213.451, "z": 0.0 },
-      "scale": {
-        "x": 1.0,
-        "y": 1.0,
-        "z": 1.0
-      }
-    }
-  },
-  "splineys": {
-    "Andrews Track Road 1": {
-      "handler": "StrangeCustoms.FlowyThingBuilder",
-      "profile": "Railroader Paved Road",
-      "style": "Road",
-      "points": [
-        {
-          "position": { "x": -28098.132, "y": 548.8, "z": -19921.584 },
-          "rotation": { "x": 0.0, "y": 123.451, "z": 0.0 },
-          "width": 19.0
-        },
-        {
-          "position": { "x": -27924.34, "y": 548.8, "z": -20036.408 },
-          "rotation": { "x": 0.0, "y": 123.451, "z": 0.0 },
-          "width": 19.0
-        }
-      ]
-    },
-    "Andrews Track Road 2": {
-      "handler": "StrangeCustoms.FlowyThingBuilder",
-      "profile": "Railroader Paved Road",
-      "style": "Road",
-      "points": [
-        {
-          "position": { "x": -27934.7, "y": 548.8, "z": -20052.057 },
-          "rotation": { "x": 0.0, "y": 303.451, "z": 0.0 },
-          "width": 19.0
-        },
-        {
-          "position": { "x": -28151.466, "y": 548.8, "z": -19908.85 },
-          "rotation": { "x": 0.0, "y": 303.451, "z": 0.0 },
-          "width": 19.0
-        }
-      ]
-    },
-    "Andrews Track Road 3": {
-      "handler": "StrangeCustoms.FlowyThingBuilder",
-      "profile": "Railroader Paved Road",
-      "style": "Road",
-      "points": [
-        {
-          "position": { "x": -27913.987, "y": 548.8, "z": -20020.737 },
-          "rotation": { "x": 0.0, "y": 303.451, "z": 0.0 },
-          "width": 19.0
-        },
-        {
-          "position": { "x": -28087.789, "y": 548.8, "z": -19905.916 },
-          "rotation": { "x": 0.0, "y": 303.451, "z": 0.0 },
-          "width": 19.0
-        }
-      ]
-    },
-    "Andrews Track Road 4": {
-      "handler": "StrangeCustoms.FlowyThingBuilder",
-      "profile": "Railroader Paved Road",
-      "style": "Road",
-      "points": [
-        {
-          "position": { "x": -27903.79, "y": 548.8, "z": -20005.319 },
-          "rotation": { "x": 0.0, "y": 303.451, "z": 0.0 },
-          "width": 19.0
-        },
-        {
-          "position": { "x": -28077.587, "y": 548.8, "z": -19890.499 },
-          "rotation": { "x": 0.0, "y": 303.451, "z": 0.0 },
-          "width": 19.0
-        }
-      ]
-    },
-    "Andrews Track Road 5": {
-      "handler": "StrangeCustoms.FlowyThingBuilder",
-      "profile": "Railroader Paved Road",
-      "style": "Road",
-      "points": [
-        {
-          "position": { "x": -28059.547, "y": 548.8, "z": -19863.178 },
-          "rotation": { "x": 0.0, "y": 123.451, "z": 0.0 },
-          "width": 10.0
-        },
-        {
-          "position": { "x": -27918.54, "y": 548.8, "z": -19956.334 },
-          "rotation": { "x": 0.0, "y": 123.451, "z": 0.0 },
-          "width": 10.0
-        },
-        {
-          "position": { "x": -27907.09, "y": 548.8, "z": -19992.262 },
-          "rotation": { "x": 0.0, "y": 221.451, "z": 0.0 },
-          "width": 20.0
-        }
-      ]
-    }
-  },
   "simpleGraphs": {},
   "mandelas": {}
 }
\ No newline at end of file
diff --git a/EMBPiggyBackAndrewsSylva/CaptiveService.json b/EMBPiggyBackAndrewsSylva/CaptiveService.json
index 6be221cc..654be97a 100644
--- a/EMBPiggyBackAndrewsSylva/CaptiveService.json
+++ b/EMBPiggyBackAndrewsSylva/CaptiveService.json
@@ -8,7 +8,7 @@
                     "components": {
                         "ALT1": {
                         "type": "Model.Ops.IndustryUnloader",
-                        "name": "Andrews Unloading Tracks",
+                        "name": "Andrews Piggyback Terminal Unloading Tracks",
                         "trackSpans": [ "EMB_ADW_PBT_L1", "EMB_ADW_PBT_L3" ],
                         "carTypeFilter": "PBF*",
                         "sharedStorage": true,
@@ -21,7 +21,7 @@
                         },
                         "ALT2": {
                         "type": "Model.Ops.IndustryLoader",
-                        "name": "Andrews Loading Tracks",
+                        "name": "Andrews Piggyback Terminal Loading Tracks",
                         "trackSpans": [ "EMB_ADW_PBT_U2", "EMB_ADW_PBT_U4" ],
                         "carTypeFilter": "PBF*",
                         "sharedStorage": false,
@@ -34,7 +34,7 @@
                         },
                         "SLT1": {
                         "type": "Model.Ops.IndustryUnloader",
-                        "name": "Sylva Unloading Tracks",
+                        "name": "Sylva Piggyback Terminal Unloading Tracks",
                         "trackSpans": [ "EMB_SVA_PBT_U2", "EMB_SVA_PBT_U3" ],
                         "carTypeFilter": "PBF*",
                         "sharedStorage": false,
@@ -47,7 +47,7 @@
                         },
                         "SLT2": {
                         "type": "Model.Ops.IndustryLoader",
-                        "name": "Sylva Loading Tracks",
+                        "name": "Sylva Piggyback Terminal Loading Tracks",
                         "trackSpans": [ "EMB_SVA_PBT_L1", "EMB_SVA_PBT_L4" ],
                         "carTypeFilter": "PBF*",
                         "sharedStorage": false,
diff --git a/EMBPiggyBackAndrewsSylva/Definition.json b/EMBPiggyBackAndrewsSylva/Definition.json
index e5c76502..d7306eed 100644
--- a/EMBPiggyBackAndrewsSylva/Definition.json
+++ b/EMBPiggyBackAndrewsSylva/Definition.json
@@ -2,7 +2,7 @@
   "manifestVersion": 5,
   "id": "Embedded.PiggyBackInd",
   "name": "Embeddeds Piggyback Andrews/Sylva Industries",
-  "version": "1.2.01",
+  "version": "1.5",
   "requires": [
     "Zamu.StrangeCustoms", "Embedded.PiggyBackBase"
   ],
diff --git a/EMBPiggyBackAndrewsSylva/SylvaIndustry.json b/EMBPiggyBackAndrewsSylva/SylvaIndustry.json
index eda2606d..3eaaa2a2 100644
--- a/EMBPiggyBackAndrewsSylva/SylvaIndustry.json
+++ b/EMBPiggyBackAndrewsSylva/SylvaIndustry.json
@@ -14,7 +14,7 @@
 							"inputTermsPerDay": {
 								"PiggyBack-Trailers": 2000000,
 								"boxcar-parts": 100000,
-								"boxcar-metal-stock": 200000,
+								"boxcar-metal-stock": 150000,
 								"boxcar-furniture": 15000
 							},
 							"outputTermsPerDay": {
@@ -23,7 +23,7 @@
 						},
 						"LT1": {
 							"type": "Model.Ops.IndustryUnloader",
-							"name": "Sylva Unloading Tracks",
+							"name": "Sylva Piggyback Terminal Unloading Tracks",
 							"trackSpans": [
 								"EMB_SVA_PBT_L1",
 								"EMB_SVA_PBT_L4"
@@ -34,12 +34,12 @@
 							"storageChangeRate": 0,
 							"maxStorage": 5000000,
 							"orderAroundEmpties": true,
-							"carTransferRate": 2000000,
+							"carTransferRate": 5000000,
 							"orderAroundLoaded": true
 						},
 						"LT2": {
 							"type": "Model.Ops.IndustryLoader",
-							"name": "Sylva Loading Tracks",
+							"name": "Sylva Piggyback Terminal Loading Tracks",
 							"trackSpans": [
 								"EMB_SVA_PBT_U2",
 								"EMB_SVA_PBT_U3"
@@ -50,12 +50,12 @@
 							"storageChangeRate": 0,
 							"maxStorage": 5000000,
 							"orderAroundEmpties": true,
-							"carTransferRate": 2000000,
+							"carTransferRate": 5000000,
 							"orderAroundLoaded": true
 						},
 						"BU1": {
 							"type": "Model.Ops.IndustryUnloader",
-							"name": "Sylva Boxcar Tracks",
+							"name": "Sylva Piggyback Terminal Boxcar Tracks",
 							"trackSpans": [
 								"EMB_SVA_BXP_U1"
 							],
@@ -70,7 +70,7 @@
 						},
 						"BU2": {
 							"type": "Model.Ops.IndustryUnloader",
-							"name": "Sylva Boxcar Tracks",
+							"name": "Sylva Piggyback Terminal Boxcar Tracks",
 							"trackSpans": [
 								"EMB_SVA_BXP_U1"
 							],
@@ -85,7 +85,7 @@
 						},
 						"BU3": {
 							"type": "Model.Ops.IndustryUnloader",
-							"name": "Sylva Boxcar Tracks",
+							"name": "Sylva Piggyback Terminal Boxcar Tracks",
 							"trackSpans": [
 								"EMB_SVA_BXP_U1"
 							],
@@ -102,6 +102,188 @@
 				}
 			}
 		}
+	},
+		"scenery": {
+		"EMB Object S1": {
+			"modelIdentifier": "EMBPBRamp2",
+			"position": { "x": 24425.890, "y": 618.519, "z": -700.013 },
+			"rotation": { "x": 0.000, "y": 235.193, "z": 0.000 },
+			"scale": { "x": 1.000, "y": 1.000, "z": 1.000 }
+		},
+		"EMB Object S2": {
+			"modelIdentifier": "EMBPBRamp2",
+			"position": { "x": 24383.860, "y": 618.519, "z": -648.691 },
+			"rotation": { "x": 0.000, "y": 220.193, "z": 0.000 },
+			"scale": { "x": 1.000, "y": 1.000, "z": 1.000 }
+		},
+		"EMB Object S3": {
+			"modelIdentifier": "EMBEndPlatform",
+			"position": { "x": 24383.004, "y": 618.100, "z": -787.358 },
+			"rotation": { "x": 0.000, "y": 266.193, "z": 0.000 },
+			"scale": { "x": 1.000, "y": 1.000, "z": 1.000 }
+		},
+		"EMB Object S4": {
+			"modelIdentifier": "EMBMidPlatform",
+			"position": { "x": 24407.950, "y": 618.100, "z": -785.698 },
+			"rotation": { "x": 0.000, "y": 86.193, "z": 0.000 },
+			"scale": { "x": 1.000, "y": 1.000, "z": 1.000 }
+		},
+		"EMB Object S5": {
+			"modelIdentifier": "EMBMidPlatform",
+			"position": { "x": 24432.894, "y": 618.100, "z": -784.038 },
+			"rotation": { "x": 0.000, "y": 86.193, "z": 0.000 },
+			"scale": { "x": 1.000, "y": 1.000, "z": 1.000 }
+		},
+		"EMB Object S6": {
+			"modelIdentifier": "EMBEndPlatform",
+			"position": { "x": 24457.838, "y": 618.100, "z": -782.379 },
+			"rotation": { "x": 0.000, "y": 86.193, "z": 0.000 },
+			"scale": { "x": 1.000, "y": 1.000, "z": 1.000 }
+		},
+		"EMB Object ST1": {
+			"modelIdentifier": "EMBPRR26PB",
+			"position": { "x": 24457.428, "y": 618.860, "z": -776.193 },
+			"rotation": { "x": 0.000, "y": 356.193, "z": 0.000 },
+			"scale": { "x": 1.000, "y": 1.000, "z": 1.000 }
+		},
+		"EMB Object ST2": {
+			"modelIdentifier": "EMBSP22PB",
+			"position": { "x": 24447.450, "y": 617.880, "z": -776.857 },
+			"rotation": { "x": 0.000, "y": 356.193, "z": 0.000 },
+			"scale": { "x": 1.000, "y": 1.000, "z": 1.000 }
+		},
+		"EMB Object ST3": {
+			"modelIdentifier": "EMBPRR26PB",
+			"position": { "x": 24444.456, "y": 618.870, "z": -777.055 },
+			"rotation": { "x": -0.600, "y": 356.193, "z": 0.000 },
+			"scale": { "x": 1.000, "y": 1.000, "z": 1.000 }
+		},
+		"EMB Object ST4": {
+			"modelIdentifier": "EMBATSF24PB",
+			"position": { "x": 24414.510, "y": 617.910, "z": -778.848 },
+			"rotation": { "x": -0.600, "y": 356.193, "z": 0.000 },
+			"scale": { "x": 1.000, "y": 1.000, "z": 1.000 }
+		},
+		"EMB Object ST5": {
+			"modelIdentifier": "EMBATSF24PB",
+			"position": { "x": 24394.554, "y": 617.910, "z": -780.176 },
+			"rotation": { "x": -0.600, "y": 356.193, "z": 0.000 },
+			"scale": { "x": 1.000, "y": 1.000, "z": 1.000 }
+		},
+		"EMB Object ST6": {
+			"modelIdentifier": "EMBSP22PB",
+			"position": { "x": 24384.597, "y": 617.870, "z": -781.140 },
+			"rotation": { "x": -0.400, "y": 356.193, "z": 0.000 },
+			"scale": { "x": 1.000, "y": 1.000, "z": 1.000 }
+		}
+	},
+	"splineys": {
+		"EMB Bridge S1": {
+			"handler": "StrangeCustoms.AutoTrestleBuilder",
+			"points": [
+				{
+					"position": { "x": 24125.002, "y": 617.772, "z": -840.093 },
+					"rotation": { "x": 0.000, "y": 50.193, "z": 0.000 }
+				},
+				{
+					"position": { "x": 24039.785, "y": 617.502, "z": -907.428 },
+					"rotation": { "x": -0.499, "y": 66.184, "z": -0.009 }
+				}
+			],
+			"headstyle": "bent",
+			"tailstyle": "bent"
+		},
+		"EMB Road S1": {
+			"handler": "StrangeCustoms.FlowyThingBuilder",
+			"profile": "Railroader Paved Road",
+			"style": "Road",
+			"points": [
+				{
+					"position": { "x": 24376.520, "y": 617.872, "z": -657.374 },
+					"rotation": { "x": 0.000, "y": 40.193, "z": 0.000 },
+					"width": 10.000
+				},
+				{
+					"position": { "x": 24388.783, "y": 617.872, "z": -642.860 },
+					"rotation": { "x": 0.000, "y": 40.193, "z": 0.000 },
+					"width": 34.000
+				},
+				{
+					"position": { "x": 24400.367, "y": 617.872, "z": -629.151 },
+					"rotation": { "x": 0.000, "y": 40.193, "z": 0.000 },
+					"width": 34.000
+				},
+				{
+					"position": { "x": 24452.775, "y": 617.872, "z": -638.954 },
+					"rotation": { "x": 0.000, "y": 160.193, "z": 0.000 },
+					"width": 29.000
+				},
+				{
+					"position": { "x": 24474.273, "y": 617.872, "z": -704.549 },
+					"rotation": { "x": 0.000, "y": 160.193, "z": 0.000 },
+					"width": 29.000
+				},
+				{
+					"position": { "x": 24519.011, "y": 618.072, "z": -746.900 },
+					"rotation": { "x": 0.000, "y": 105.193, "z": 0.000 },
+					"width": 24.000
+				},
+				{
+					"position": { "x": 24574.018, "y": 619.372, "z": -761.839 },
+					"rotation": { "x": -1.000, "y": 104.193, "z": 0.000 },
+					"width": 14.000
+				},
+				{
+					"position": { "x": 24608.071, "y": 620.452, "z": -774.306 },
+					"rotation": { "x": 0.000, "y": 119.193, "z": -1.000 },
+					"width": 6.800
+				}
+			]
+		},
+		"EMB Road S2": {
+			"handler": "StrangeCustoms.FlowyThingBuilder",
+			"profile": "Railroader Paved Road",
+			"style": "Road",
+			"points": [
+				{
+					"position": { "x": 24416.553, "y": 617.872, "z": -706.502 },
+					"rotation": { "x": 0.000, "y": 55.193, "z": 0.000 },
+					"width": 10.000
+				},
+				{
+					"position": { "x": 24430.818, "y": 617.872, "z": -696.587 },
+					"rotation": { "x": 0.000, "y": 55.193, "z": 0.000 },
+					"width": 29.000
+				},
+				{
+					"position": { "x": 24453.148, "y": 617.872, "z": -685.950 },
+					"rotation": { "x": 1.000, "y": 72.693, "z": 0.000 },
+					"width": 35.000
+				}
+			]
+		},
+		"EMB Road S3": {
+			"handler": "StrangeCustoms.FlowyThingBuilder",
+			"profile": "Railroader Paved Road",
+			"style": "Road",
+			"points": [
+				{
+					"position": { "x": 24357.685, "y": 617.872, "z": -774.419 },
+					"rotation": { "x": 0.000, "y": 86.193, "z": 0.000 },
+					"width": 25.000
+				},
+				{
+					"position": { "x": 24470.164, "y": 617.872, "z": -766.847 },
+					"rotation": { "x": 0.000, "y": 86.193, "z": 0.000 },
+					"width": 25.000
+				},
+				{
+					"position": { "x": 24500.321, "y": 617.972, "z": -748.670 },
+					"rotation": { "x": 0.000, "y": 21.193, "z": 0.000 },
+					"width": 25.000
+				}
+			]
+		}
 	},
 	"loads": {
 	},
@@ -698,188 +880,6 @@
 			}
 		}
 	},
-	"scenery": {
-		"EMB Object S1": {
-			"modelIdentifier": "EMBPBRamp2",
-			"position": { "x": 24425.890, "y": 618.519, "z": -700.013 },
-			"rotation": { "x": 0.000, "y": 235.193, "z": 0.000 },
-			"scale": { "x": 1.000, "y": 1.000, "z": 1.000 }
-		},
-		"EMB Object S2": {
-			"modelIdentifier": "EMBPBRamp2",
-			"position": { "x": 24383.860, "y": 618.519, "z": -648.691 },
-			"rotation": { "x": 0.000, "y": 220.193, "z": 0.000 },
-			"scale": { "x": 1.000, "y": 1.000, "z": 1.000 }
-		},
-		"EMB Object S3": {
-			"modelIdentifier": "EMBEndPlatform",
-			"position": { "x": 24383.004, "y": 618.100, "z": -787.358 },
-			"rotation": { "x": 0.000, "y": 266.193, "z": 0.000 },
-			"scale": { "x": 1.000, "y": 1.000, "z": 1.000 }
-		},
-		"EMB Object S4": {
-			"modelIdentifier": "EMBMidPlatform",
-			"position": { "x": 24407.950, "y": 618.100, "z": -785.698 },
-			"rotation": { "x": 0.000, "y": 86.193, "z": 0.000 },
-			"scale": { "x": 1.000, "y": 1.000, "z": 1.000 }
-		},
-		"EMB Object S5": {
-			"modelIdentifier": "EMBMidPlatform",
-			"position": { "x": 24432.894, "y": 618.100, "z": -784.038 },
-			"rotation": { "x": 0.000, "y": 86.193, "z": 0.000 },
-			"scale": { "x": 1.000, "y": 1.000, "z": 1.000 }
-		},
-		"EMB Object S6": {
-			"modelIdentifier": "EMBEndPlatform",
-			"position": { "x": 24457.838, "y": 618.100, "z": -782.379 },
-			"rotation": { "x": 0.000, "y": 86.193, "z": 0.000 },
-			"scale": { "x": 1.000, "y": 1.000, "z": 1.000 }
-		},
-		"EMB Object ST1": {
-			"modelIdentifier": "EMBPRR26PB",
-			"position": { "x": 24457.428, "y": 618.860, "z": -776.193 },
-			"rotation": { "x": 0.000, "y": 356.193, "z": 0.000 },
-			"scale": { "x": 1.000, "y": 1.000, "z": 1.000 }
-		},
-		"EMB Object ST2": {
-			"modelIdentifier": "EMBSP22PB",
-			"position": { "x": 24447.450, "y": 617.880, "z": -776.857 },
-			"rotation": { "x": 0.000, "y": 356.193, "z": 0.000 },
-			"scale": { "x": 1.000, "y": 1.000, "z": 1.000 }
-		},
-		"EMB Object ST3": {
-			"modelIdentifier": "EMBPRR26PB",
-			"position": { "x": 24444.456, "y": 618.870, "z": -777.055 },
-			"rotation": { "x": -0.600, "y": 356.193, "z": 0.000 },
-			"scale": { "x": 1.000, "y": 1.000, "z": 1.000 }
-		},
-		"EMB Object ST4": {
-			"modelIdentifier": "EMBATSF24PB",
-			"position": { "x": 24414.510, "y": 617.910, "z": -778.848 },
-			"rotation": { "x": -0.600, "y": 356.193, "z": 0.000 },
-			"scale": { "x": 1.000, "y": 1.000, "z": 1.000 }
-		},
-		"EMB Object ST5": {
-			"modelIdentifier": "EMBATSF24PB",
-			"position": { "x": 24394.554, "y": 617.910, "z": -780.176 },
-			"rotation": { "x": -0.600, "y": 356.193, "z": 0.000 },
-			"scale": { "x": 1.000, "y": 1.000, "z": 1.000 }
-		},
-		"EMB Object ST6": {
-			"modelIdentifier": "EMBSP22PB",
-			"position": { "x": 24384.597, "y": 617.870, "z": -781.140 },
-			"rotation": { "x": -0.400, "y": 356.193, "z": 0.000 },
-			"scale": { "x": 1.000, "y": 1.000, "z": 1.000 }
-		}
-	},
-	"splineys": {
-		"EMB Bridge S1": {
-			"handler": "StrangeCustoms.AutoTrestleBuilder",
-			"points": [
-				{
-					"position": { "x": 24125.002, "y": 617.772, "z": -840.093 },
-					"rotation": { "x": 0.000, "y": 50.193, "z": 0.000 }
-				},
-				{
-					"position": { "x": 24039.785, "y": 617.502, "z": -907.428 },
-					"rotation": { "x": -0.499, "y": 66.184, "z": -0.009 }
-				}
-			],
-			"headstyle": "bent",
-			"tailstyle": "bent"
-		},
-		"EMB Road S1": {
-			"handler": "StrangeCustoms.FlowyThingBuilder",
-			"profile": "Railroader Paved Road",
-			"style": "Road",
-			"points": [
-				{
-					"position": { "x": 24376.520, "y": 617.872, "z": -657.374 },
-					"rotation": { "x": 0.000, "y": 40.193, "z": 0.000 },
-					"width": 10.000
-				},
-				{
-					"position": { "x": 24388.783, "y": 617.872, "z": -642.860 },
-					"rotation": { "x": 0.000, "y": 40.193, "z": 0.000 },
-					"width": 34.000
-				},
-				{
-					"position": { "x": 24400.367, "y": 617.872, "z": -629.151 },
-					"rotation": { "x": 0.000, "y": 40.193, "z": 0.000 },
-					"width": 34.000
-				},
-				{
-					"position": { "x": 24452.775, "y": 617.872, "z": -638.954 },
-					"rotation": { "x": 0.000, "y": 160.193, "z": 0.000 },
-					"width": 29.000
-				},
-				{
-					"position": { "x": 24474.273, "y": 617.872, "z": -704.549 },
-					"rotation": { "x": 0.000, "y": 160.193, "z": 0.000 },
-					"width": 29.000
-				},
-				{
-					"position": { "x": 24519.011, "y": 618.072, "z": -746.900 },
-					"rotation": { "x": 0.000, "y": 105.193, "z": 0.000 },
-					"width": 24.000
-				},
-				{
-					"position": { "x": 24574.018, "y": 619.372, "z": -761.839 },
-					"rotation": { "x": -1.000, "y": 104.193, "z": 0.000 },
-					"width": 14.000
-				},
-				{
-					"position": { "x": 24608.071, "y": 620.452, "z": -774.306 },
-					"rotation": { "x": 0.000, "y": 119.193, "z": -1.000 },
-					"width": 6.800
-				}
-			]
-		},
-		"EMB Road S2": {
-			"handler": "StrangeCustoms.FlowyThingBuilder",
-			"profile": "Railroader Paved Road",
-			"style": "Road",
-			"points": [
-				{
-					"position": { "x": 24416.553, "y": 617.872, "z": -706.502 },
-					"rotation": { "x": 0.000, "y": 55.193, "z": 0.000 },
-					"width": 10.000
-				},
-				{
-					"position": { "x": 24430.818, "y": 617.872, "z": -696.587 },
-					"rotation": { "x": 0.000, "y": 55.193, "z": 0.000 },
-					"width": 29.000
-				},
-				{
-					"position": { "x": 24453.148, "y": 617.872, "z": -685.950 },
-					"rotation": { "x": 1.000, "y": 72.693, "z": 0.000 },
-					"width": 35.000
-				}
-			]
-		},
-		"EMB Road S3": {
-			"handler": "StrangeCustoms.FlowyThingBuilder",
-			"profile": "Railroader Paved Road",
-			"style": "Road",
-			"points": [
-				{
-					"position": { "x": 24357.685, "y": 617.872, "z": -774.419 },
-					"rotation": { "x": 0.000, "y": 86.193, "z": 0.000 },
-					"width": 25.000
-				},
-				{
-					"position": { "x": 24470.164, "y": 617.872, "z": -766.847 },
-					"rotation": { "x": 0.000, "y": 86.193, "z": 0.000 },
-					"width": 25.000
-				},
-				{
-					"position": { "x": 24500.321, "y": 617.972, "z": -748.670 },
-					"rotation": { "x": 0.000, "y": 21.193, "z": 0.000 },
-					"width": 25.000
-				}
-			]
-		}
-	},
 	"simpleGraphs": {},
 	"mandelas": {
 	}
diff --git a/EMBPiggyBackBase/Definition.json b/EMBPiggyBackBase/Definition.json
index daaf2c93..9d4efa9f 100644
--- a/EMBPiggyBackBase/Definition.json
+++ b/EMBPiggyBackBase/Definition.json
@@ -1,37 +1,14 @@
 {
   "manifestVersion": 5,
   "id": "Embedded.PiggyBackBase",
-  "name": "Embeddeds Piggyback Bryson Industry and trailers",
-  "version": "1.2.1",
+  "name": "Embeddeds Piggyback trailers and LoadID",
+  "version": "1.5",
   "requires": [
     "Zamu.StrangeCustoms"
   ],
-  "loadAfter": [
-      { "id": "BrysonLoopV1.0" },
-      { "id": "ForTheIronyOfIt" },
-      { "id": "Rinzler.BrysonWYEInterchange"},
-      { "id": "CF.BrysonAdditons" }
-  ],
   "mixintos": {
     "game-graph": [
-      "file(PBLoadID.json)",
-      "file(BrysonIndustry.json)",
-      {
-        "mixinto": "file(Loopmigration.json)",
-        "requires": [ { "id": "BrysonLoopV1.0"} ]
-      },
-      {
-        "mixinto": "file(FTIOImigration.json)",
-        "requires": [ { "id": "ForTheIronyOfIt" } ]
-      },
-      {
-        "mixinto": "file(MainMigration.json)",
-        "requires": [ { "id": "Rinzler.BrysonWYEInterchange"}]
-      },
-      {
-        "mixinto": "file(Loop-Ironymigration.json)",
-        "requires": [ { "id": "BrysonLoopV1.0"}, { "id": "ForTheIronyOfIt" } ]
-      }
+      "file(PBLoadID.json)"
     ],
     "container:fm-flatcar01": ["file(PiggyBack1.json)", "file(PiggyBack2.json)", "file(PiggyBack3.json)"]
   }
diff --git a/EMBPiggyBackBase/PBLoadID.json b/EMBPiggyBackBase/PBLoadID.json
index 3aad67dd..339f7f3f 100644
--- a/EMBPiggyBackBase/PBLoadID.json
+++ b/EMBPiggyBackBase/PBLoadID.json
@@ -4,7 +4,7 @@
       "description": "PiggyBack-Trailers",
       "units": "Pounds",
       "density": 62.4,
-      "unitWeightInPounds": 0.0,
+      "unitWeightInPounds": 30.0,
       "importable": true,
       "payPerQuantity": 0.00495,
       "costPerUnit": 0.0
diff --git a/EMBPiggyBackBase/PiggyBack1.json b/EMBPiggyBackBase/PiggyBack1.json
index 0218836b..d48a2e47 100644
--- a/EMBPiggyBackBase/PiggyBack1.json
+++ b/EMBPiggyBackBase/PiggyBack1.json
@@ -16,6 +16,7 @@
             "definition": {
                 "carType": "PBF",
                 "basePrice": 1150,
+                "weightEmpty": 58000,
                 "loadSlots": [
     {
         "$find": [
@@ -24,7 +25,7 @@
                 "value": "Pounds"
                 }
             ],
-            "maximumCapacity": 28000.0,
+            "maximumCapacity": 100000.0,
             "loadUnits": "Pounds",
             "requiredLoadIdentifier": ""
         
diff --git a/EMBPiggyBackBase/PiggyBack2.json b/EMBPiggyBackBase/PiggyBack2.json
index 9399644c..23a77e83 100644
--- a/EMBPiggyBackBase/PiggyBack2.json
+++ b/EMBPiggyBackBase/PiggyBack2.json
@@ -16,6 +16,7 @@
             "definition": {
                 "carType": "PBF",
                 "basePrice": 1150,
+                "weightEmpty": 58000,
                 "loadSlots": [
     {
         "$find": [
@@ -24,7 +25,7 @@
                 "value": "Pounds"
                 }
             ],
-            "maximumCapacity": 28000.0,
+            "maximumCapacity": 100000.0,
             "loadUnits": "Pounds",
             "requiredLoadIdentifier": ""
         
diff --git a/EMBPiggyBackBase/PiggyBack3.json b/EMBPiggyBackBase/PiggyBack3.json
index 6269e3c1..7fdb5330 100644
--- a/EMBPiggyBackBase/PiggyBack3.json
+++ b/EMBPiggyBackBase/PiggyBack3.json
@@ -16,6 +16,7 @@
             "definition": {
                 "carType": "PBF",
                 "basePrice": 1150,
+                "weightEmpty": 58000,
                 "loadSlots": [
     {
         "$find": [
@@ -24,7 +25,7 @@
                 "value": "Pounds"
                 }
             ],
-            "maximumCapacity": 28000.0,
+            "maximumCapacity": 100000.0,
             "loadUnits": "Pounds",
             "requiredLoadIdentifier": ""
         
diff --git a/EMBPiggyBackBase/SCAssetPacks/PiggyBackAssets/Bundle b/EMBPiggyBackBase/SCAssetPacks/PiggyBackAssets/Bundle
index fe980b00..cb5aafb5 100644
--- a/EMBPiggyBackBase/SCAssetPacks/PiggyBackAssets/Bundle
+++ b/EMBPiggyBackBase/SCAssetPacks/PiggyBackAssets/Bundle
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e5b54f4c023b50b9e2a1ec34308553f65bd241861543e0011631281b586ca612
-size 137449881
+oid sha256:e92f8883b10820de9fe494309fc52ae18151facf5c8c154eb81d2f848e19ca22
+size 90738517
diff --git a/EMBPiggyBackBase/SCAssetPacks/PiggyBackAssets/Catalog.json b/EMBPiggyBackBase/SCAssetPacks/PiggyBackAssets/Catalog.json
index 6d6bf900..48958f46 100644
--- a/EMBPiggyBackBase/SCAssetPacks/PiggyBackAssets/Catalog.json
+++ b/EMBPiggyBackBase/SCAssetPacks/PiggyBackAssets/Catalog.json
@@ -1 +1 @@
-{"identifier":"PRRPiggyBack","name":"PRRPiggyBack","shared":false,"assets":{"EMBPBSupports":{"name":"EMBPBSupports","type":"prefab","filename":"EMBPBSupports.prefab"},"EMBSPStands":{"name":"EMBSPStands","type":"prefab","filename":"EMBSPStands.prefab"},"EMBATSFStands":{"name":"EMBATSFStands","type":"prefab","filename":"EMBATSFStands.prefab"},"EMBPRRStands":{"name":"EMBPRRStands","type":"prefab","filename":"EMBPRRStands.prefab"},"EMBSP22PB":{"name":"EMBSP22PB","type":"prefab","filename":"EMBSP22PB.prefab"},"EMBPRR26PB":{"name":"EMBPRR26PB","type":"prefab","filename":"EMBPRR26PB.prefab"},"EMBATSF24PB":{"name":"EMBATSF24PB","type":"prefab","filename":"EMBATSF24PB.prefab"},"EMB10MPlatform":{"name":"EMB10MPlatform","type":"prefab","filename":"EMB10MPlatform.prefab"},"EMBEndPlatform":{"name":"EMBEndPlatform","type":"prefab","filename":"EMBEndPlatform.prefab"},"EMBMidPlatform":{"name":"EMBMidPlatform","type":"prefab","filename":"EMBMidPlatform.prefab"},"EMBPBRamp3":{"name":"EMBPBRamp3","type":"prefab","filename":"EMBPBRamp3.prefab"},"EMBPBRamp2":{"name":"EMBPBRamp2","type":"prefab","filename":"EMBPBRamp2.prefab"},"EMBPBRamp1":{"name":"EMBPBRamp1","type":"prefab","filename":"EMBPBRamp1.prefab"}}}
\ No newline at end of file
+{"identifier":"PiggyBackAssets","name":"PiggyBackAssets","shared":false,"assets":{"EMBPBSupports":{"name":"EMBPBSupports","type":"prefab","filename":"EMBPBSupports.prefab"},"EMBSPStands":{"name":"EMBSPStands","type":"prefab","filename":"EMBSPStands.prefab"},"EMBPRRStands":{"name":"EMBPRRStands","type":"prefab","filename":"EMBPRRStands.prefab"},"EMBATSFStands":{"name":"EMBATSFStands","type":"prefab","filename":"EMBATSFStands.prefab"},"EMBSP22PB":{"name":"EMBSP22PB","type":"prefab","filename":"EMBSP22PB.prefab"},"EMBPRR26PB":{"name":"EMBPRR26PB","type":"prefab","filename":"EMBPRR26PB.prefab"},"EMB10MPlatform":{"name":"EMB10MPlatform","type":"prefab","filename":"EMB10MPlatform.prefab"},"EMBEndPlatform":{"name":"EMBEndPlatform","type":"prefab","filename":"EMBEndPlatform.prefab"},"EMBMidPlatform":{"name":"EMBMidPlatform","type":"prefab","filename":"EMBMidPlatform.prefab"},"EMBPBRamp3":{"name":"EMBPBRamp3","type":"prefab","filename":"EMBPBRamp3.prefab"},"EMBPBRamp2":{"name":"EMBPBRamp2","type":"prefab","filename":"EMBPBRamp2.prefab"},"EMBPBRamp1":{"name":"EMBPBRamp1","type":"prefab","filename":"EMBPBRamp1.prefab"},"EMBATSF24PB":{"name":"EMBATSF24PB","type":"prefab","filename":"EMBATSF24PB.prefab"}}}
\ No newline at end of file
diff --git a/EMBPiggyBackBase/BrysonIndustry.json b/EMBPiggyBackBryson/BrysonIndustry.json
similarity index 95%
rename from EMBPiggyBackBase/BrysonIndustry.json
rename to EMBPiggyBackBryson/BrysonIndustry.json
index 57a01bba..a3fe4d6c 100644
--- a/EMBPiggyBackBase/BrysonIndustry.json
+++ b/EMBPiggyBackBryson/BrysonIndustry.json
@@ -1,4 +1,92 @@
 {
+	"areas": {
+		"bryson": {
+			"industries": {
+				"Bryson-Piggyback-Service": {
+					"name": "Bryson Piggyback Terminal",
+					"usesContract": true,
+					"components": {
+						"formula": {
+							"type": "Model.Ops.FormulaicIndustryComponent",
+							"name": "Bryson Piggyback Terminal",
+							"carTypeFilter": "",
+							"sharedStorage": true,
+							"inputTermsPerDay": {
+								"PiggyBack-Trailers": 3000000,
+								"boxcar-parts": 25000,
+								"boxcar-furniture": 7500
+							},
+							"outputTermsPerDay": {
+								"PiggyBack-Trailers": 1500000
+							}
+						},
+						"LT1": {
+							"type": "Model.Ops.IndustryUnloader",
+							"name": "Bryson Piggyback Terminal Unloading Tracks",
+							"trackSpans": [
+								"EMB_BSN_PBT_T1",
+								"EMB_BSN_PBT_T3"
+							],
+							"carTypeFilter": "PBF*",
+							"sharedStorage": true,
+							"loadId": "PiggyBack-Trailers",
+							"storageChangeRate": 0,
+							"maxStorage": 3000000,
+							"orderAroundEmpties": true,
+							"carTransferRate": 5000000,
+							"orderAroundLoaded": true
+						},
+						"LT2": {
+							"type": "Model.Ops.IndustryLoader",
+							"name": "Bryson Piggyback Terminal Loading Tracks",
+							"trackSpans": [
+								"EMB_BSN_PBT_T2",
+								"EMB_BSN_PBT_T3"
+							],
+							"carTypeFilter": "PBF*",
+							"sharedStorage": true,
+							"loadId": "PiggyBack-Trailers",
+							"storageChangeRate": 0,
+							"maxStorage": 1500000,
+							"orderAroundEmpties": true,
+							"carTransferRate": 5000000,
+							"orderAroundLoaded": true
+						},
+						"BU1": {
+							"type": "Model.Ops.IndustryUnloader",
+							"name": "Bryson Piggyback Terminal Boxcar Track",
+							"trackSpans": [
+								"EMB_BSN_BXP_T1"
+							],
+							"carTypeFilter": "XM",
+							"sharedStorage": true,
+							"loadId": "boxcar-parts",
+							"storageChangeRate": 0,
+							"maxStorage": 100000,
+							"orderAroundEmpties": true,
+							"carTransferRate": 25000,
+							"orderAroundLoaded": true
+						},
+						"BU2": {
+							"type": "Model.Ops.IndustryUnloader",
+							"name": "Bryson Piggyback Terminal Boxcar Track",
+							"trackSpans": [
+								"EMB_BSN_BXP_T1"
+							],
+							"carTypeFilter": "XM",
+							"sharedStorage": true,
+							"loadId": "boxcar-furniture",
+							"storageChangeRate": 0,
+							"maxStorage": 350000,
+							"orderAroundEmpties": true,
+							"carTransferRate": 70000,
+							"orderAroundLoaded": true
+						}
+					}
+				}
+			}
+		}
+	},
 	"tracks": {
 		"nodes": {
 			"EMB_Node_ylmh": {
@@ -507,94 +595,6 @@
 			}
 		}
 	},
-	"areas": {
-		"bryson": {
-			"industries": {
-				"Bryson-Piggyback-Service": {
-					"name": "Bryson Piggyback Terminal",
-					"usesContract": true,
-					"components": {
-						"formula": {
-							"type": "Model.Ops.FormulaicIndustryComponent",
-							"name": "Bryson Piggyback Terminal",
-							"carTypeFilter": "",
-							"sharedStorage": true,
-							"inputTermsPerDay": {
-								"PiggyBack-Trailers": 1700000,
-								"boxcar-parts": 50000,
-								"boxcar-furniture": 7500
-							},
-							"outputTermsPerDay": {
-								"PiggyBack-Trailers": 1700000
-							}
-						},
-						"LT1": {
-							"type": "Model.Ops.IndustryUnloader",
-							"name": "Bryson Piggyback Terminal Unloading Tracks",
-							"trackSpans": [
-								"EMB_BSN_PBT_T1",
-								"EMB_BSN_PBT_T3"
-							],
-							"carTypeFilter": "PBF*",
-							"sharedStorage": true,
-							"loadId": "PiggyBack-Trailers",
-							"storageChangeRate": 0,
-							"maxStorage": 3500000,
-							"orderAroundEmpties": true,
-							"carTransferRate": 2000000,
-							"orderAroundLoaded": true
-						},
-						"LT2": {
-							"type": "Model.Ops.IndustryLoader",
-							"name": "Bryson Piggyback Terminal Loading Tracks",
-							"trackSpans": [
-								"EMB_BSN_PBT_T2",
-								"EMB_BSN_PBT_T3"
-							],
-							"carTypeFilter": "PBF*",
-							"sharedStorage": true,
-							"loadId": "PiggyBack-Trailers",
-							"storageChangeRate": 0,
-							"maxStorage": 3500000,
-							"orderAroundEmpties": true,
-							"carTransferRate": 2000000,
-							"orderAroundLoaded": true
-						},
-						"BU1": {
-							"type": "Model.Ops.IndustryUnloader",
-							"name": "Bryson Piggyback Terminal Boxcar Track",
-							"trackSpans": [
-								"EMB_BSN_BXP_T1"
-							],
-							"carTypeFilter": "XM",
-							"sharedStorage": true,
-							"loadId": "boxcar-parts",
-							"storageChangeRate": 0,
-							"maxStorage": 100000,
-							"orderAroundEmpties": true,
-							"carTransferRate": 25000,
-							"orderAroundLoaded": true
-						},
-						"BU2": {
-							"type": "Model.Ops.IndustryUnloader",
-							"name": "Bryson Piggyback Terminal Boxcar Track",
-							"trackSpans": [
-								"EMB_BSN_BXP_T1"
-							],
-							"carTypeFilter": "XM",
-							"sharedStorage": true,
-							"loadId": "boxcar-furniture",
-							"storageChangeRate": 0,
-							"maxStorage": 350000,
-							"orderAroundEmpties": true,
-							"carTransferRate": 70000,
-							"orderAroundLoaded": true
-						}
-					}
-				}
-			}
-		}
-	},
 	"loads": {
 	},
 	"texts": {
diff --git a/EMBPiggyBackBryson/Definition.json b/EMBPiggyBackBryson/Definition.json
new file mode 100644
index 00000000..bf967f61
--- /dev/null
+++ b/EMBPiggyBackBryson/Definition.json
@@ -0,0 +1,37 @@
+{
+  "manifestVersion": 5,
+  "id": "Embedded.PiggyBackBryson",
+  "name": "Embeddeds Piggyback Bryson Industry and trailers",
+  "version": "1.5",
+  "requires": [
+    "Zamu.StrangeCustoms", "Embedded.PiggyBackBase"
+  ],
+  "loadAfter": [
+      { "id": "Embedded.PiggyBackBase"},
+      { "id": "BrysonLoopV1.0" },
+      { "id": "ForTheIronyOfIt" },
+      { "id": "Rinzler.BrysonWYEInterchange"},
+      { "id": "CF.BrysonAdditons" }
+  ],
+  "mixintos": {
+    "game-graph": [
+      "file(BrysonIndustry.json)",
+      {
+        "mixinto": "file(Loopmigration.json)",
+        "requires": [ { "id": "BrysonLoopV1.0"} ]
+      },
+      {
+        "mixinto": "file(FTIOImigration.json)",
+        "requires": [ { "id": "ForTheIronyOfIt" } ]
+      },
+      {
+        "mixinto": "file(MainMigration.json)",
+        "requires": [ { "id": "Rinzler.BrysonWYEInterchange"}]
+      },
+      {
+        "mixinto": "file(Loop-Ironymigration.json)",
+        "requires": [ { "id": "BrysonLoopV1.0"}, { "id": "ForTheIronyOfIt" } ]
+      }
+    ]
+  }
+}
diff --git a/EMBPiggyBackBase/FTIOImigration.json b/EMBPiggyBackBryson/FTIOImigration.json
similarity index 100%
rename from EMBPiggyBackBase/FTIOImigration.json
rename to EMBPiggyBackBryson/FTIOImigration.json
diff --git a/EMBPiggyBackBase/Loop-Ironymigration.json b/EMBPiggyBackBryson/Loop-Ironymigration.json
similarity index 100%
rename from EMBPiggyBackBase/Loop-Ironymigration.json
rename to EMBPiggyBackBryson/Loop-Ironymigration.json
diff --git a/EMBPiggyBackBase/Loopmigration.json b/EMBPiggyBackBryson/Loopmigration.json
similarity index 100%
rename from EMBPiggyBackBase/Loopmigration.json
rename to EMBPiggyBackBryson/Loopmigration.json
diff --git a/EMBPiggyBackBase/MainMigration.json b/EMBPiggyBackBryson/MainMigration.json
similarity index 100%
rename from EMBPiggyBackBase/MainMigration.json
rename to EMBPiggyBackBryson/MainMigration.json