diff --git a/BizHawk.Client.Common/movie/bkm/Movie.cs b/BizHawk.Client.Common/movie/bkm/Movie.cs
index 2136dbd713..a9c3debb1c 100644
--- a/BizHawk.Client.Common/movie/bkm/Movie.cs
+++ b/BizHawk.Client.Common/movie/bkm/Movie.cs
@@ -148,7 +148,7 @@ namespace BizHawk.Client.Common
 
 		public string PreferredExtension { get { return "bkm"; } }
 
-		// TODO: delete me
+		// Movies 2.0 TODO: delete me
 		public static string Extension { get { return "bkm"; } }
 
 		public MovieHeader Header { get; private set; }
diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs
index d48d7c85b6..8e15c87b72 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Events.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs
@@ -1794,6 +1794,7 @@ namespace BizHawk.Client.EmuHawk
 				SaveMovieContextMenuItem.Visible =
 				Global.MovieSession.Movie.IsActive;
 
+			// Movies 2.0 TODO
 			BackupMovieContextMenuItem.Visible = Global.MovieSession.Movie is Movie && Global.MovieSession.Movie.IsActive;
 
 			StopNoSaveContextMenuItem.Visible = Global.MovieSession.Movie.IsActive && Global.MovieSession.Movie.Changes;
@@ -1903,6 +1904,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void BackupMovieContextMenuItem_Click(object sender, EventArgs e)
 		{
+			//Movies 2.0 TODO
 			if (Global.MovieSession.Movie is Movie)
 			{
 				GlobalWin.OSD.AddMessage("Backup movie saved.");
@@ -2190,7 +2192,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 			else if (MovieSession.IsValidMovieExtension(ext))
 			{
-				StartNewMovie(new Movie(filePaths[0]), false);
+				StartNewMovie(MovieLoader.Load(filePaths[0]), false);
 			}
 			else if (ext.ToUpper() == ".STATE")
 			{
@@ -2236,9 +2238,9 @@ namespace BizHawk.Client.EmuHawk
 				}
 				else
 				{
-					//fix movie extension to something palatable for these purposes. 
-					//for instance, something which doesnt clobber movies you already may have had.
-					//i'm evenly torn between this, and a file in %TEMP%, but since we dont really have a way to clean up this tempfile, i choose this:
+					// fix movie extension to something palatable for these purposes. 
+					// for instance, something which doesnt clobber movies you already may have had.
+					// i'm evenly torn between this, and a file in %TEMP%, but since we dont really have a way to clean up this tempfile, i choose this:
 					movie.Filename += ".autoimported." + Movie.Extension;
 					movie.Save();
 					StartNewMovie(movie, false);
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index 09441aac81..e36de83340 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -265,7 +265,7 @@ namespace BizHawk.Client.EmuHawk
 				}
 				else
 				{
-					var movie = new Movie(cmdMovie);
+					var movie = MovieLoader.Load(cmdMovie);
 					Global.MovieSession.ReadOnly = true;
 
 					// if user is dumping and didnt supply dump length, make it as long as the loaded movie
@@ -286,7 +286,7 @@ namespace BizHawk.Client.EmuHawk
 				}
 				else
 				{
-					StartNewMovie(new Movie(Global.Config.RecentMovies.MostRecent), false);
+					StartNewMovie(MovieLoader.Load(Global.Config.RecentMovies.MostRecent), false);
 				}
 			}
 
@@ -1439,10 +1439,10 @@ namespace BizHawk.Client.EmuHawk
 
 		private void LoadMoviesFromRecent(string path)
 		{
-			// Movies 2.0 TODO - Use MovieLoader that returns an IMovie, loader will have a success flag to pass to HandleLoadError()
-			var movie = new Movie(path);
+			var movie = MovieLoader.Load(path);
 
-			if (!movie.Loaded)
+			// Movies 2.0 TODO
+			if (!(movie as Movie).Loaded)
 			{
 				ToolHelpers.HandleLoadError(Global.Config.RecentMovies, path);
 			}
diff --git a/BizHawk.Client.EmuHawk/movie/PlayMovie.cs b/BizHawk.Client.EmuHawk/movie/PlayMovie.cs
index aabd74d711..10651bdc44 100644
--- a/BizHawk.Client.EmuHawk/movie/PlayMovie.cs
+++ b/BizHawk.Client.EmuHawk/movie/PlayMovie.cs
@@ -188,6 +188,7 @@ namespace BizHawk.Client.EmuHawk
 			var tas = new List<int>();
 			for (var i = 0; i < indices.Count; i++)
 			{
+				// Movies 2.0 TODO: MovieLoader could have a list of valid extensiosn to match
 				if (Path.GetExtension(_movieList[indices[i]].Filename).ToUpper() == "." + Movie.Extension)
 				{
 					tas.Add(i);
@@ -295,6 +296,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			var filePaths = (string[])e.Data.GetData(DataFormats.FileDrop);
 
+			// Movies 2.0 TODO: MovieLoader could have a list of valid extensiosn to match
 			filePaths
 				.Where(path => Path.GetExtension(path) == "." + Movie.Extension)
 				.ToList()
@@ -605,6 +607,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			var ofd = new OpenFileDialog
 			{
+				// Movies 2.0 TODO
 				Filter = "Movie Files (*." + Movie.Extension + ")|*." + Movie.Extension + "|Savestates|*.state|All Files|*.*",
 				InitialDirectory = PathManager.MakeAbsolutePath(Global.Config.PathEntries.MoviesPathFragment, null)
 			};
diff --git a/BizHawk.Client.EmuHawk/movie/RecordMovie.cs b/BizHawk.Client.EmuHawk/movie/RecordMovie.cs
index 5b08d33c67..f13e6b5e99 100644
--- a/BizHawk.Client.EmuHawk/movie/RecordMovie.cs
+++ b/BizHawk.Client.EmuHawk/movie/RecordMovie.cs
@@ -73,6 +73,7 @@ namespace BizHawk.Client.EmuHawk
 					}
 				}
 
+				// Movies 2.0 TODO
 				Movie _movieToRecord;
 
 				if (StartFromCombo.SelectedItem.ToString() == "Now")
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
index eda87f2d6d..53c7a549b3 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
@@ -44,7 +44,6 @@ namespace BizHawk.Client.EmuHawk
 					GlobalWin.OSD.AddMessage("TAStudio Disengaged");
 					if (Global.MovieSession.Movie is TasMovie)
 					{
-						Global.MovieSession.Movie = new Movie();
 						GlobalWin.MainForm.StopMovie(saveChanges: false);
 					}
 				}