diff --git a/packages/valve/geometry/items/track_plat/editoritems.txt b/packages/valve/geometry/items/track_plat/editoritems.txt
index d9f230030a..e9c20067ba 100644
--- a/packages/valve/geometry/items/track_plat/editoritems.txt
+++ b/packages/valve/geometry/items/track_plat/editoritems.txt
@@ -171,6 +171,11 @@
 			"DefaultValue"		"1"
 			"Index"				"6"
 			}
+		"AutoDrop"
+			{
+			"DefaultValue"		"0"
+			"Index"				"7"
+			}
 		}
 	"Exporting"
 		{
@@ -232,7 +237,11 @@
 			{
 			"BEE2"
 				{
-				"Force" "Input"
+				"Type"          "AND"
+				"SpawnFire"     "always"
+				"invertVar"     "$start_active"
+				"Enable_Cmd"    "platform,TurnOn,,0.00,-1"
+				"Disable_Cmd"   "platform,TurnOff,,0.00,-1"
 				}
 			}
 		"Offset"		"64 64 64"
diff --git a/packages/valve/geometry/items/track_plat/vbsp_config.cfg b/packages/valve/geometry/items/track_plat/vbsp_config.cfg
index 22832114cd..ddc21af173 100644
--- a/packages/valve/geometry/items/track_plat/vbsp_config.cfg
+++ b/packages/valve/geometry/items/track_plat/vbsp_config.cfg
@@ -110,30 +110,31 @@
 		"instance" "<ITEM_RAIL_PLATFORM>"
 		"Condition"
 			{
-			"instance" "<ITEM_RAIL_PLATFORM:track_platform_oscillate>"
+			"instance" "<ITEM_RAIL_PLATFORM:track_platform>"
 			"Result"
 				{
-				"ChangeIOType"
-					{
-					"Type"          "AND"
-					"SpawnFire"     "always"
-					"invertVar"     "$start_active"
-					"Enable_Cmd"    "move_rl,Trigger,,0.00,-1"
-					"Disable_Cmd"   "move_rl,FireUser1,,0.00,-1"
-					}
+				// Never starts active.
+				"SetInstVar" "$start_active 0"
 				}
 			}
 		"Condition"
 			{
-			"instance" "<ITEM_RAIL_PLATFORM:track_platform>"
+			"instance" "<ITEM_RAIL_PLATFORM:track_platforms>"
+			// If autodrop is set, player presence is required.
+			"InstVar" "$disable_autodrop == 1"
 			"Result"
 				{
-				"ChangeIOType"
+				// This adds an item with a virtual input to the platform,
+				// giving us exactly the behaviour we want.
+				"AttachInputOverlay" 
 					{
-					"Type"          "AND"
-					"invertVar"     "0"
-					"Enable_Cmd"    "track_lift_movelinear,FireUser2,,0.00,-1"
-					"Disable_Cmd"   "track_lift_movelinear,FireUser1,,0.00,-1"
+					"File" "instances/BEE2/clean/items/track/trigger.vmf"
+					"name_suffix" "player"
+					"input_conf"
+						{
+						"Out_Activate" "instance:trigger;OnStartTouch"
+						"Out_Deactivate" "instance:trigger;OnEndTouchAll"
+						}
 					}
 				}
 			}
@@ -167,10 +168,7 @@
 			"instance" "<ITEM_RAIL_PLATFORM:track_top>"
 			"Result"
 				{
-				"TemplateBrush"
-					{
-					"ID" "BEE2_TRACK_PLAT_TOP"
-					}
+				"TemplateBrush" "BEE2_TRACK_PLAT_TOP"
 				}
 			}
 		"Condition"
@@ -178,10 +176,7 @@
 			"instance" "<ITEM_RAIL_PLATFORM:track_bottom>"
 			"Result"
 				{
-				"TemplateBrush"
-					{
-					"ID" "BEE2_TRACK_PLAT_BOTTOM"
-					}
+				"TemplateBrush" "BEE2_TRACK_PLAT_BOTTOM"
 				}
 			}
 		"Condition"
@@ -189,10 +184,7 @@
 			"instance" "<ITEM_RAIL_PLATFORM:track_middle>"
 			"Result"
 				{
-				"TemplateBrush"
-					{
-					"ID" "BEE2_TRACK_PLAT_MIDDLE"
-					}
+				"TemplateBrush" "BEE2_TRACK_PLAT_MIDDLE"
 				}
 			}
 		"Condition"
