diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini
index dd047fd..ad5420e 100644
Binary files a/Config/DefaultInput.ini and b/Config/DefaultInput.ini differ
diff --git a/Config/SteamVRBindings/steamvr_manifest.json b/Config/SteamVRBindings/steamvr_manifest.json
index 44de2a7..f8cc75f 100644
--- a/Config/SteamVRBindings/steamvr_manifest.json
+++ b/Config/SteamVRBindings/steamvr_manifest.json
@@ -77,14 +77,6 @@
 			"type": "vibration",
 			"requirement": "optional"
 		},
-		{
-			"name": "/actions/main/in/JoyUp",
-			"type": "boolean"
-		},
-		{
-			"name": "/actions/main/in/JoyDown",
-			"type": "boolean"
-		},
 		{
 			"name": "/actions/main/in/JoyRight",
 			"type": "boolean"
@@ -112,6 +104,22 @@
 		{
 			"name": "/actions/main/in/ButtonMenu",
 			"type": "boolean"
+		},
+		{
+			"name": "/actions/main/in/LeftJoyMoveUp",
+			"type": "boolean"
+		},
+		{
+			"name": "/actions/main/in/LeftJoyMoveDown",
+			"type": "boolean"
+		},
+		{
+			"name": "/actions/main/in/RightJoyUp",
+			"type": "boolean"
+		},
+		{
+			"name": "/actions/main/in/RightJoyDown",
+			"type": "boolean"
 		}
 	],
 	"action_sets": [
@@ -228,8 +236,6 @@
 			"/actions/main/in/open_console": "Open Console",
 			"/actions/main/out/vibrateleft": "Haptic (Left)",
 			"/actions/main/out/vibrateright": "Haptic (Right)",
-			"/actions/main/in/JoyUp": "JoyUp",
-			"/actions/main/in/JoyDown": "JoyDown",
 			"/actions/main/in/JoyRight": "JoyRight",
 			"/actions/main/in/JoyLeft": "JoyLeft",
 			"/actions/main/in/GripRight": "GripRight",
@@ -237,6 +243,10 @@
 			"/actions/main/in/TriggerRight": "TriggerRight",
 			"/actions/main/in/TriggerLeft": "TriggerLeft",
 			"/actions/main/in/ButtonMenu": "ButtonMenu",
+			"/actions/main/in/LeftJoyMoveUp": "LeftJoyMoveUp",
+			"/actions/main/in/LeftJoyMoveDown": "LeftJoyMoveDown",
+			"/actions/main/in/RightJoyUp": "RightJoyUp",
+			"/actions/main/in/RightJoyDown": "RightJoyDown",
 			"/actions/main": "Main Game Actions"
 		}
 	]
