diff --git a/GeneralMods/UnifiedSaveCore/Framework/LocationHandler.cs b/GeneralMods/UnifiedSaveCore/Framework/LocationHandler.cs
index ddaaa460..84308985 100644
--- a/GeneralMods/UnifiedSaveCore/Framework/LocationHandler.cs
+++ b/GeneralMods/UnifiedSaveCore/Framework/LocationHandler.cs
@@ -34,29 +34,28 @@ namespace UnifiedSaveCore.Framework
                 Game1.locations.Add(loc);
             }
             locations.Clear();
-            Game1.warpFarmer(oldLocation.name, (int)position.X*Game1.tileSize, (int)position.Y*Game1.tileSize, oldFacingDirection);
+            //Game1.warpFarmer(oldLocation.name, (int)position.X*Game1.tileSize, (int)position.Y*Game1.tileSize, oldFacingDirection);
         }
 
         //Removes all game locations for the game to save.
         public void beforeSave()
         {
-            UnifiedSaveCore.monitor.Log("BEFORE SAVE HAS BEEN CALLED!");
 
             oldLocation = Game1.player.currentLocation;
             position = Game1.player.position;
             oldFacingDirection = Game1.player.facingDirection;
 
             Vector2 bed = Game1.player.mostRecentBed;
-            Game1.warpFarmer("Farmhouse", (int)bed.X, (int)bed.Y, 2);
+            //Game1.warpFarmer("Farmhouse", (int)bed.X, (int)bed.Y, 2);
             foreach (var loc in Game1.locations)
             {
-                UnifiedSaveCore.monitor.Log(loc.GetType().ToString());
+                //UnifiedSaveCore.monitor.Log(loc.GetType().ToString());
                 //ModCore.monitor.Log();
                 foreach (var type in UnifiedSaveCore.modTypes)
                 {
                     if (loc.GetType().ToString() == type.ToString())
                     {
-                        UnifiedSaveCore.monitor.Log("Temporarily removing unexpected location type: " + loc.GetType().ToString());
+                        UnifiedSaveCore.monitor.Log("Temporarily removing unexpected location:"+ loc.name+" type: " + loc.GetType().ToString());
                         locations.Add(loc);
                     }
                 }
diff --git a/GeneralMods/UnifiedSaveCore/ModCore.cs b/GeneralMods/UnifiedSaveCore/ModCore.cs
index e61fbe6f..20e1e93f 100644
--- a/GeneralMods/UnifiedSaveCore/ModCore.cs
+++ b/GeneralMods/UnifiedSaveCore/ModCore.cs
@@ -18,6 +18,15 @@ namespace UnifiedSaveCore
 {
     /// <summary>
     /// Bare bones mod that interfaces events for saving.
+    /// 
+    /// Must go from really big to really small.
+    /// I.E locations->characters->objects->items....
+    /// TODO:
+    /// Characters
+    /// Animals
+    /// Trees?
+    /// Chests
+    /// Items
     /// </summary>
     public class UnifiedSaveCore:Mod
     {
@@ -54,6 +63,7 @@ namespace UnifiedSaveCore
                 "System",
                 "Mono",
                 "StardewModdingAPI",
+                "StardewValley",
                 "Lidgren",
                 "Microsoft",
                 "Monogames",
@@ -63,7 +73,6 @@ namespace UnifiedSaveCore
                 "Steamworks",
                 "GalaxyCSharp",
                 "xTile",
-                "StardewModdingAPI"
             };
 
             foreach (Assembly asm in assemblies)