diff --git a/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
index a180a24049..baa23ea0c7 100644
--- a/BizHawk.Client.Common/BizHawk.Client.Common.csproj
+++ b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
@@ -166,8 +166,10 @@
     <Compile Include="movie\PlatformFrameRates.cs" />
     <Compile Include="movie\Subtitle.cs" />
     <Compile Include="movie\SubtitleList.cs" />
+    <Compile Include="movie\tasproj\TasMovie.Editing.cs" />
     <Compile Include="movie\tasproj\TasMovie.IO.cs" />
     <Compile Include="movie\tasproj\TasMovie.cs" />
+    <Compile Include="movie\tasproj\TasStateManager.cs" />
     <Compile Include="movie\tasproj\TasMovieRecord.cs" />
     <Compile Include="NESGameGenieEncoderDecoder.cs" />
     <Compile Include="PathManager.cs" />
diff --git a/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs b/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs
index e511a7b62c..8944507942 100644
--- a/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs
+++ b/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs
@@ -70,7 +70,7 @@ namespace BizHawk.Client.Common
 			Changes = true;
 		}
 
-		public void RecordFrame(int frame, IController source)
+		public virtual void RecordFrame(int frame, IController source)
 		{
 			if (Global.Config.VBAStyleMovieLoadState)
 			{
@@ -87,7 +87,7 @@ namespace BizHawk.Client.Common
 			Changes = true;
 		}
 
-		public void Truncate(int frame)
+		public virtual void Truncate(int frame)
 		{
 			if (frame < _log.Count)
 			{
@@ -162,7 +162,7 @@ namespace BizHawk.Client.Common
 			return null;
 		}
 
-		public void PokeFrame(int frame, IController source)
+		public virtual void PokeFrame(int frame, IController source)
 		{
 			var lg = LogGeneratorInstance();
 			lg.SetSource(source);
@@ -171,9 +171,10 @@ namespace BizHawk.Client.Common
 			SetFrameAt(frame, lg.GenerateLogEntry());
 		}
 
-		public void ClearFrame(int frame)
+		public virtual void ClearFrame(int frame)
 		{
 			SetFrameAt(frame, LogGeneratorInstance().EmptyEntry);
+			Changes = true;
 		}
 
 		#endregion
diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.Editing.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.Editing.cs
new file mode 100644
index 0000000000..ee7091c47b
--- /dev/null
+++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.Editing.cs
@@ -0,0 +1,47 @@
+using System;
+using System.IO;
+using System.Linq;
+
+using BizHawk.Common;
+
+namespace BizHawk.Client.Common
+{
+	public partial class TasMovie
+	{
+		// TODO: all these
+		public override void RecordFrame(int frame, Emulation.Common.IController source)
+		{
+			base.RecordFrame(frame, source);
+
+			LagLog.RemoveRange(frame, LagLog.Count - frame);
+			LagLog.Add(Global.Emulator.IsLagFrame);
+
+			StateManager.Invalidate(frame);
+			StateManager.Capture();
+		}
+
+		public override void Truncate(int frame)
+		{
+			base.Truncate(frame);
+
+			LagLog.RemoveRange(frame + 2, LagLog.Count - frame - 1);
+			StateManager.Invalidate(frame + 1);
+		}
+
+		public override void PokeFrame(int frame, Emulation.Common.IController source)
+		{
+			base.PokeFrame(frame, source);
+
+			LagLog.RemoveRange(frame, LagLog.Count - frame);
+			StateManager.Invalidate(frame);
+		}
+
+		public override void ClearFrame(int frame)
+		{
+			base.ClearFrame(frame);
+
+			LagLog.RemoveRange(frame + 1, LagLog.Count - frame - 1);
+			StateManager.Invalidate(frame + 1);
+		}
+	}
+}
diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
index 22fda21b20..7d4bbaeaa0 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
@@ -12,6 +12,7 @@ namespace BizHawk.Client.Common
 	public sealed partial class TasMovie : Bk2Movie
 	{
 		private readonly List<bool> LagLog = new List<bool>();
+		private readonly TasStateManager StateManager = new TasStateManager();
 
 		public TasMovie(string path) : base(path) { }
 
@@ -32,15 +33,13 @@ namespace BizHawk.Client.Common
 		{
 			get
 			{
-				return new TasMovieRecord // TODO
+				return new TasMovieRecord
 				{
-					State = null,
-					LogEntry = "",
-					Lagged = false
+					State = StateManager[index],
+					LogEntry = GetInput(index),
+					Lagged = LagLog[index]
 				};
 			}
 		}
-
-		// _state = (byte[])Global.Emulator.SaveStateBinary().Clone();
 	}
 }
diff --git a/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
new file mode 100644
index 0000000000..39b2f7bc1e
--- /dev/null
+++ b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
@@ -0,0 +1,67 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace BizHawk.Client.Common
+{
+	/// <summary>
+	/// Captures savestates and manages the logic of adding, retrieving, 
+	/// invalidating/clearing of states.  Also does memory management and limiting of states
+	/// </summary>
+	public class TasStateManager
+	{
+		private readonly Dictionary<int, byte[]> States = new Dictionary<int, byte[]>();
+
+		/// <summary>
+		/// Retrieves the savestate for the given frame,
+		/// If this frame does not have a state currently, will return an empty array
+		/// </summary>
+		/// <returns>A savestate for the given frame or an empty array if there isn't one</returns>
+		public byte[] this[int frame]
+		{
+			get
+			{
+				if (States.ContainsKey(frame))
+				{
+					return States[frame];
+				}
+
+				return new byte[0];
+			}
+		}
+
+		/// <summary>
+		/// Requests that the current emulator state be captured 
+		/// </summary>
+		public void Capture()
+		{
+			var frame = Global.Emulator.Frame;
+			var state = (byte[])Global.Emulator.SaveStateBinary().Clone();
+
+			if (States.ContainsKey(frame))
+			{
+				States[frame] = state;
+			}
+			else
+			{
+				States.Add(frame, state);
+			}
+		}
+
+		/// <summary>
+		/// Clears out all savestates after the given frame number
+		/// </summary>
+		public void Invalidate(int frame)
+		{
+			// TODO be more efficient, this could get slow
+			var toRemove = States
+				.Where(x => x.Key > frame)
+				.Select(x => x.Key)
+				.ToList();
+
+			foreach (var f in toRemove)
+			{
+				States.Remove(f);
+			}
+		}
+	}
+}