diff --git a/BizHawk.Client.Common/Global.cs b/BizHawk.Client.Common/Global.cs
index 0c84b83df0..fc26e2c2f5 100644
--- a/BizHawk.Client.Common/Global.cs
+++ b/BizHawk.Client.Common/Global.cs
@@ -28,6 +28,7 @@ namespace BizHawk.Client.Common
 		//the movie will be spliced inbetween these if it is present
 		public static CopyControllerAdapter MovieInputSourceAdapter = new CopyControllerAdapter();
 		public static CopyControllerAdapter MovieOutputHardpoint = new CopyControllerAdapter();
+		public static MultitrackRewiringControllerAdapter MultitrackRewiringAdapter = new MultitrackRewiringControllerAdapter();
 
 		//dont take my word for it, since the final word is actually in RewireInputChain, but here is a guide...
 		//user -> Input -> ActiveController -> UDLR -> StickyXORPlayerInputAdapter -> TurboAdapter(TBD) -> Lua(?TBD?) -> ..
diff --git a/BizHawk.Client.Common/inputAdapters/InputManager.cs b/BizHawk.Client.Common/inputAdapters/InputManager.cs
index a2fec62dbc..df4fd12470 100644
--- a/BizHawk.Client.Common/inputAdapters/InputManager.cs
+++ b/BizHawk.Client.Common/inputAdapters/InputManager.cs
@@ -16,8 +16,8 @@ namespace BizHawk.Client.Common
 			Global.StickyXORAdapter.Source = Global.UD_LR_ControllerAdapter;
 			Global.AutofireStickyXORAdapter.Source = Global.StickyXORAdapter;
 
-			Global.MovieSession.MultiTrack.MultitrackRewiringAdapter.Source = Global.AutofireStickyXORAdapter;
-			Global.MovieInputSourceAdapter.Source = Global.MovieSession.MultiTrack.MultitrackRewiringAdapter;
+			Global.MultitrackRewiringAdapter.Source = Global.AutofireStickyXORAdapter;
+			Global.MovieInputSourceAdapter.Source = Global.MultitrackRewiringAdapter;
 			Global.ControllerOutput.Source = Global.MovieOutputHardpoint;
 
 			Global.Emulator.Controller = Global.ControllerOutput;
diff --git a/BizHawk.Client.Common/movie/MovieSession.cs b/BizHawk.Client.Common/movie/MovieSession.cs
index daf5941c53..dfd4a9a74e 100644
--- a/BizHawk.Client.Common/movie/MovieSession.cs
+++ b/BizHawk.Client.Common/movie/MovieSession.cs
@@ -138,7 +138,7 @@ namespace BizHawk.Client.Common
 				MovieControllerAdapter.LatchFromSource(input);
 				if (MultiTrack.IsActive)
 				{
-					MultiTrack.MultitrackRewiringAdapter.Source = MovieControllerAdapter;
+					Global.MultitrackRewiringAdapter.Source = MovieControllerAdapter;
 				}
 			}
 			else
@@ -275,7 +275,7 @@ namespace BizHawk.Client.Common
 			{
 				if (MultiTrack.IsActive)
 				{
-					LatchMultitrackPlayerInput(Global.MovieInputSourceAdapter, MultiTrack.MultitrackRewiringAdapter);
+					LatchMultitrackPlayerInput(Global.MovieInputSourceAdapter, Global.MultitrackRewiringAdapter);
 				}
 				else
 				{
diff --git a/BizHawk.Client.Common/movie/MultitrackRecording.cs b/BizHawk.Client.Common/movie/MultitrackRecording.cs
index 27ca669055..a0a8446617 100644
--- a/BizHawk.Client.Common/movie/MultitrackRecording.cs
+++ b/BizHawk.Client.Common/movie/MultitrackRecording.cs
@@ -1,4 +1,5 @@
-using BizHawk.Emulation.Common;
+using System.Collections.Generic;
+using BizHawk.Emulation.Common;
 
 namespace BizHawk.Client.Common
 {
@@ -9,8 +10,6 @@ namespace BizHawk.Client.Common
 			Restart();
 		}
 
-		public MultitrackRewiringControllerAdapter MultitrackRewiringAdapter { get; private set; }
-
 		public bool IsActive { get; set; }
 		public int CurrentPlayer{ get; set; }
 		public bool RecordAll { get; set; }
@@ -46,7 +45,6 @@ namespace BizHawk.Client.Common
 			IsActive = false;
 			CurrentPlayer = 0;
 			RecordAll = false;
-			MultitrackRewiringAdapter = new MultitrackRewiringControllerAdapter();
 		}
 
 		public void SelectAll()