@@ -200,10 +192,7 @@
 			"instance" "<ITEM_RAIL_PLATFORM:track_single>"
 			"Result"
 				{
-				"TemplateBrush"
-					{
-					"ID" "BEE2_TRACK_PLAT_SINGLE"
-					}
+				"TemplateBrush" "BEE2_TRACK_PLAT_SINGLE"
 				}
 			}
 		}
diff --git a/packages/valve/geometry/resources/instances/clean/items/track/platform.vmf b/packages/valve/geometry/resources/instances/clean/items/track/platform.vmf
index 57c32731ae..326f47b7b9 100644
--- a/packages/valve/geometry/resources/instances/clean/items/track/platform.vmf
+++ b/packages/valve/geometry/resources/instances/clean/items/track/platform.vmf
@@ -1,8 +1,8 @@
 versioninfo
 {
 	"editorversion" "400"
-	"editorbuild" "8419"
-	"mapversion" "125"
+	"editorbuild" "9672"
+	"mapversion" "127"
 	"formatversion" "100"
 	"prefab" "0"
 }
@@ -20,7 +20,7 @@ viewsettings
 world
 {
 	"id" "1"
-	"mapversion" "125"
+	"mapversion" "127"
 	"classname" "worldspawn"
 	"detailmaterial" "detail/detailsprites"
 	"detailvbsp" "detail.vbsp"
@@ -29,14 +29,44 @@ world
 	"skyname" "sky_black_nofog"
 }
 entity
