diff --git a/DevConsole/Program.cs b/DevConsole/Program.cs
index 7c190df..5a75210 100644
--- a/DevConsole/Program.cs
+++ b/DevConsole/Program.cs
@@ -246,10 +246,8 @@ namespace DevConsole
                                                                                             "600",
                                                                                             true).First();
 
-            List<SaveGameEntriesModel> saveGameEntries = new List<SaveGameEntriesModel>();
-            saveGameEntries.Add(new SaveGameEntriesModel());
-
             masterGameRecord.Directories = directories;
+            directories.ForEach(x => x.SaveGameEntries = new List<SaveGameEntriesModel>());
             masterGameRecord.GameEntry = gameEntry;
 
             flcMgr.CRUD.InsertRecord(Firelance.Collections.GameRecords, masterGameRecord);
@@ -265,15 +263,10 @@ namespace DevConsole
                 PrintAllValues(record.GameEntry);
                 Console.WriteLine("");
 
-                foreach (var subRecord in record.Directories)
+                foreach (var dirRecord in record.Directories)
                 {
-                    PrintAllValues(subRecord);
-                    Console.WriteLine("");
-                }
-
-                foreach (var subRecord in record.SaveGameEntries)
-                {
-                    PrintAllValues(subRecord);
+                    PrintAllValues(dirRecord);
+                    dirRecord.SaveGameEntries.ForEach(x => PrintAllValues(x));
                     Console.WriteLine("");
                 }
             }
@@ -284,9 +277,16 @@ namespace DevConsole
             Guid firstGuid = flcMgr.CRUD.LoadRecordsFromTable<MasterGameRecordModel>(
                 Firelance.Collections.GameRecords).First().Id;
             MasterGameRecordModel recordToRemove = flcMgr.CRUD.LoadRecordById<MasterGameRecordModel>(
-                Firelance.Collections.GameRecords, firstGuid);
-            ObjectId firstSaveId = recordToRemove.SaveGameEntries.Select(x => x.SaveDataID).First();
-            recordToRemove.SaveGameEntries.RemoveAll(x => x.SaveDataID == firstSaveId);
+                Firelance.Collections.GameRecords,
+                firstGuid);
+            ObjectId firstSaveId = recordToRemove
+                .Directories.Select(y => y
+                .SaveGameEntries.Select(x => x
+                .SaveDataID).First()).First();
+            recordToRemove
+                .Directories.Select(y => y
+                .SaveGameEntries.RemoveAll(x => x
+                .SaveDataID == firstSaveId)).First();
 
             flcMgr.CRUD.UpsertRecordById(Firelance.Collections.GameRecords,
                                         firstGuid,
@@ -300,9 +300,14 @@ namespace DevConsole
             Guid firstGuid = flcMgr.CRUD.LoadRecordsFromTable<MasterGameRecordModel>(
                 Firelance.Collections.GameRecords).First().Id;
             MasterGameRecordModel recordToInsert = flcMgr.CRUD.LoadRecordById<MasterGameRecordModel>(
-                Firelance.Collections.GameRecords, firstGuid);
-            recordToInsert.SaveGameEntries.Add(
-                new SaveGameEntriesModel());
+                Firelance.Collections.GameRecords,
+                firstGuid);
+
+            foreach (var dir in recordToInsert.Directories)
+            {
+                dir.SaveGameEntries.Add(new SaveGameEntriesModel());
+                break;
+            }
 
             flcMgr.CRUD.UpsertRecordById(   Firelance.Collections.GameRecords,
                                             firstGuid,
@@ -317,8 +322,12 @@ namespace DevConsole
                 Firelance.Collections.GameRecords).First().Id;
             MasterGameRecordModel saveGameEntry = flcMgr.CRUD.LoadRecordById<MasterGameRecordModel>(
                 Firelance.Collections.GameRecords, firstGuid);
-            saveGameEntry.SaveGameEntries.Add(
-                new SaveGameEntriesModel() { SaveDataID = ulObjId });
+
+            foreach (var dir in saveGameEntry.Directories)
+            {
+                dir.SaveGameEntries.Add(new SaveGameEntriesModel() { SaveDataID = ulObjId });                   
+                break;
+            }
 
             flcMgr.CRUD.UpsertRecordById(   Firelance.Collections.GameRecords,
                                             firstGuid,
@@ -331,7 +340,7 @@ namespace DevConsole
         {
             var objId = "5f00a560b65a2f02d0c7996e";
 
-            var dlResult = flcMgr.GFS.DownloadFile(new MongoDB.Bson.ObjectId(objId), @$"D:\Temp\{objId}.exe");
+            var dlResult = flcMgr.GFS.DownloadFile(new ObjectId(objId), @$"D:\Temp\{objId}.exe");
             Console.WriteLine($"Download Successful: {dlResult.Result}");
         }
         #endregion
diff --git a/FireLance/Models/DirectoriesModel.cs b/FireLance/Models/DirectoriesModel.cs
index dcfc453..691f456 100644
--- a/FireLance/Models/DirectoriesModel.cs
+++ b/FireLance/Models/DirectoriesModel.cs
@@ -13,6 +13,6 @@ namespace Firelance.Models
         public string DefinedFiles { get; set; }
         public string ExcludedFiles { get; set; }
         public bool Recurse { get; set; }
-        List<SaveGameEntriesModel> SaveGameEntries { get; set; }
+        public List<SaveGameEntriesModel> SaveGameEntries { get; set; }
     }
 }
diff --git a/FireLance/Models/MasterGameRecordModel.cs b/FireLance/Models/MasterGameRecordModel.cs
index c512ab9..17abedf 100644
--- a/FireLance/Models/MasterGameRecordModel.cs
+++ b/FireLance/Models/MasterGameRecordModel.cs
@@ -11,6 +11,5 @@ namespace Firelance.Models
 
         public GameEntryModel GameEntry { get; set; }
         public List<DirectoriesModel> Directories { get; set; }
-        public List<SaveGameEntriesModel> SaveGameEntries { get; set; }
     }
 }