diff --git a/Config/SteamVRBindings/vive_controller.json b/Config/SteamVRBindings/vive_controller.json
index a5153ea..c95e08c 100644
--- a/Config/SteamVRBindings/vive_controller.json
+++ b/Config/SteamVRBindings/vive_controller.json
@@ -7,66 +7,6 @@
 		"/actions/main":
 		{
 			"sources": [
-				{
-					"mode": "dpad",
-					"path": "/user/hand/left/input/trackpad",
-					"parameters":
-					{
-						"sub_mode": "click"
-					},
-					"inputs":
-					{
-						"north":
-						{
-							"output": "/actions/main/in/JoyUp"
-						}
-					}
-				},
-				{
-					"mode": "dpad",
-					"path": "/user/hand/right/input/trackpad",
-					"parameters":
-					{
-						"sub_mode": "click"
-					},
-					"inputs":
-					{
-						"north":
-						{
-							"output": "/actions/main/in/JoyUp"
-						}
-					}
-				},
-				{
-					"mode": "dpad",
-					"path": "/user/hand/right/input/trackpad",
-					"parameters":
-					{
-						"sub_mode": "click"
-					},
-					"inputs":
-					{
-						"south":
-						{
-							"output": "/actions/main/in/JoyDown"
-						}
-					}
-				},
-				{
-					"mode": "dpad",
-					"path": "/user/hand/left/input/trackpad",
-					"parameters":
-					{
-						"sub_mode": "click"
-					},
-					"inputs":
-					{
-						"south":
-						{
-							"output": "/actions/main/in/JoyDown"
-						}
-					}
-				},
 				{
 					"mode": "dpad",
 					"path": "/user/hand/left/input/trackpad",
@@ -192,6 +132,66 @@
 							"output": "/actions/main/in/ButtonMenu"
 						}
 					}
+				},
+				{
+					"mode": "dpad",
+					"path": "/user/hand/left/input/trackpad",
+					"parameters":
+					{
+						"sub_mode": "click"
+					},
+					"inputs":
+					{
+						"north":
+						{
+							"output": "/actions/main/in/LeftJoyMoveUp"
+						}
+					}
+				},
+				{
+					"mode": "dpad",
+					"path": "/user/hand/left/input/trackpad",
+					"parameters":
+					{
+						"sub_mode": "click"
+					},
+					"inputs":
+					{
+						"south":
+						{
+							"output": "/actions/main/in/LeftJoyMoveDown"
+						}
+					}
+				},
+				{
+					"mode": "dpad",
+					"path": "/user/hand/right/input/trackpad",
+					"parameters":
+					{
+						"sub_mode": "click"
+					},
+					"inputs":
+					{
+						"north":
+						{
+							"output": "/actions/main/in/RightJoyUp"
+						}
+					}
+				},
+				{
+					"mode": "dpad",
+					"path": "/user/hand/right/input/trackpad",
+					"parameters":
+					{
+						"sub_mode": "click"
+					},
+					"inputs":
+					{
+						"south":
+						{
+							"output": "/actions/main/in/RightJoyDown"
+						}
+					}
 				}
 			],
 			"poses": [
diff --git a/Config/SteamVRBindings/vive_cosmos_controller.json b/Config/SteamVRBindings/vive_cosmos_controller.json
index aad4382..3406044 100644
--- a/Config/SteamVRBindings/vive_cosmos_controller.json
+++ b/Config/SteamVRBindings/vive_cosmos_controller.json
@@ -7,66 +7,6 @@
 		"/actions/main":
 		{
 			"sources": [
-				{
-					"mode": "dpad",
-					"path": "/user/hand/right/input/joystick",
-					"parameters":
-					{
-						"sub_mode": "click"
-					},
-					"inputs":
-					{
-						"north":
-						{
-							"output": "/actions/main/in/JoyUp"
-						}
-					}
-				},
-				{
-					"mode": "dpad",
-					"path": "/user/hand/left/input/joystick",
-					"parameters":
-					{
-						"sub_mode": "click"
-					},
-					"inputs":
-					{
-						"north":
-						{
-							"output": "/actions/main/in/JoyUp"
-						}
-					}
-				},
-				{
-					"mode": "dpad",
-					"path": "/user/hand/right/input/joystick",
-					"parameters":
-					{
-						"sub_mode": "click"
-					},
-					"inputs":
-					{
-						"south":
-						{
-							"output": "/actions/main/in/JoyDown"
-						}
-					}
-				},
-				{
-					"mode": "dpad",
-					"path": "/user/hand/left/input/joystick",
-					"parameters":
-					{
-						"sub_mode": "click"
-					},
-					"inputs":
-					{
-						"south":
-						{
-							"output": "/actions/main/in/JoyDown"
-						}
-					}
-				},
 				{
 					"mode": "dpad",
 					"path": "/user/hand/right/input/joystick",
diff --git a/Config/SteamVRBindings/vive_tracker_camera.json b/Config/SteamVRBindings/vive_tracker_camera.json
index 4f77838..69aabff 100644
--- a/Config/SteamVRBindings/vive_tracker_camera.json
+++ b/Config/SteamVRBindings/vive_tracker_camera.json
@@ -7,66 +7,6 @@
 		"/actions/main":
 		{
 			"sources": [
-				{
-					"mode": "dpad",
-					"path": "/user/hand/left/input/trackpad",
-					"parameters":
-					{
-						"sub_mode": "click"
-					},
-					"inputs":
-					{
-						"north":
-						{
-							"output": "/actions/main/in/JoyUp"
-						}
-					}
-				},
-				{
-					"mode": "dpad",
-					"path": "/user/hand/right/input/trackpad",
-					"parameters":
-					{
-						"sub_mode": "click"
-					},
-					"inputs":
-					{
-						"north":
-						{
-							"output": "/actions/main/in/JoyUp"
-						}
-					}
-				},
-				{
-					"mode": "dpad",
-					"path": "/user/hand/right/input/trackpad",
-					"parameters":
-					{
-						"sub_mode": "click"
-					},
-					"inputs":
-					{
-						"south":
-						{
-							"output": "/actions/main/in/JoyDown"
-						}
-					}
-				},
-				{
-					"mode": "dpad",
-					"path": "/user/hand/left/input/trackpad",
-					"parameters":
-					{
-						"sub_mode": "click"
-					},
-					"inputs":
-					{
-						"south":
-						{
-							"output": "/actions/main/in/JoyDown"
-						}
-					}
-				},
 				{
 					"mode": "dpad",
 					"path": "/user/hand/left/input/trackpad",
@@ -192,6 +132,66 @@
 							"output": "/actions/main/in/ButtonMenu"
 						}
 					}
+				},
+				{
+					"mode": "dpad",
+					"path": "/user/hand/left/input/trackpad",
+					"parameters":
+					{
+						"sub_mode": "click"
+					},
+					"inputs":
+					{
+						"north":
+						{
+							"output": "/actions/main/in/LeftJoyMoveUp"
+						}
+					}
+				},
+				{
+					"mode": "dpad",
+					"path": "/user/hand/left/input/trackpad",
+					"parameters":
+					{
+						"sub_mode": "click"
+					},
+					"inputs":
+					{
+						"south":
+						{
+							"output": "/actions/main/in/LeftJoyMoveDown"
+						}
+					}
+				},
+				{
+					"mode": "dpad",
+					"path": "/user/hand/right/input/trackpad",
+					"parameters":
+					{
+						"sub_mode": "click"
+					},
+					"inputs":
+					{
+						"north":
+						{
+							"output": "/actions/main/in/RightJoyUp"
+						}
+					}
+				},
+				{
+					"mode": "dpad",
+					"path": "/user/hand/right/input/trackpad",
+					"parameters":
+					{
+						"sub_mode": "click"
+					},
+					"inputs":
+					{
+						"south":
+						{
+							"output": "/actions/main/in/RightJoyDown"
+						}
+					}
 				}
 			],
 			"poses": [
diff --git a/Content/test/Blueprints/RailwayCarriages/BP_RailwayCarriage.uasset b/Content/test/Blueprints/RailwayCarriages/BP_RailwayCarriage.uasset
index ba9db16..3b39999 100644
Binary files a/Content/test/Blueprints/RailwayCarriages/BP_RailwayCarriage.uasset and b/Content/test/Blueprints/RailwayCarriages/BP_RailwayCarriage.uasset differ
diff --git a/Content/test/Blueprints/player/player.uasset b/Content/test/Blueprints/player/player.uasset
index f3735d4..b4b1d6e 100644
Binary files a/Content/test/Blueprints/player/player.uasset and b/Content/test/Blueprints/player/player.uasset differ
diff --git a/Content/test/Blueprints/scenario/Scenario.uasset b/Content/test/Blueprints/scenario/Scenario.uasset
index 50e3048..d4f7ea7 100644
Binary files a/Content/test/Blueprints/scenario/Scenario.uasset and b/Content/test/Blueprints/scenario/Scenario.uasset differ
diff --git a/Content/test/Levels/Main.umap b/Content/test/Levels/Main.umap
index b296373..9355929 100644
Binary files a/Content/test/Levels/Main.umap and b/Content/test/Levels/Main.umap differ