diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
index be378cffc0..ce909228b4 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
@@ -154,6 +154,7 @@
     <Compile Include="movie\MovieConvert.cs" />
     <Compile Include="movie\MovieHeader.cs" />
     <Compile Include="movie\MovieLog.cs" />
+    <Compile Include="movie\MultitrackRecording.cs" />
     <Compile Include="MruStack.cs" />
     <Compile Include="NameStateForm.cs">
       <SubType>Form</SubType>
diff --git a/BizHawk.MultiClient/Global.cs b/BizHawk.MultiClient/Global.cs
index 45b24ef2bf..a97a0eca9e 100644
--- a/BizHawk.MultiClient/Global.cs
+++ b/BizHawk.MultiClient/Global.cs
@@ -22,5 +22,6 @@ namespace BizHawk.MultiClient
 		public static Controller NESControls;
         public static Controller ActiveController;
         public static Controller NullControls;
+        public static MultitrackRecording MultiTrack;
     }
 }
\ No newline at end of file
diff --git a/BizHawk.MultiClient/Input/ControllerBinding.cs b/BizHawk.MultiClient/Input/ControllerBinding.cs
index 73bea8aa99..e729646b7a 100644
--- a/BizHawk.MultiClient/Input/ControllerBinding.cs
+++ b/BizHawk.MultiClient/Input/ControllerBinding.cs
@@ -186,14 +186,26 @@ namespace BizHawk.MultiClient
                 input.Append("|");
                 for (int player = 1; player < 6; player++)
                 {
-                    input.Append(IsPressed("P" + player + " Up")     ? "U" : ".");
-                    input.Append(IsPressed("P" + player + " Down")   ? "D" : ".");
-                    input.Append(IsPressed("P" + player + " Left")   ? "L" : ".");
-                    input.Append(IsPressed("P" + player + " Right")  ? "R" : ".");
-                    input.Append(IsPressed("P" + player + " B1")     ? "1" : ".");
-                    input.Append(IsPressed("P" + player + " B2")     ? "2" : ".");
-                    input.Append(IsPressed("P" + player + " Run")    ? "R" : ".");
-                    input.Append(IsPressed("P" + player + " Select") ? "S" : ".");
+                    if (!Global.MultiTrack.isActive)
+                    {
+                        input.Append(IsPressed("P" + player.ToString() + " Up") ? "U" : ".");
+                        input.Append(IsPressed("P" + player.ToString() + " Down") ? "D" : ".");
+                        input.Append(IsPressed("P" + player.ToString() + " Left") ? "L" : ".");
+                        input.Append(IsPressed("P" + player.ToString() + " Right") ? "R" : ".");
+                        input.Append(IsPressed("P" + player.ToString() + " B1") ? "1" : ".");
+                        input.Append(IsPressed("P" + player.ToString() + " B2") ? "2" : ".");
+                        input.Append(IsPressed("P" + player.ToString() + " Run") ? "R" : ".");
+                        input.Append(IsPressed("P" + player.ToString() + " Select") ? "S" : ".");
+                        input.Append("|");
+                    }
+                    input.Append(IsPressed("P" + player.ToString() + " Up")     ? "U" : ".");
+                    input.Append(IsPressed("P" + player.ToString() + " Down")   ? "D" : ".");
+                    input.Append(IsPressed("P" + player.ToString() + " Left") ? "L" : ".");
+                    input.Append(IsPressed("P" + player.ToString() + " Right") ? "R" : ".");
+                    input.Append(IsPressed("P" + player.ToString() + " B1") ? "1" : ".");
+                    input.Append(IsPressed("P" + player.ToString() + " B2") ? "2" : ".");
+                    input.Append(IsPressed("P" + player.ToString() + " Run") ? "R" : ".");
+                    input.Append(IsPressed("P" + player.ToString() + " Select") ? "S" : ".");
                     input.Append("|");
                 }
                 return input.ToString();
diff --git a/BizHawk.MultiClient/config/InputConfig.cs b/BizHawk.MultiClient/config/InputConfig.cs
index 449381060c..2157f4da23 100644
--- a/BizHawk.MultiClient/config/InputConfig.cs
+++ b/BizHawk.MultiClient/config/InputConfig.cs
@@ -37,7 +37,7 @@ namespace BizHawk.MultiClient
             InitializeComponent();
             Labels = new ArrayList();
             TextBoxes = new ArrayList();
-            Changed = false;
+            Changed = false;            
         }
 
         private string TruncateButtonMapping(string button)