diff --git a/ActiveDirectoryQuerier/MainWindow.xaml b/ActiveDirectoryQuerier/MainWindow.xaml
index 689ac82..e39fa67 100644
--- a/ActiveDirectoryQuerier/MainWindow.xaml
+++ b/ActiveDirectoryQuerier/MainWindow.xaml
@@ -26,6 +26,7 @@
             <Menu Width="50" Height="20" HorizontalAlignment="Left" VerticalAlignment="Top">
                 <MenuItem Header="File"  Width="Auto" Height="Auto" >
                     <MenuItem Header="Import Queries" Command="{Binding ImportQueryFileRelay}"/>
+                    <MenuItem Header="New Query File" Command="{Binding CreateNewQueryFileRelay}" />
                 </MenuItem>
             </Menu>
         </Border>
diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs
index d15248c..a155491 100644
--- a/ActiveDirectoryQuerier/MainWindowViewModel.cs
+++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs
@@ -163,6 +163,7 @@ public Command? SelectedCommandFromComboBoxInActiveDirectoryInfo
     public ICommand ExportConsoleOutputRelay { get; }
     public ICommand ClearConsoleOutputInQueryBuilderRelay { get; }
     public ICommand ImportQueryFileRelay { get; }
+    public ICommand CreateNewQueryFileRelay { get; }
     public ICommand ClearConsoleOutputInActiveDirectoryInfoRelay {
         get;
     } // TODO: Impliment functionality.....
@@ -204,6 +205,7 @@ public MainWindowViewModel()
         ExecuteQueryFromActiveDirectoryInfoRelay = new RelayCommand(
             _ => ExecuteQuery(_consoleOutputInActiveDirectoryInfo));
         ImportQueryFileRelay = new RelayCommand(ImportQueryFile);
+        CreateNewQueryFileRelay = new RelayCommand(CreateNewQueryFile);
         AddCommandParameterComboBoxRelay = new RelayCommand(AddParameterComboBoxInQueryBuilder);
         AddCommandComboBoxRelay = new RelayCommand(AddCommandComboBoxInQueryBuilder);
         RemoveCommandParameterComboBoxRelay = new RelayCommand(RemoveCommandParameterComboBoxInQueryBuilder);
@@ -347,6 +349,18 @@ private void DeleteQueryFromQueryStackPanel(object queryButton)
         }
     }
 
+    private void CreateNewQueryFile(object _)
+    {
+        // Saves/creates a new save file for the queries
+        SaveFileDialog saveFileDialog = new SaveFileDialog();
+        saveFileDialog.Filter = "Json files (*.json)|*.json|Text files (*.txt)|*.txt";
+        if (saveFileDialog.ShowDialog() == true)
+        {
+            File.WriteAllText(saveFileDialog.FileName, string.Empty);
+            _customQuery.CustomQueryFileLocation = saveFileDialog.FileName;
+        }
+    }
+
     private void LoadSavedQueriesFromFile()
     {
         try
@@ -372,7 +386,7 @@ private void ImportQueryFile(object _)
     {
         OpenFileDialog dialog = new() {
             FileName = "CustomQueries.dat", 
-            Filter = "All files(*.*) | *.*"
+            Filter = "Json files (*.json)|*.json|Text Files (*.txt)|*.txt"
         };
 
 
diff --git a/ActiveDirectoryQuerier/Queries/CustomQueries.cs b/ActiveDirectoryQuerier/Queries/CustomQueries.cs
index 02d9d93..511e1a3 100644
--- a/ActiveDirectoryQuerier/Queries/CustomQueries.cs
+++ b/ActiveDirectoryQuerier/Queries/CustomQueries.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Diagnostics;
+using System.Diagnostics;
 using System.IO;
 using System.Management.Automation.Runspaces;
 using System.Text.Json;
@@ -9,7 +8,7 @@
 namespace ActiveDirectoryQuerier.Queries;
 
 /// <summary>
-/// This class is used to save a json file named "CustomQueries.dat" inside of
+/// This class is used to save a json file named "CustomQueries.json" inside of
 /// \ActiveDirectoryQuerier\ActiveDirectoryQuerier\bin\Debug\net6.0-windows This
 /// </summary>
 public class CustomQueries
@@ -37,7 +36,7 @@ public void SaveQueriesToJson()
             string serializedJsonQueries = JsonSerializer.Serialize(Queries, _options);
             if(CustomQueryFileLocation == "")
             {
-                File.WriteAllText("CustomQueries.dat", serializedJsonQueries);
+                File.WriteAllText("CustomQueries.json", serializedJsonQueries);
 
             } else
             {
@@ -46,7 +45,6 @@ public void SaveQueriesToJson()
         }
         catch (Exception ex)
         {
-
             MessageBox.Show(ex.Message);
         }
     }
@@ -83,7 +81,7 @@ public void SerializeCommand(Command? psCommand, string queryName, string queryD
             string serializedJsonQueries = JsonSerializer.Serialize(Queries, _options);
             if (CustomQueryFileLocation == "")
             {
-                File.WriteAllText("CustomQueries.dat", serializedJsonQueries);
+                File.WriteAllText("CustomQueries.json", serializedJsonQueries);
 
             }
             else
@@ -107,8 +105,14 @@ public void LoadData()
             string json;
             if (CustomQueryFileLocation == "")
             {
-                json = File.ReadAllText("CustomQueries.dat");
-
+                if (File.Exists("CustomeQueries.json"))
+                {
+                    json = File.ReadAllText("CustomQueries.json");
+                }
+                else
+                {
+                    return;
+                }
             }
             else
             {
@@ -136,8 +140,7 @@ public void LoadData()
         }
         catch (Exception exception)
         {
-            
-            Trace.WriteLine(exception.Message);
+            MessageBox.Show(exception.Message);
         }
     }
 }
diff --git a/ActiveDirectoryQuerier/Queries/Query.cs b/ActiveDirectoryQuerier/Queries/Query.cs
index 828e72b..43b965e 100644
--- a/ActiveDirectoryQuerier/Queries/Query.cs
+++ b/ActiveDirectoryQuerier/Queries/Query.cs
@@ -3,7 +3,6 @@
 
 namespace ActiveDirectoryQuerier.Queries;
 
-// TODO: Remove property descriptions if name is descriptive enough, or provide a detailed description if it is not.
 public class Query
 {
     /// <summary>
@@ -15,19 +14,16 @@ public class Query
     /// <summary>
     /// Used for serializing the Command Name
     /// </summary>
-    // ReSharper disable once InconsistentNaming
     public string? PSCommandName { get; set; }
 
     /// <summary>
     /// Used for Serializing the Commands parameters
     /// </summary>
-    // ReSharper disable once InconsistentNaming
     public string[]? PSCommandParameters { get; set; }
 
     /// <summary>
     /// Used for Serializing the Commands parameters
     /// </summary>
-    // ReSharper disable once InconsistentNaming
     public string[]? PSCommandParameterValues { get; set; }
 
     /// <summary>