+{
+	"id" "2035"
+	"classname" "comp_relay"
+	"ctrl_type" "0"
+	"ctrl_value" "1"
+	"delay" "0.0"
+	"targetname" "platform"
+	connections
+	{
+		"OnTurnedOn" "cube_enable_motion_triggerDisable0.01-1"
+		"OnTurnedOn" "track_lift_movelinearSetPosition10-1"
+		"OnTurnedOn" "cube_enable_motion_triggerEnable0-1"
+		"OnTurnedOff" "cube_enable_motion_triggerDisable0.01-1"
+		"OnTurnedOff" "track_lift_movelinearSetPosition00-1"
+		"OnTurnedOff" "cube_enable_motion_triggerEnable0-1"
+	}
+	"origin" "48 0 -16"
+	editor
+	{
+		"color" "220 30 220"
+		"visgroupshown" "1"
+		"visgroupautoshown" "1"
+		"comments" "Either the trigger or inputs control this."
+		"logicalpos" "[0 1500]"
+	}
+}
+entity
 {
 	"id" "2021"
 	"classname" "comp_kv_setter"
 	"angles" "-90 0 0"
 	"conv_ang" "0"
+	"ctrl_value" "1"
 	"invert" "0"
 	"kv_name" "model"
 	"kv_value_global" "$model"
+	"kv_value_mode" "legacy"
+	"kv_value_pos" "48 0 16"
 	"mode" "kv"
 	"rotate" "0"
 	"target" "track_lift_model"
@@ -172,6 +202,7 @@ entity
 {
 	"id" "2"
 	"classname" "func_movelinear"
+	"angles" "0 0 0"
 	"blockdamage" "0"
 	"disablereceiveshadows" "0"
 	"movedir" "$travel_direction"
@@ -188,15 +219,6 @@ entity
 	"startsound" "World.PlatformStart"
 	"stopsound" "World.PlatformStop"
 	"targetname" "track_lift_movelinear"
-	connections
-	{
-		"OnUser2" "cube_enable_motion_triggerDisable0.01-1"
-		"OnUser2" "cube_enable_motion_triggerEnable0-1"
-		"OnUser2" "track_lift_movelinearSetPosition10-1"
-		"OnUser1" "cube_enable_motion_triggerDisable0.01-1"
-		"OnUser1" "cube_enable_motion_triggerEnable0-1"
-		"OnUser1" "track_lift_movelinearSetPosition00-1"
-	}
 	solid
 	{
 		"id" "1176"
diff --git a/packages/valve/geometry/resources/instances/clean/items/track/platform_oscillate.vmf b/packages/valve/geometry/resources/instances/clean/items/track/platform_oscillate.vmf
index d6160a7b07..d2f8eddee5 100644
--- a/packages/valve/geometry/resources/instances/clean/items/track/platform_oscillate.vmf
+++ b/packages/valve/geometry/resources/instances/clean/items/track/platform_oscillate.vmf
@@ -1,8 +1,8 @@
 versioninfo
 {
 	"editorversion" "400"
-	"editorbuild" "8419"
-	"mapversion" "204"
+	"editorbuild" "9672"
+	"mapversion" "209"
 	"formatversion" "100"
 	"prefab" "0"
 }
@@ -20,7 +20,7 @@ viewsettings
 world
 {
 	"id" "1"
-	"mapversion" "204"
+	"mapversion" "209"
 	"classname" "worldspawn"
 	"detailmaterial" "detail/detailsprites"
 	"detailvbsp" "detail.vbsp"
@@ -29,16 +29,42 @@ world
 	"skyname" "sky_black_nofog"
 }
 entity
+{
+	"id" "3146"
+	"classname" "comp_relay"
+	"ctrl_type" "0"
+	"ctrl_value" "1"
+	"delay" "0.0"
+	"targetname" "platform"
+	connections
+	{
+		"OnTurnedOff" "move_rlFireUser10-1"
+		"OnTurnedOn" "move_rlTrigger0-1"
+	}
+	"origin" "32 16 16"
+	editor
+	{
+		"color" "220 30 220"
+		"visgroupshown" "1"
+		"visgroupautoshown" "1"
+		"comments" "Either the trigger or inputs control this."
+		"logicalpos" "[0 1500]"
+	}
+}
+entity
 {
 	"id" "3072"
 	"classname" "comp_kv_setter"
 	"angles" "0 0 0"
+	"ctrl_value" "1"
 	"invert" "0"
 	"kv_name" "model"
 	"kv_value_global" "$model"
+	"kv_value_mode" "legacy"
+	"kv_value_pos" "32 -16 16"
 	"mode" "kv"
 	"target" "track_lift_model"
-	"origin" "48 0 32"
+	"origin" "32 -16 16"
 	editor
 	{
 		"color" "220 30 220"
@@ -159,7 +185,7 @@ entity
 		"OnFalse" "track_lift_movelinearSetPosition00-1"
 		"OnTrue" "track_lift_movelinearSetPosition10-1"
 	}
-	"origin" "48 -16 32"
+	"origin" "32 -16 32"
 	editor
 	{
 		"color" "0 100 250"
@@ -185,7 +211,7 @@ entity
 		"OnUser1" "track_lift_movelinearSetSpeed00-1"
 		"OnUser1" "cube_enable_motion_triggerEnable0-1"
 	}
-	"origin" "48 16 32"
+	"origin" "32 16 32"
 	editor
 	{
 		"color" "0 100 250"
@@ -207,7 +233,7 @@ entity
 	"parm6" "$start_active boolean 0"
 	"parm7" "$model string"
 	"parm8" "$skin integer 0"
-	"origin" "48 0 16"
+	"origin" "32 0 16"
 	editor
 	{
 		"color" "220 30 220"
@@ -220,13 +246,14 @@ entity
 {
 	"id" "2"
 	"classname" "func_movelinear"
+	"angles" "0 0 0"
 	"blockdamage" "0"
 	"disablereceiveshadows" "0"
 	"fademindist" "-1"
 	"fadescale" "1"
 	"movedir" "$travel_direction"
 	"movedistance" "$travel_distance"
-	"origin" "4.05 0 0"
+	"origin" "0 0 0"
 	"renderamt" "255"
 	"rendercolor" "255 255 255"
 	"renderfx" "0"
@@ -247,55 +274,11 @@ entity
 	}
 	solid
 	{
-		"id" "1176"
-		side
-		{
-			"id" "1001"
-			"plane" "(0 18 64) (-56 64 64) (64 18 -64)"
-			"material" "TOOLS/TOOLSNODRAW"
-			"uaxis" "[-1 0 0 -47.7822] 0.25"
-			"vaxis" "[0 0 1 0] 0.25"
-			"rotation" "0"
-			"lightmapscale" "16"
-			"smoothing_groups" "0"
-		}
-		side
-		{
-			"id" "1000"
-			"plane" "(0 -19 64) (64 -19 -64) (-56 -64 64)"
-			"material" "TOOLS/TOOLSNODRAW"
-			"uaxis" "[1 0 0 43.7822] 0.25"
-			"vaxis" "[0 0 1 0] 0.25"
-			"rotation" "0"
-			"lightmapscale" "16"
-			"smoothing_groups" "0"
-		}
-		side
-		{
-			"id" "999"
-			"plane" "(0 18 64) (0 -19 64) (-56 -64 64)"
-			"material" "TOOLS/TOOLSNODRAW"
-			"uaxis" "[0 1 0 0] 0.25"
-			"vaxis" "[-1 0 0 -55.7822] 0.25"
-			"rotation" "0"
-			"lightmapscale" "16"
-			"smoothing_groups" "0"
-		}
-		side
-		{
-			"id" "998"
-			"plane" "(64 18 -64) (64 -19 -64) (0 -19 64)"
-			"material" "TOOLS/TOOLSNODRAW"
-			"uaxis" "[0 1 0 0] 0.25"
-			"vaxis" "[-0.351124 0 0.936329 -7.48126] 0.25"
-			"rotation" "0"
-			"lightmapscale" "16"
-			"smoothing_groups" "0"
-		}
+		"id" "3130"
 		side
 		{
-			"id" "997"
-			"plane" "(64 -19 -64) (64 18 -64) (-56 64 64)"
+			"id" "1044"
+			"plane" "(-56 18 64) (-56 -19 64) (-56 -19 -64)"
 			"material" "TOOLS/TOOLSNODRAW"
 			"uaxis" "[0 1 0 0] 0.25"
 			"vaxis" "[0 0 1 0] 0.25"
@@ -303,33 +286,23 @@ entity
 			"lightmapscale" "16"
 			"smoothing_groups" "0"
 		}
-		editor
-		{
-			"color" "220 30 220"
-			"visgroupshown" "1"
-			"visgroupautoshown" "1"
-		}
-	}
-	solid
-	{
-		"id" "1177"
 		side
 		{
-			"id" "1006"
-			"plane" "(-56 -64 -64) (-56 64 -64) (-56 64 64)"
+			"id" "1043"
+			"plane" "(32 -19 -64) (32 18 -64) (-56 18 -64)"
 			"material" "TOOLS/TOOLSNODRAW"
 			"uaxis" "[0 1 0 0] 0.25"
-			"vaxis" "[0 0 1 0] 0.25"
+			"vaxis" "[1 0 0 55.7822] 0.25"
 			"rotation" "0"
 			"lightmapscale" "16"
 			"smoothing_groups" "0"
 		}
 		side
 		{
-			"id" "1005"
-			"plane" "(-56 64 -64) (63.999 18 -64) (-56 64 64)"
+			"id" "1042"
+			"plane" "(-16 -19 64) (-16 18 64) (32 18 -64)"
 			"material" "TOOLS/TOOLSNODRAW"
-			"uaxis" "[-1 0 0 -47.7822] 0.25"
+			"uaxis" "[0 1 0 0] 0.25"
 			"vaxis" "[0 0 1 0] 0.25"
 			"rotation" "0"
 			"lightmapscale" "16"
@@ -337,33 +310,33 @@ entity
 		}
 		side
 		{
-			"id" "1004"
-			"plane" "(-56 -64 -64) (-56 -64 64) (63.9974 -19 -64)"
+			"id" "1041"
+			"plane" "(-56 -19 64) (-16 -19 64) (32 -19 -64)"
 			"material" "TOOLS/TOOLSNODRAW"
-			"uaxis" "[1 0 0 43.7822] 0.25"
-			"vaxis" "[0 0 1 0] 0.25"
+			"uaxis" "[1 0 0 0] 0.25"
+			"vaxis" "[0 0 -1 0] 0.25"
 			"rotation" "0"
 			"lightmapscale" "16"
 			"smoothing_groups" "0"
 		}
 		side
 		{
-			"id" "1003"
-			"plane" "(-56 64 -64) (-56 -64 -64) (63.9974 -19 -64)"
+			"id" "1040"
+			"plane" "(32 18 -64) (-16 18 64) (-56 18 64)"
 			"material" "TOOLS/TOOLSNODRAW"
-			"uaxis" "[0 1 0 0] 0.25"
-			"vaxis" "[1 0 0 55.7822] 0.25"
+			"uaxis" "[-1 0 0 0] 0.25"
+			"vaxis" "[0 0 -1 0] 0.25"
 			"rotation" "0"
 			"lightmapscale" "16"
 			"smoothing_groups" "0"
 		}
 		side
 		{
-			"id" "1002"
-			"plane" "(-56 64 64) (63.999 18 -64) (63.9974 -19 -64)"
+			"id" "1039"
+			"plane" "(-16 18 64) (-16 -19 64) (-56 -19 64)"
 			"material" "TOOLS/TOOLSNODRAW"
-			"uaxis" "[0 1 0 0] 0.25"
-			"vaxis" "[0 0 1 0] 0.25"
+			"uaxis" "[0.919131 0 0.393951 0] 0.25"
+			"vaxis" "[0 -1 0 0] 0.25"
 			"rotation" "0"
 			"lightmapscale" "16"
 			"smoothing_groups" "0"
diff --git a/packages/valve/geometry/resources/instances/clean/items/track/trigger.vmf b/packages/valve/geometry/resources/instances/clean/items/track/trigger.vmf
new file mode 100644
index 0000000000..c2f7e7c081
--- /dev/null
+++ b/packages/valve/geometry/resources/instances/clean/items/track/trigger.vmf
@@ -0,0 +1,132 @@
+versioninfo
+{
+	"editorversion" "400"
+	"editorbuild" "9672"
+	"mapversion" "3"
+	"formatversion" "100"
+	"prefab" "0"
+}
+visgroups
+{
+}
+viewsettings
+{
+	"bSnapToGrid" "1"
+	"bShowGrid" "1"
+	"bShowLogicalGrid" "0"
+	"nGridSpacing" "32"
+	"bShow3DGrid" "0"
+}
+world
+{
+	"id" "1"
+	"mapversion" "3"
+	"classname" "worldspawn"
+	"detailmaterial" "detail/detailsprites"
+	"detailvbsp" "detail.vbsp"
+	"maxblobcount" "250"
+	"maxpropscreenwidth" "-1"
+	"skyname" "sky_black_nofog"
+}
+entity
+{
+	"id" "2"
+	"classname" "trigger_multiple"
+	"origin" "0 0 0"
+	"parentname" "track_lift_movelinear"
+	"spawnflags" "1"
+	"StartDisabled" "0"
+	"targetname" "trigger"
+	"wait" "1"
+	solid
+	{
+		"id" "3"
+		side
+		{
+			"id" "1"
+			"plane" "(-144 -48 -48) (-144 48 -48) (-144 48 48)"
+			"material" "TOOLS/TOOLSTRIGGER"
+			"uaxis" "[0 0 1 0] 0.25"
+			"vaxis" "[0 -1 0 0] 0.25"
+			"rotation" "0"
+			"lightmapscale" "16"
+			"smoothing_groups" "0"
+		}
+		side
+		{
+			"id" "2"
+			"plane" "(-64 48 -48) (-64 -48 -48) (-64 -48 48)"
+			"material" "TOOLS/TOOLSTRIGGER"
+			"uaxis" "[0 0 1 0] 0.25"
+			"vaxis" "[0 -1 0 0] 0.25"
+			"rotation" "0"
+			"lightmapscale" "16"
+			"smoothing_groups" "0"
+		}
+		side
+		{
+			"id" "3"
+			"plane" "(-144 48 -48) (-144 -48 -48) (-64 -48 -48)"
+			"material" "TOOLS/TOOLSTRIGGER"
+			"uaxis" "[0 1 0 0] 0.25"
+			"vaxis" "[1 0 0 0] 0.25"
+			"rotation" "0"
+			"lightmapscale" "16"
+			"smoothing_groups" "0"
+		}
+		side
+		{
+			"id" "4"
+			"plane" "(-144 -48 48) (-144 48 48) (-64 48 48)"
+			"material" "TOOLS/TOOLSTRIGGER"
+			"uaxis" "[0 1 0 0] 0.25"
+			"vaxis" "[1 0 0 0] 0.25"
+			"rotation" "0"
+			"lightmapscale" "16"
+			"smoothing_groups" "0"
+		}
+		side
+		{
+			"id" "5"
+			"plane" "(-144 48 48) (-144 48 -48) (-64 48 -48)"
+			"material" "TOOLS/TOOLSTRIGGER"
+			"uaxis" "[0 0 1 0] 0.25"
+			"vaxis" "[1 0 0 0] 0.25"
+			"rotation" "0"
+			"lightmapscale" "16"
+			"smoothing_groups" "0"
+		}
+		side
+		{
+			"id" "6"
+			"plane" "(-64 -48 48) (-64 -48 -48) (-144 -48 -48)"
+			"material" "TOOLS/TOOLSTRIGGER"
+			"uaxis" "[0 0 1 0] 0.25"
+			"vaxis" "[1 0 0 0] 0.25"
+			"rotation" "0"
+			"lightmapscale" "16"
+			"smoothing_groups" "0"
+		}
+		editor
+		{
+			"color" "220 30 220"
+			"visgroupshown" "1"
+			"visgroupautoshown" "1"
+		}
+	}
+	editor
+	{
+		"color" "220 30 220"
+		"visgroupshown" "1"
+		"visgroupautoshown" "1"
+		"logicalpos" "[0 500]"
+	}
+}
+cameras
+{
+	"activecamera" "-1"
+}
+cordons
+{
+	"active" "0"
+}