diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index 4d93e776ac..04908bec19 100644
--- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -883,6 +883,7 @@
       <DependentUpon>TAStudio.cs</DependentUpon>
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="tools\TAStudio\TAStudioClipboard.cs" />
     <Compile Include="tools\TI83\TI83KeyPad.cs">
       <SubType>Form</SubType>
     </Compile>
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
index 748569283c..513e3ecdb0 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
@@ -460,31 +460,5 @@ namespace BizHawk.Client.EmuHawk
 		#endregion
 
 		#endregion
-
-		#region Classes
-
-		public class TasClipboardEntry
-		{
-			private readonly Dictionary<string, bool> _buttons;
-			private readonly int _frame;
-
-			public TasClipboardEntry(int frame, Dictionary<string, bool> buttons)
-			{
-				_frame = frame;
-				_buttons = buttons;
-			}
-
-			public int Frame
-			{
-				get { return _frame; }
-			}
-
-			public Dictionary<string, bool> Buttons
-			{
-				get { return _buttons; }
-			}
-		}
-
-		#endregion
 	}
 }
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudioClipboard.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudioClipboard.cs
new file mode 100644
index 0000000000..69b268cd8c
--- /dev/null
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudioClipboard.cs
@@ -0,0 +1,23 @@
+using BizHawk.Emulation.Common;
+using BizHawk.Client.Common;
+
+namespace BizHawk.Client.EmuHawk
+{
+	public class TasClipboardEntry
+	{
+		public TasClipboardEntry(int frame, IController controllerState)
+		{
+			Frame = frame;
+			ControllerState = controllerState;
+		}
+
+		public int Frame { get; private set; }
+		public IController ControllerState { get; private set; }
+
+		public override string ToString()
+		{
+			var lg = Global.MovieSession.Movie.LogGeneratorInstance();
+			return lg.GenerateLogEntry();
+		}
+	}
+}