diff --git a/BizHawk.Client.Common/Global.cs b/BizHawk.Client.Common/Global.cs
index 3393006a46..0c84b83df0 100644
--- a/BizHawk.Client.Common/Global.cs
+++ b/BizHawk.Client.Common/Global.cs
@@ -15,12 +15,6 @@ namespace BizHawk.Client.Common
 		public static FirmwareManager FirmwareManager;
 		public static Rewinder Rewinder;
 
-		//Movie
-
-		/// <summary>
-		/// the global MovieSession can use this to deal with multitrack player remapping (should this be here? maybe it should be in MovieSession)
-		/// </summary>
-		public static MultitrackRewiringControllerAdapter MultitrackRewiringControllerAdapter = new MultitrackRewiringControllerAdapter();
 		public static MovieSession MovieSession = new MovieSession();
 
 		/// <summary>
diff --git a/BizHawk.Client.Common/inputAdapters/InputManager.cs b/BizHawk.Client.Common/inputAdapters/InputManager.cs
index fcdc68a959..a2fec62dbc 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.MultitrackRewiringControllerAdapter.Source = Global.AutofireStickyXORAdapter;
-			Global.MovieInputSourceAdapter.Source = Global.MultitrackRewiringControllerAdapter;
+			Global.MovieSession.MultiTrack.MultitrackRewiringAdapter.Source = Global.AutofireStickyXORAdapter;
+			Global.MovieInputSourceAdapter.Source = Global.MovieSession.MultiTrack.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 6881db02b3..daf5941c53 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)
 				{
-					Global.MultitrackRewiringControllerAdapter.Source = MovieControllerAdapter;
+					MultiTrack.MultitrackRewiringAdapter.Source = MovieControllerAdapter;
 				}
 			}
 			else
@@ -275,7 +275,7 @@ namespace BizHawk.Client.Common
 			{
 				if (MultiTrack.IsActive)
 				{
-					LatchMultitrackPlayerInput(Global.MovieInputSourceAdapter, Global.MultitrackRewiringControllerAdapter);
+					LatchMultitrackPlayerInput(Global.MovieInputSourceAdapter, MultiTrack.MultitrackRewiringAdapter);
 				}
 				else
 				{
diff --git a/BizHawk.Client.Common/movie/MultitrackRecording.cs b/BizHawk.Client.Common/movie/MultitrackRecording.cs
index ee92d60772..efcf29bfcd 100644
--- a/BizHawk.Client.Common/movie/MultitrackRecording.cs
+++ b/BizHawk.Client.Common/movie/MultitrackRecording.cs
@@ -2,6 +2,13 @@
 {
 	public class MultitrackRecorder
 	{
+		public MultitrackRecorder()
+		{
+			Restart();
+		}
+
+		public MultitrackRewiringControllerAdapter MultitrackRewiringAdapter { get; private set; }
+
 		public bool IsActive { get; set; }
 		public int CurrentPlayer{ get; set; }
 		public bool RecordAll { get; set; }
@@ -37,6 +44,7 @@
 			IsActive = false;
 			CurrentPlayer = 0;
 			RecordAll = false;
+			MultitrackRewiringAdapter = new MultitrackRewiringControllerAdapter();
 		}
 
 		public void SelectAll()