From da372c68ba0bd8ca0a00138f725ce3a99df2cda9 Mon Sep 17 00:00:00 2001
From: "Hunter T." <strangeranger@hthompson.dev>
Date: Fri, 5 Jan 2024 13:20:48 -0800
Subject: [PATCH 1/8] Add Figma docs info

---
 Docs/Figma/README.md | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 Docs/Figma/README.md

diff --git a/Docs/Figma/README.md b/Docs/Figma/README.md
new file mode 100644
index 0000000..fff779c
--- /dev/null
+++ b/Docs/Figma/README.md
@@ -0,0 +1,3 @@
+# Figma Demo
+
+This contains pictures/screenshots of the pre-coding design and demo of the application. Its purpose was to create a concept for what the gui might and should look like.

From 9da30ec8f60f9ebba23838073f92cffec94af105 Mon Sep 17 00:00:00 2001
From: J0seph0 <103216770+J0seph0@users.noreply.github.com>
Date: Sat, 6 Jan 2024 11:17:33 -0800
Subject: [PATCH 2/8] Working on serialiazation to work

---
 FAFB-PowerShell-Tool/MainWindow.xaml          |  2 +-
 FAFB-PowerShell-Tool/MainWindow.xaml.cs       | 36 +++++++++++++
 .../PowerShell/CustomQueries.cs               | 53 +++++++++++++++++++
 3 files changed, 90 insertions(+), 1 deletion(-)
 create mode 100644 FAFB-PowerShell-Tool/PowerShell/CustomQueries.cs

diff --git a/FAFB-PowerShell-Tool/MainWindow.xaml b/FAFB-PowerShell-Tool/MainWindow.xaml
index ec32e31..5d710bc 100644
--- a/FAFB-PowerShell-Tool/MainWindow.xaml
+++ b/FAFB-PowerShell-Tool/MainWindow.xaml
@@ -43,7 +43,7 @@
                 </Grid.Background>
 
                 <!-- Predefined Queries -->
-                <StackPanel x:Name="ButtonStackPanel">
+                <StackPanel x:Name="ButtonStackPanel" >
                     <Button x:Name="SampleOne" Content="Sample 1" VerticalAlignment="Top" Height="49" Grid.Row="0"/>
                     <Button x:Name="SampleTwo" Content="Sample 2" Height="48"/>
                     <Button x:Name="SampleThree" Content="Sample 3" Height="50"/>
diff --git a/FAFB-PowerShell-Tool/MainWindow.xaml.cs b/FAFB-PowerShell-Tool/MainWindow.xaml.cs
index c756e27..48b9add 100644
--- a/FAFB-PowerShell-Tool/MainWindow.xaml.cs
+++ b/FAFB-PowerShell-Tool/MainWindow.xaml.cs
@@ -1,14 +1,24 @@
 using System.Collections.ObjectModel;
 using System.Diagnostics;
+using System.Management.Automation;
 using System.Text;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Input;
 using FAFB_PowerShell_Tool.PowerShell;
+using System.IO;
+using System.Runtime.Serialization.Formatters.Binary;
+using System.Xml.Serialization;
+using System.Text.Json;
+using System.Net.Security;
+
 
 namespace FAFB_PowerShell_Tool;
 
 public partial class MainWindow
 {
+    ObservableCollection<Command> saved_commands = new ObservableCollection<Command>();
+    List<Button> custom_buttons = new List<Button>();
     public MainWindow()
     {
         InitializeComponent();
@@ -21,6 +31,9 @@ private async void MainWindow_Loaded(object sender, RoutedEventArgs e)
         ObservableCollection<Command> list = await ActiveDirectoryCommands.GetActiveDirectoryCommands();
         comboBoxCommandList.ItemsSource = list;
         comboBoxCommandList.DisplayMemberPath = "CommandName";
+
+
+        FillCustomQueries();
     }
     
       /* NOTE: Temporary method for testing purposes only.
@@ -85,6 +98,7 @@ private async void MComboBoxSelectionChanged(object sender, SelectionChangedEven
     }
 
     // TODO: Test to see if this works as it should...
+    // TODO: Make the buttons able to save a command to them and have a universal class maybe for executing them
     private void MSaveQueryButton(object sender, RoutedEventArgs e)
     {
         // Try to get the content within the drop downs
@@ -96,17 +110,39 @@ private void MSaveQueryButton(object sender, RoutedEventArgs e)
 
             Button newButton = new()
             {
+               
                 Content = "Special Command",
                 Height = 48
             };
 
+            CustomQueries.CustomQueryButtons.Add(newButton);
             ButtonStackPanel.Children.Add(newButton);
+
+            //Stream stream = File.Open("CustomQueries.dat", FileMode.Create);
+            CustomQueries.SerializeMethod();
+            
         }
         catch (Exception ex)
         {
             Console.Write(ex);
         }
     }
+    /// <summary>
+    /// This Method is to fill the left had side query bar
+    /// </summary>
+    private void FillCustomQueries() {
+        try
+        {
+            CustomQueries.LoadData();
+
+            foreach (Button btn in CustomQueries.CustomQueryButtons)
+            {
+                ButtonStackPanel.Children.Add(btn);
+            }
+        }catch (Exception ex){ 
+            Trace.WriteLine(ex);
+        }
+    }
 
     // TODO: Test to see if this works as it should...
     private void ExecuteScriptEditorButton(object sender, RoutedEventArgs e)
diff --git a/FAFB-PowerShell-Tool/PowerShell/CustomQueries.cs b/FAFB-PowerShell-Tool/PowerShell/CustomQueries.cs
new file mode 100644
index 0000000..c8e9a76
--- /dev/null
+++ b/FAFB-PowerShell-Tool/PowerShell/CustomQueries.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Runtime.Serialization.Formatters.Binary;
+using System.Text;
+using System.Text.Json;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+
+namespace FAFB_PowerShell_Tool.PowerShell
+{
+    [Serializable()]
+    internal class CustomQueries : ISerializable
+    {
+        public static List<Button> CustomQueryButtons = new List<Button>();
+        
+        private static readonly JsonSerializerOptions _options = new()
+        {
+            PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+            WriteIndented = true,
+        };
+
+        public void GetObjectData(SerializationInfo info, StreamingContext context)
+        {
+            info.AddValue("CustomQueryButtons", CustomQueryButtons);
+        }
+
+        public CustomQueries(SerializationInfo info, StreamingContext context) {
+            CustomQueryButtons = (List<Button>)info.GetValue("CustomQueryButtons", typeof(List<Button>));
+        }
+
+        public static void SerializeMethod()
+        {
+
+            Stream stream = File.Open("CustomQueries.dat", FileMode.Create);
+            BinaryFormatter bf = new BinaryFormatter();
+            bf.Serialize(stream, CustomQueryButtons);
+            stream.Close();
+
+            //return JsonSerializer.Serialize(CustomQueryButtons, _options);
+        }
+
+        public static void LoadData() {
+
+            Stream stream = File.Open("CustomQueries.dat", FileMode.Open);
+            BinaryFormatter bf = new BinaryFormatter();
+            CustomQueryButtons = (List<Button>)bf.Deserialize(stream);
+            stream.Close();
+        }
+    }
+}

From 06378385c19e9f78eb433ce280dde583c36b1a64 Mon Sep 17 00:00:00 2001
From: J0seph0 <103216770+J0seph0@users.noreply.github.com>
Date: Sat, 6 Jan 2024 13:37:53 -0800
Subject: [PATCH 3/8] Implemented a json serialization for a query list tied to
 the buttons

---
 FAFB-PowerShell-Tool/MainWindow.xaml.cs       | 29 +++++---
 .../PowerShell/CustomQueries.cs               | 73 +++++++++++--------
 2 files changed, 62 insertions(+), 40 deletions(-)

diff --git a/FAFB-PowerShell-Tool/MainWindow.xaml.cs b/FAFB-PowerShell-Tool/MainWindow.xaml.cs
index 8e9b18b..ac84266 100644
--- a/FAFB-PowerShell-Tool/MainWindow.xaml.cs
+++ b/FAFB-PowerShell-Tool/MainWindow.xaml.cs
@@ -17,8 +17,9 @@ namespace FAFB_PowerShell_Tool;
 
 public partial class MainWindow
 {
-    ObservableCollection<Command> saved_commands = new ObservableCollection<Command>();
-    List<Button> custom_buttons = new List<Button>();
+    //Creates an instance to be able to serialize the queries 
+    CustomQueries CQ = new CustomQueries();
+    
     public MainWindow()
     {
         InitializeComponent();
@@ -66,7 +67,7 @@ private void MSaveQueryButton(object sender, RoutedEventArgs e)
         try
         {
             // Get the Command
-            Command? commandName = ComboBoxCommandList.SelectedValue as Command;
+            Command? command = ComboBoxCommandList.SelectedValue as Command;
             // string commandParameters = cmbParameters.Text;
 
             Button newButton = new()
@@ -75,12 +76,12 @@ private void MSaveQueryButton(object sender, RoutedEventArgs e)
                 Content = "Special Command",
                 Height = 48
             };
-
-            CustomQueries.CustomQueryButtons.Add(newButton);
+            //Adds the query to the Queries serializable list
+            CQ.Queries.Add(command.CommandName);
+            //Adds the button in the stack panel
             ButtonStackPanel.Children.Add(newButton);
-
-            //Stream stream = File.Open("CustomQueries.dat", FileMode.Create);
-            CustomQueries.SerializeMethod();
+            //Saves the Queries to the file
+            CQ.SerializeMethod();
             
         }
         catch (Exception ex)
@@ -94,11 +95,17 @@ private void MSaveQueryButton(object sender, RoutedEventArgs e)
     private void FillCustomQueries() {
         try
         {
-            CustomQueries.LoadData();
+            CQ.LoadData();
 
-            foreach (Button btn in CustomQueries.CustomQueryButtons)
+            foreach (string cQuery in CQ.Queries)
             {
-                ButtonStackPanel.Children.Add(btn);
+                Button newButton = new()
+                {
+                    Content = "Special Command",
+                    Height = 48
+                };
+
+                ButtonStackPanel.Children.Add(newButton);
             }
         }catch (Exception ex){ 
             Trace.WriteLine(ex);
diff --git a/FAFB-PowerShell-Tool/PowerShell/CustomQueries.cs b/FAFB-PowerShell-Tool/PowerShell/CustomQueries.cs
index c8e9a76..7721627 100644
--- a/FAFB-PowerShell-Tool/PowerShell/CustomQueries.cs
+++ b/FAFB-PowerShell-Tool/PowerShell/CustomQueries.cs
@@ -1,53 +1,68 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters.Binary;
 using System.Text;
 using System.Text.Json;
+using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 using System.Windows.Controls;
 
+
 namespace FAFB_PowerShell_Tool.PowerShell
 {
-    [Serializable()]
-    internal class CustomQueries : ISerializable
+    /// <summary>
+    /// This class is used to save a json file named "CustomQueries.dat" inside of \FAFB-PowerShell-Tool\FAFB-PowerShell-Tool\bin\Debug\net6.0-windows
+    /// This 
+    /// </summary>
+    /// <param name="Queries"></param>
+    internal class CustomQueries
     {
-        public static List<Button> CustomQueryButtons = new List<Button>();
-        
+        public List<string> Queries = new List<string>();
+        /// <summary>
+        /// This a variable for feeding options to the Json serializer
+        /// </summary>
         private static readonly JsonSerializerOptions _options = new()
         {
             PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
             WriteIndented = true,
+            ReferenceHandler = ReferenceHandler.Preserve,
         };
-
-        public void GetObjectData(SerializationInfo info, StreamingContext context)
+        /// <summary>
+        /// Emtpy Contructor
+        /// </summary>
+        public CustomQueries() { }
+        /// <summary>
+        /// This takes the Queries List and serializes it to a file
+        /// </summary>
+        public void SerializeMethod()
         {
-            info.AddValue("CustomQueryButtons", CustomQueryButtons);
-        }
-
-        public CustomQueries(SerializationInfo info, StreamingContext context) {
-            CustomQueryButtons = (List<Button>)info.GetValue("CustomQueryButtons", typeof(List<Button>));
+            try
+            {
+                string json = JsonSerializer.Serialize(Queries, _options);
+                File.WriteAllText("CustomQueries.dat", json);
+            }
+            catch(Exception ex)
+            {
+                Trace.WriteLine(ex);
+            }
         }
-
-        public static void SerializeMethod()
-        {
-
-            Stream stream = File.Open("CustomQueries.dat", FileMode.Create);
-            BinaryFormatter bf = new BinaryFormatter();
-            bf.Serialize(stream, CustomQueryButtons);
-            stream.Close();
-
-            //return JsonSerializer.Serialize(CustomQueryButtons, _options);
-        }
-
-        public static void LoadData() {
-
-            Stream stream = File.Open("CustomQueries.dat", FileMode.Open);
-            BinaryFormatter bf = new BinaryFormatter();
-            CustomQueryButtons = (List<Button>)bf.Deserialize(stream);
-            stream.Close();
+        /// <summary>
+        /// This method Loads the string from the saved file "CustomQueries.dat" then gives it to the Queries List
+        /// </summary>
+        public void LoadData() {
+            try
+            {
+                string json = File.ReadAllText("CustomQueries.dat");
+                Queries = JsonSerializer.Deserialize<List<string>>(json, _options);
+            }
+            catch (Exception ex)
+            {
+                Trace.WriteLine(ex);    
+            }
         }
     }
 }

From 8bd5056fe656c27f34dd55def57c2b8f696e8e7e Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Sat, 6 Jan 2024 13:59:37 -0800
Subject: [PATCH 4/8] Format with clang-format

---
 FAFB-PowerShell-Tool.Tests/CommandTest.cs     | 10 ++--
 .../PowerShellExecutorTest.cs                 |  4 +-
 FAFB-PowerShell-Tool/MainWindow.xaml.cs       | 46 +++++++++----------
 FAFB-PowerShell-Tool/MessageBoxOutput.cs      | 40 ++++++++--------
 .../PowerShell/ActiveDirectoryCommands.cs     | 19 ++++----
 FAFB-PowerShell-Tool/PowerShell/Command.cs    | 26 ++++++-----
 .../PowerShell/CustomQueries.cs               | 18 ++++----
 .../PowerShell/ExecuteReturnValues.cs         |  2 +-
 .../PowerShell/PowerShellExecutor.cs          |  7 ++-
 9 files changed, 86 insertions(+), 86 deletions(-)

diff --git a/FAFB-PowerShell-Tool.Tests/CommandTest.cs b/FAFB-PowerShell-Tool.Tests/CommandTest.cs
index 3080f47..9c56b88 100644
--- a/FAFB-PowerShell-Tool.Tests/CommandTest.cs
+++ b/FAFB-PowerShell-Tool.Tests/CommandTest.cs
@@ -11,20 +11,20 @@ public void CommandNameIsCorrect()
         Command command = new("Get-ADUser");
         Assert.AreEqual("Get-ADUser", command.CommandName);
     }
-    
+
     [TestMethod]
     public void CommandNameIsTrimmed()
     {
         Command command = new(" Get-ADUser ");
         Assert.AreEqual("Get-ADUser", command.CommandName);
     }
-    
+
     [TestMethod]
     public void CommandNameThrowsArgumentExceptionWhenNull()
     {
         Assert.ThrowsException<ArgumentException>(() => new Command(null!));
     }
-    
+
     [TestMethod]
     public void CommandNameThrowsArgumentExceptionWhenWhitespace()
     {
@@ -32,11 +32,11 @@ public void CommandNameThrowsArgumentExceptionWhenWhitespace()
         Assert.ThrowsException<ArgumentException>(() => new Command(" "));
         Assert.ThrowsException<ArgumentException>(() => new Command(string.Empty));
     }
-    
+
     [TestMethod]
     public void PossibleParametersThrowsInvalidOperationExceptionWhenEmpty()
     {
         Command command = new("Get-ADUser");
         Assert.ThrowsException<InvalidOperationException>(() => command.PossibleParameters);
     }
-}
\ No newline at end of file
+}
diff --git a/FAFB-PowerShell-Tool.Tests/PowerShellExecutorTest.cs b/FAFB-PowerShell-Tool.Tests/PowerShellExecutorTest.cs
index fc4d7bf..7a5141c 100644
--- a/FAFB-PowerShell-Tool.Tests/PowerShellExecutorTest.cs
+++ b/FAFB-PowerShell-Tool.Tests/PowerShellExecutorTest.cs
@@ -6,7 +6,7 @@ namespace FAFB_PowerShell_Tool.Tests;
 public class PowerShellExecutorTest
 {
     private readonly PowerShellExecutor _powerShellExecutor = new();
-    
+
     [TestMethod]
     public void ThrowArgumentNullExceptionWhenCommandTextIsNullOrWhitespace()
     {
@@ -14,4 +14,4 @@ public void ThrowArgumentNullExceptionWhenCommandTextIsNullOrWhitespace()
         Assert.ThrowsException<ArgumentException>(() => _powerShellExecutor.Execute(""));
         Assert.ThrowsException<ArgumentException>(() => _powerShellExecutor.Execute(" "));
     }
-}
\ No newline at end of file
+}
diff --git a/FAFB-PowerShell-Tool/MainWindow.xaml.cs b/FAFB-PowerShell-Tool/MainWindow.xaml.cs
index ac84266..8eee312 100644
--- a/FAFB-PowerShell-Tool/MainWindow.xaml.cs
+++ b/FAFB-PowerShell-Tool/MainWindow.xaml.cs
@@ -12,20 +12,19 @@
 using System.Text.Json;
 using System.Net.Security;
 
-
 namespace FAFB_PowerShell_Tool;
 
 public partial class MainWindow
 {
-    //Creates an instance to be able to serialize the queries 
+    // Creates an instance to be able to serialize the queries
     CustomQueries CQ = new CustomQueries();
-    
+
     public MainWindow()
     {
         InitializeComponent();
         Loaded += MainWindow_Loaded; // Allows for async method to be called in the Loaded event.
     }
-    
+
     /// <summary>
     /// This method is used to populate the first ComboBox with the commands that are available.
     /// </summary>
@@ -38,10 +37,9 @@ private async void MainWindow_Loaded(object sender, RoutedEventArgs e)
         comboBoxCommandList.ItemsSource = list;
         comboBoxCommandList.DisplayMemberPath = "CommandName";
 
-
         FillCustomQueries();
     }
-    
+
     /// <summary>
     /// This method is used to populate the second ComboBox with the parameters of the selected command.
     /// </summary>
@@ -51,11 +49,14 @@ private async void MComboBoxSelectionChanged(object sender, SelectionChangedEven
     {
         ComboBox comboBox = sender as ComboBox ?? throw new InvalidOperationException();
 
-        if (comboBox.SelectedItem is not Command selectedCommand) { return; }
-        
+        if (comboBox.SelectedItem is not Command selectedCommand)
+        {
+            return;
+        }
+
         // Set the ItemsSource for the parameters ComboBox.
         ComboBox comboBoxParameters = ComboBoxCommandParameterList;
-        await selectedCommand.LoadCommandParametersAsync();  // Lazy loading.
+        await selectedCommand.LoadCommandParametersAsync(); // Lazy loading.
         comboBoxParameters.ItemsSource = selectedCommand.PossibleParameters;
     }
 
@@ -70,19 +71,17 @@ private void MSaveQueryButton(object sender, RoutedEventArgs e)
             Command? command = ComboBoxCommandList.SelectedValue as Command;
             // string commandParameters = cmbParameters.Text;
 
-            Button newButton = new()
-            {
-               
+            Button newButton = new() {
+
                 Content = "Special Command",
                 Height = 48
             };
-            //Adds the query to the Queries serializable list
+            // Adds the query to the Queries serializable list
             CQ.Queries.Add(command.CommandName);
-            //Adds the button in the stack panel
+            // Adds the button in the stack panel
             ButtonStackPanel.Children.Add(newButton);
-            //Saves the Queries to the file
+            // Saves the Queries to the file
             CQ.SerializeMethod();
-            
         }
         catch (Exception ex)
         {
@@ -92,22 +91,21 @@ private void MSaveQueryButton(object sender, RoutedEventArgs e)
     /// <summary>
     /// This Method is to fill the left had side query bar
     /// </summary>
-    private void FillCustomQueries() {
+    private void FillCustomQueries()
+    {
         try
         {
             CQ.LoadData();
 
             foreach (string cQuery in CQ.Queries)
             {
-                Button newButton = new()
-                {
-                    Content = "Special Command",
-                    Height = 48
-                };
+                Button newButton = new() { Content = "Special Command", Height = 48 };
 
                 ButtonStackPanel.Children.Add(newButton);
             }
-        }catch (Exception ex){ 
+        }
+        catch (Exception ex)
+        {
             Trace.WriteLine(ex);
         }
     }
@@ -137,4 +135,4 @@ private void ExecuteScriptEditorButton(object sender, RoutedEventArgs e)
             MessageBoxOutput.Show(ex.Message, MessageBoxOutput.OutputType.InternalError);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/FAFB-PowerShell-Tool/MessageBoxOutput.cs b/FAFB-PowerShell-Tool/MessageBoxOutput.cs
index bff26a1..baae8a5 100644
--- a/FAFB-PowerShell-Tool/MessageBoxOutput.cs
+++ b/FAFB-PowerShell-Tool/MessageBoxOutput.cs
@@ -12,33 +12,33 @@ public enum OutputType
         Warning,
         Generic
     }
-    
+
     public static void Show(string message, OutputType type)
     {
         switch (type)
         {
-            case OutputType.Error:
-                MessageBox.Show(message, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                break;
-            case OutputType.InternalError:
-                MessageBox.Show(message, "Internal Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                break;
-            case OutputType.Information:
-                MessageBox.Show(message, "Information", MessageBoxButton.OK, MessageBoxImage.Information);
-                break;
-            case OutputType.Warning:
-                MessageBox.Show(message, "Warning", MessageBoxButton.OK, MessageBoxImage.Warning);
-                break;
-            case OutputType.Generic:
-                MessageBox.Show(message, "Command Output", MessageBoxButton.OK, MessageBoxImage.None);
-                break;
-            default:
-                throw new ArgumentOutOfRangeException(nameof(type), type, null);
+        case OutputType.Error:
+            MessageBox.Show(message, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+            break;
+        case OutputType.InternalError:
+            MessageBox.Show(message, "Internal Error", MessageBoxButton.OK, MessageBoxImage.Error);
+            break;
+        case OutputType.Information:
+            MessageBox.Show(message, "Information", MessageBoxButton.OK, MessageBoxImage.Information);
+            break;
+        case OutputType.Warning:
+            MessageBox.Show(message, "Warning", MessageBoxButton.OK, MessageBoxImage.Warning);
+            break;
+        case OutputType.Generic:
+            MessageBox.Show(message, "Command Output", MessageBoxButton.OK, MessageBoxImage.None);
+            break;
+        default:
+            throw new ArgumentOutOfRangeException(nameof(type), type, null);
         }
     }
-    
+
     public static void Show(string message)
     {
         Show(message, OutputType.Generic);
     }
-}
\ No newline at end of file
+}
diff --git a/FAFB-PowerShell-Tool/PowerShell/ActiveDirectoryCommands.cs b/FAFB-PowerShell-Tool/PowerShell/ActiveDirectoryCommands.cs
index 471847f..9da7260 100644
--- a/FAFB-PowerShell-Tool/PowerShell/ActiveDirectoryCommands.cs
+++ b/FAFB-PowerShell-Tool/PowerShell/ActiveDirectoryCommands.cs
@@ -9,14 +9,15 @@ public static async Task<ObservableCollection<Command>> GetActiveDirectoryComman
     {
         PowerShellExecutor powerShellExecutor = new();
         ObservableCollection<Command> commandList = new();
-        ExecuteReturnValues commandListTemp = await powerShellExecutor.ExecuteAsync("Get-Command -Module ActiveDirectory");
-        
-         if (commandListTemp.HadErrors)
-         {
-             MessageBoxOutput.Show(string.Join(" ", commandListTemp.StdOut), MessageBoxOutput.OutputType.Error);
-             throw new InvalidPowerShellStateException(); // TODO: ???
-         }
-        
+        ExecuteReturnValues commandListTemp =
+            await powerShellExecutor.ExecuteAsync("Get-Command -Module ActiveDirectory");
+
+        if (commandListTemp.HadErrors)
+        {
+            MessageBoxOutput.Show(string.Join(" ", commandListTemp.StdOut), MessageBoxOutput.OutputType.Error);
+            throw new InvalidPowerShellStateException(); // TODO: ???
+        }
+
         foreach (var command in commandListTemp.StdOut)
         {
             commandList.Add(new Command(command));
@@ -24,4 +25,4 @@ public static async Task<ObservableCollection<Command>> GetActiveDirectoryComman
 
         return commandList;
     }
-}
\ No newline at end of file
+}
diff --git a/FAFB-PowerShell-Tool/PowerShell/Command.cs b/FAFB-PowerShell-Tool/PowerShell/Command.cs
index dda5124..b102781 100644
--- a/FAFB-PowerShell-Tool/PowerShell/Command.cs
+++ b/FAFB-PowerShell-Tool/PowerShell/Command.cs
@@ -8,13 +8,12 @@ public class Command
     public string CommandName
     {
         get => _commandName;
-        init
-        {
+        init {
             if (string.IsNullOrWhiteSpace(value))
             {
                 throw new ArgumentException("Command name cannot be null or whitespace.", nameof(CommandName));
             }
-            
+
             _commandName = value.Trim();
         }
     }
@@ -25,19 +24,22 @@ public string CommandName
     private readonly ObservableCollection<string> _possibleParameters = new();
     public ObservableCollection<string> PossibleParameters
     {
-        get
-        {
-            if (_possibleParameters.Count != 0) { return _possibleParameters; }
-            throw new InvalidOperationException("PossibleParameters has not been populated via 'LoadCommandParametersAsync'.");
+        get {
+            if (_possibleParameters.Count != 0)
+            {
+                return _possibleParameters;
+            }
+            throw new InvalidOperationException(
+                "PossibleParameters has not been populated via 'LoadCommandParametersAsync'.");
         }
     }
-    
+
     public Command(string commandName, string[]? parameters = null)
     {
         CommandName = commandName;
         Parameters = parameters;
     }
-    
+
     /// <summary>
     /// Retrieves a collection of parameter names for '_commandName'.
     /// </summary>
@@ -47,13 +49,13 @@ public async Task LoadCommandParametersAsync()
         if (_possibleParameters.Count == 0)
         {
             PowerShellExecutor powerShellExecutor = new();
-            ExecuteReturnValues tmpList = await powerShellExecutor.ExecuteAsync("Get-Command " + _commandName + " | Select -ExpandProperty Parameters | ForEach-Object { $_.Keys }");
-                    
+            ExecuteReturnValues tmpList = await powerShellExecutor.ExecuteAsync(
+                "Get-Command " + _commandName + " | Select -ExpandProperty Parameters | ForEach-Object { $_.Keys }");
+
             foreach (var command in tmpList.StdOut)
             {
                 _possibleParameters.Add("-" + command);
             }
         }
-        
     }
 }
diff --git a/FAFB-PowerShell-Tool/PowerShell/CustomQueries.cs b/FAFB-PowerShell-Tool/PowerShell/CustomQueries.cs
index 7721627..33db34d 100644
--- a/FAFB-PowerShell-Tool/PowerShell/CustomQueries.cs
+++ b/FAFB-PowerShell-Tool/PowerShell/CustomQueries.cs
@@ -11,12 +11,11 @@
 using System.Threading.Tasks;
 using System.Windows.Controls;
 
-
 namespace FAFB_PowerShell_Tool.PowerShell
 {
     /// <summary>
-    /// This class is used to save a json file named "CustomQueries.dat" inside of \FAFB-PowerShell-Tool\FAFB-PowerShell-Tool\bin\Debug\net6.0-windows
-    /// This 
+    /// This class is used to save a json file named "CustomQueries.dat" inside of
+    /// \FAFB-PowerShell-Tool\FAFB-PowerShell-Tool\bin\Debug\net6.0-windows This
     /// </summary>
     /// <param name="Queries"></param>
     internal class CustomQueries
@@ -25,8 +24,7 @@ internal class CustomQueries
         /// <summary>
         /// This a variable for feeding options to the Json serializer
         /// </summary>
-        private static readonly JsonSerializerOptions _options = new()
-        {
+        private static readonly JsonSerializerOptions _options = new() {
             PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
             WriteIndented = true,
             ReferenceHandler = ReferenceHandler.Preserve,
@@ -34,7 +32,8 @@ internal class CustomQueries
         /// <summary>
         /// Emtpy Contructor
         /// </summary>
-        public CustomQueries() { }
+        public CustomQueries()
+        { }
         /// <summary>
         /// This takes the Queries List and serializes it to a file
         /// </summary>
@@ -45,7 +44,7 @@ public void SerializeMethod()
                 string json = JsonSerializer.Serialize(Queries, _options);
                 File.WriteAllText("CustomQueries.dat", json);
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 Trace.WriteLine(ex);
             }
@@ -53,7 +52,8 @@ public void SerializeMethod()
         /// <summary>
         /// This method Loads the string from the saved file "CustomQueries.dat" then gives it to the Queries List
         /// </summary>
-        public void LoadData() {
+        public void LoadData()
+        {
             try
             {
                 string json = File.ReadAllText("CustomQueries.dat");
@@ -61,7 +61,7 @@ public void LoadData() {
             }
             catch (Exception ex)
             {
-                Trace.WriteLine(ex);    
+                Trace.WriteLine(ex);
             }
         }
     }
diff --git a/FAFB-PowerShell-Tool/PowerShell/ExecuteReturnValues.cs b/FAFB-PowerShell-Tool/PowerShell/ExecuteReturnValues.cs
index 39ec469..a70889d 100644
--- a/FAFB-PowerShell-Tool/PowerShell/ExecuteReturnValues.cs
+++ b/FAFB-PowerShell-Tool/PowerShell/ExecuteReturnValues.cs
@@ -6,4 +6,4 @@ public class ExecuteReturnValues
     public List<string> StdOut { get; set; } = new();
     public List<string> StdErr { get; set; } = new();
     public List<string> StdWarn { get; set; } = new();
-}
\ No newline at end of file
+}
diff --git a/FAFB-PowerShell-Tool/PowerShell/PowerShellExecutor.cs b/FAFB-PowerShell-Tool/PowerShell/PowerShellExecutor.cs
index 1e61ebf..acfb6ae 100644
--- a/FAFB-PowerShell-Tool/PowerShell/PowerShellExecutor.cs
+++ b/FAFB-PowerShell-Tool/PowerShell/PowerShellExecutor.cs
@@ -2,7 +2,6 @@
 
 namespace FAFB_PowerShell_Tool.PowerShell;
 
-
 // TODO: Refactor Execute methods to reduce code duplication.
 // TODO: Modify to ensure it works new method of execution.
 public class PowerShellExecutor
@@ -26,7 +25,7 @@ public ExecuteReturnValues Execute(string commandText)
         {
             throw new ArgumentException("Command text cannot be null or whitespace.", nameof(commandText));
         }
-        
+
         _powerShell.AddScript(commandText);
 
         var results = _powerShell.Invoke();
@@ -51,7 +50,7 @@ public ExecuteReturnValues Execute(string commandText)
 
         return returnValues;
     }
-    
+
     public async Task<ExecuteReturnValues> ExecuteAsync(string commandText)
     {
         ExecuteReturnValues executeReturnValues = new();
@@ -61,7 +60,7 @@ public async Task<ExecuteReturnValues> ExecuteAsync(string commandText)
         {
             throw new ArgumentException("Command text cannot be null or whitespace.", nameof(commandText));
         }
-        
+
         _powerShell.AddScript(commandText);
 
         var results = await _powerShell.InvokeAsync().ConfigureAwait(false);

From 52b3289c5cc26ac9e49adf152a5d16d6e8ab800f Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Wed, 10 Jan 2024 14:54:24 -0800
Subject: [PATCH 5/8] Add console text section to query builder tab

---
 FAFB-PowerShell-Tool/MainWindow.xaml | 54 +++++++++++++++++++---------
 1 file changed, 37 insertions(+), 17 deletions(-)

diff --git a/FAFB-PowerShell-Tool/MainWindow.xaml b/FAFB-PowerShell-Tool/MainWindow.xaml
index 5d710bc..7d5b5ea 100644
--- a/FAFB-PowerShell-Tool/MainWindow.xaml
+++ b/FAFB-PowerShell-Tool/MainWindow.xaml
@@ -24,9 +24,9 @@
         <Grid Grid.Row="1">
             <!-- Define Columns for resizable area -->
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" MinWidth="1" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="3*" />
+                <ColumnDefinition Width="*" MinWidth="150" />
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="3*" MinWidth="150"/>
             </Grid.ColumnDefinitions>
 
             <!-- Left Side Query Bar (Content in first column) -->
@@ -34,6 +34,7 @@
                 <Grid.BindingGroup>
                     <BindingGroup/>
                 </Grid.BindingGroup>
+
                 <Grid.Background>
                     <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
                         <GradientStop Color="#FF616161" Offset="0"/>
@@ -44,7 +45,7 @@
 
                 <!-- Predefined Queries -->
                 <StackPanel x:Name="ButtonStackPanel" >
-                    <Button x:Name="SampleOne" Content="Sample 1" VerticalAlignment="Top" Height="49" Grid.Row="0"/>
+                    <Button x:Name="SampleOne" Content="Sample 1" VerticalAlignment="Top" Height="49"/>
                     <Button x:Name="SampleTwo" Content="Sample 2" Height="48"/>
                     <Button x:Name="SampleThree" Content="Sample 3" Height="50"/>
                 </StackPanel>
@@ -58,23 +59,42 @@
                 <Border BorderThickness="1" BorderBrush="Black" RenderTransformOrigin="0.516,0.595">
                     <TabControl>
                         <!-- Tab Items -->
-                        <TabItem Header="Main">
-                            <Grid Background="White">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="91*"/>
-                                    <ColumnDefinition Width="100*"/>
-                                    <ColumnDefinition Width="446*"/>
-                                </Grid.ColumnDefinitions>
-                                <!--<Button x:Name="ExecutionButton" Content="Execute" Click="MExecutionButton" HorizontalAlignment="Left" Margin="206,88,0,0" VerticalAlignment="Top" Height="49" Width="140"  Grid.Column="2"/>-->
-                            </Grid>
+                        <TabItem Header="Query Information">
+                            <!--<Grid Background="White">
+                                <Button x:Name="ExecutionButton" Content="Execute" Click="MExecutionButton" HorizontalAlignment="Left" Margin="206,88,0,0" VerticalAlignment="Top" Height="49" Width="140"  Grid.Column="2"/>
+                            </Grid>-->
                         </TabItem>
                         <!-- Tab Items -->
                         <TabItem Header="Query Builder">
-                            <Grid Background="#FFE5E5E5">
-                                <ComboBox x:Name="ComboBoxCommandList" SelectionChanged="MComboBoxSelectionChanged" HorizontalAlignment="Left" Margin="26,48,0,0" VerticalAlignment="Top" Width="216" BorderBrush="#FFD41818" Background="Black" IsEditable="True" />
-                                <ComboBox x:Name="ComboBoxCommandParameterList" HorizontalAlignment="Left" Margin="278,48,0,0" VerticalAlignment="Top" Width="212" IsEditable="True"/>
-                                <Button x:Name="SaveQueryButton" Click="MSaveQueryButton" Content="Save Query" HorizontalAlignment="Left" Margin="459,275,0,0" VerticalAlignment="Top" Height="29" Width="83" />
+                            <Grid Background="#FFE5E5E5" MinHeight="100">
+                                <!-- Define Rows -->
+                                <Grid.RowDefinitions>
+                                    <!-- TODO: Figure out why the bottom row isn't stopping at the specified min height!!! -->
+                                    <RowDefinition Height="Auto" MinHeight="100"/>
+                                    <RowDefinition Height="Auto"/>
+                                    <RowDefinition Height="5"/>
+                                    <RowDefinition Height="3*" MinHeight="100"/>
+                                </Grid.RowDefinitions>
+
+                                <Grid Grid.Row="0">
+                                    <!-- Existing Controls -->
+                                    <ComboBox x:Name="ComboBoxCommandList" SelectionChanged="MComboBoxSelectionChanged" HorizontalAlignment="Left" Margin="26,48,0,0" VerticalAlignment="Top" Width="216" BorderBrush="#FFD41818" Background="Black" IsEditable="True" Grid.Row="0"/>
+                                    <ComboBox x:Name="ComboBoxCommandParameterList" HorizontalAlignment="Left" Margin="278,48,0,0" VerticalAlignment="Top" Width="212" IsEditable="True" Grid.Row="0"/>
+                                </Grid>
+
+                                <Grid Grid.Row="1" Margin="12,16">
+                                    <Button x:Name="SaveQueryButton" Click="MSaveQueryButton" Content="Save Query" HorizontalAlignment="Right" VerticalAlignment="Top" Height="29" Width="83"/>
+                                </Grid>
+
+                                <!-- GridSplitter for resizing console area in the second row -->
+                                <GridSplitter Height="5" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Background="White" Grid.Row="2"/>
+
+                                <Grid Grid.Row="3">
+                                        <!-- TextBox as Console Output -->
+                                        <TextBox x:Name="ConsoleOutputTextBox" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="10" IsReadOnly="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto"/>
+                                </Grid>
                             </Grid>
+
                         </TabItem>
                         <!-- Tab Items -->
                         <TabItem Header="Script Editor" HorizontalAlignment="Center" >

From 89760fff71c0cac3abf4765dcf0ed0866664dd6d Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Wed, 10 Jan 2024 15:12:28 -0800
Subject: [PATCH 6/8] Add TODO

---
 FAFB-PowerShell-Tool/MainWindow.xaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/FAFB-PowerShell-Tool/MainWindow.xaml b/FAFB-PowerShell-Tool/MainWindow.xaml
index 7d5b5ea..fc97472 100644
--- a/FAFB-PowerShell-Tool/MainWindow.xaml
+++ b/FAFB-PowerShell-Tool/MainWindow.xaml
@@ -89,9 +89,10 @@
                                 <!-- GridSplitter for resizing console area in the second row -->
                                 <GridSplitter Height="5" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Background="White" Grid.Row="2"/>
 
+                                <!-- TODO: Figure out why I can't get the console to be resizable to the min height... -->
                                 <Grid Grid.Row="3">
-                                        <!-- TextBox as Console Output -->
-                                        <TextBox x:Name="ConsoleOutputTextBox" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="10" IsReadOnly="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto"/>
+                                    <!-- TextBox as Console Output -->
+                                    <TextBox x:Name="ConsoleOutputTextBox" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="10" IsReadOnly="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto"/>
                                 </Grid>
                             </Grid>
 

From cfd175957256a46f9a6190a4447fdd5b1a5717c0 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Wed, 10 Jan 2024 19:45:13 -0800
Subject: [PATCH 7/8] Several changes:

- Improved tests
- Modify command class to work as an interface...
- Refactor to reduce repeated code
- ETC.
---
 FAFB-PowerShell-Tool.Tests/CommandTest.cs     | 42 ---------
 FAFB-PowerShell-Tool.Tests/GuiCommandTest.cs  | 66 ++++++++++++++
 .../PowerShellExecutorTest.cs                 |  8 +-
 FAFB-PowerShell-Tool/MainWindow.xaml.cs       | 10 +-
 .../PowerShell/ActiveDirectoryCommands.cs     | 10 +-
 FAFB-PowerShell-Tool/PowerShell/Command.cs    | 61 -------------
 FAFB-PowerShell-Tool/PowerShell/GuiCommand.cs | 48 ++++++++++
 FAFB-PowerShell-Tool/PowerShell/ICommand.cs   |  8 ++
 .../PowerShell/InternalCommand.cs             | 34 +++++++
 .../PowerShell/PowerShellExecutor.cs          | 91 +++++++++----------
 10 files changed, 213 insertions(+), 165 deletions(-)
 delete mode 100644 FAFB-PowerShell-Tool.Tests/CommandTest.cs
 create mode 100644 FAFB-PowerShell-Tool.Tests/GuiCommandTest.cs
 delete mode 100644 FAFB-PowerShell-Tool/PowerShell/Command.cs
 create mode 100644 FAFB-PowerShell-Tool/PowerShell/GuiCommand.cs
 create mode 100644 FAFB-PowerShell-Tool/PowerShell/ICommand.cs
 create mode 100644 FAFB-PowerShell-Tool/PowerShell/InternalCommand.cs

diff --git a/FAFB-PowerShell-Tool.Tests/CommandTest.cs b/FAFB-PowerShell-Tool.Tests/CommandTest.cs
deleted file mode 100644
index 9c56b88..0000000
--- a/FAFB-PowerShell-Tool.Tests/CommandTest.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using FAFB_PowerShell_Tool.PowerShell;
-
-namespace FAFB_PowerShell_Tool.Tests;
-
-[TestClass]
-public class CommandTest
-{
-    [TestMethod]
-    public void CommandNameIsCorrect()
-    {
-        Command command = new("Get-ADUser");
-        Assert.AreEqual("Get-ADUser", command.CommandName);
-    }
-
-    [TestMethod]
-    public void CommandNameIsTrimmed()
-    {
-        Command command = new(" Get-ADUser ");
-        Assert.AreEqual("Get-ADUser", command.CommandName);
-    }
-
-    [TestMethod]
-    public void CommandNameThrowsArgumentExceptionWhenNull()
-    {
-        Assert.ThrowsException<ArgumentException>(() => new Command(null!));
-    }
-
-    [TestMethod]
-    public void CommandNameThrowsArgumentExceptionWhenWhitespace()
-    {
-        Assert.ThrowsException<ArgumentException>(() => new Command(""));
-        Assert.ThrowsException<ArgumentException>(() => new Command(" "));
-        Assert.ThrowsException<ArgumentException>(() => new Command(string.Empty));
-    }
-
-    [TestMethod]
-    public void PossibleParametersThrowsInvalidOperationExceptionWhenEmpty()
-    {
-        Command command = new("Get-ADUser");
-        Assert.ThrowsException<InvalidOperationException>(() => command.PossibleParameters);
-    }
-}
diff --git a/FAFB-PowerShell-Tool.Tests/GuiCommandTest.cs b/FAFB-PowerShell-Tool.Tests/GuiCommandTest.cs
new file mode 100644
index 0000000..5632439
--- /dev/null
+++ b/FAFB-PowerShell-Tool.Tests/GuiCommandTest.cs
@@ -0,0 +1,66 @@
+using FAFB_PowerShell_Tool.PowerShell;
+
+namespace FAFB_PowerShell_Tool.Tests;
+
+[TestClass]
+public class GuiCommandTest
+{
+    [TestMethod]
+    public void CommandNameIsCorrect()
+    {
+        GuiCommand guiCommand = new("Get-ADUser");
+        Assert.AreEqual("Get-ADUser", guiCommand.CommandName);
+    }
+
+    [TestMethod]
+    public void CommandNameThrowsArgumentExceptionWhenNull()
+    {
+        Assert.ThrowsException<ArgumentException>(() => new GuiCommand(null!));
+    }
+
+    [TestMethod]
+    public void CommandNameThrowsArgumentExceptionWhenWhitespace()
+    {
+        Assert.ThrowsException<ArgumentException>(() => new GuiCommand(""));
+        Assert.ThrowsException<ArgumentException>(() => new GuiCommand(" "));
+        Assert.ThrowsException<ArgumentException>(() => new GuiCommand(string.Empty));
+    }
+
+    [TestMethod]
+    public void PossibleParametersThrowsInvalidOperationExceptionWhenEmpty()
+    {
+        GuiCommand guiCommand = new("Get-ADUser");
+        Assert.ThrowsException<InvalidOperationException>(() => guiCommand.PossibleParameters);
+    }
+    
+    [TestMethod]
+    public void PossibleParametersReturnsCorrectly()
+    {
+        GuiCommand guiCommand = new("Get-ADUser");
+        guiCommand.LoadCommandParametersAsync().Wait();
+        Assert.IsTrue(guiCommand.PossibleParameters.Contains("-Identity"));
+        Assert.IsTrue(guiCommand.PossibleParameters.Count > 0);
+    }
+    
+    [TestMethod]
+    public void PossibleParametersReturnsCorrectlyWhenCalledTwice()
+    {
+        GuiCommand guiCommand = new("Get-ADUser");
+        guiCommand.LoadCommandParametersAsync().Wait();
+        guiCommand.LoadCommandParametersAsync().Wait();
+        Assert.IsTrue(guiCommand.PossibleParameters.Contains("-Identity"));
+        Assert.IsTrue(guiCommand.PossibleParameters.Count > 0);
+        Assert.AreEqual(guiCommand.PossibleParameters.Count, guiCommand.PossibleParameters.Distinct().Count());
+    }
+    
+    [TestMethod]
+    public void TestParameters()
+    {
+        GuiCommand guiCommand = new("Get-ADUser")
+        {
+            Parameters = new[] {"-Identity", "FAFB-Admin"}
+        };
+        Assert.AreEqual(guiCommand.Parameters[0], "-Identity");
+        Assert.AreEqual(guiCommand.Parameters[1], "FAFB-Admin");
+    }
+}
diff --git a/FAFB-PowerShell-Tool.Tests/PowerShellExecutorTest.cs b/FAFB-PowerShell-Tool.Tests/PowerShellExecutorTest.cs
index 7a5141c..517f4b6 100644
--- a/FAFB-PowerShell-Tool.Tests/PowerShellExecutorTest.cs
+++ b/FAFB-PowerShell-Tool.Tests/PowerShellExecutorTest.cs
@@ -5,13 +5,9 @@ namespace FAFB_PowerShell_Tool.Tests;
 [TestClass]
 public class PowerShellExecutorTest
 {
-    private readonly PowerShellExecutor _powerShellExecutor = new();
-
     [TestMethod]
-    public void ThrowArgumentNullExceptionWhenCommandTextIsNullOrWhitespace()
+    public void ExecuteGeneratesStdOut()
     {
-        Assert.ThrowsException<ArgumentException>(() => _powerShellExecutor.Execute(null!));
-        Assert.ThrowsException<ArgumentException>(() => _powerShellExecutor.Execute(""));
-        Assert.ThrowsException<ArgumentException>(() => _powerShellExecutor.Execute(" "));
+        
     }
 }
diff --git a/FAFB-PowerShell-Tool/MainWindow.xaml.cs b/FAFB-PowerShell-Tool/MainWindow.xaml.cs
index 8eee312..3bcafc7 100644
--- a/FAFB-PowerShell-Tool/MainWindow.xaml.cs
+++ b/FAFB-PowerShell-Tool/MainWindow.xaml.cs
@@ -33,7 +33,7 @@ public MainWindow()
     private async void MainWindow_Loaded(object sender, RoutedEventArgs e)
     {
         ComboBox comboBoxCommandList = ComboBoxCommandList;
-        ObservableCollection<Command> list = await ActiveDirectoryCommands.GetActiveDirectoryCommands();
+        ObservableCollection<GuiCommand> list = await ActiveDirectoryCommands.GetActiveDirectoryCommands();
         comboBoxCommandList.ItemsSource = list;
         comboBoxCommandList.DisplayMemberPath = "CommandName";
 
@@ -49,7 +49,7 @@ private async void MComboBoxSelectionChanged(object sender, SelectionChangedEven
     {
         ComboBox comboBox = sender as ComboBox ?? throw new InvalidOperationException();
 
-        if (comboBox.SelectedItem is not Command selectedCommand)
+        if (comboBox.SelectedItem is not GuiCommand selectedCommand)
         {
             return;
         }
@@ -68,7 +68,7 @@ private void MSaveQueryButton(object sender, RoutedEventArgs e)
         try
         {
             // Get the Command
-            Command? command = ComboBoxCommandList.SelectedValue as Command;
+            GuiCommand? command = ComboBoxCommandList.SelectedValue as GuiCommand;
             // string commandParameters = cmbParameters.Text;
 
             Button newButton = new() {
@@ -111,7 +111,7 @@ private void FillCustomQueries()
     }
 
     // TODO: Test to see if this works as it should...
-    private void ExecuteScriptEditorButton(object sender, RoutedEventArgs e)
+    /*private void ExecuteScriptEditorButton(object sender, RoutedEventArgs e)
     {
         string scriptEditorText = ScriptEditorTextBox.Text;
         PowerShellExecutor powerShellExecutor = new();
@@ -134,5 +134,5 @@ private void ExecuteScriptEditorButton(object sender, RoutedEventArgs e)
         {
             MessageBoxOutput.Show(ex.Message, MessageBoxOutput.OutputType.InternalError);
         }
-    }
+    }*/
 }
diff --git a/FAFB-PowerShell-Tool/PowerShell/ActiveDirectoryCommands.cs b/FAFB-PowerShell-Tool/PowerShell/ActiveDirectoryCommands.cs
index 9da7260..d39782d 100644
--- a/FAFB-PowerShell-Tool/PowerShell/ActiveDirectoryCommands.cs
+++ b/FAFB-PowerShell-Tool/PowerShell/ActiveDirectoryCommands.cs
@@ -5,12 +5,12 @@ namespace FAFB_PowerShell_Tool.PowerShell;
 
 public static class ActiveDirectoryCommands
 {
-    public static async Task<ObservableCollection<Command>> GetActiveDirectoryCommands()
+    public static async Task<ObservableCollection<GuiCommand>> GetActiveDirectoryCommands()
     {
         PowerShellExecutor powerShellExecutor = new();
-        ObservableCollection<Command> commandList = new();
-        ExecuteReturnValues commandListTemp =
-            await powerShellExecutor.ExecuteAsync("Get-Command -Module ActiveDirectory");
+        ObservableCollection<GuiCommand> commandList = new();
+        InternalCommand commandString = new("Get-Command", new[] { "-Module", "ActiveDirectory" });
+        ExecuteReturnValues commandListTemp = await powerShellExecutor.ExecuteAsync(commandString);
 
         if (commandListTemp.HadErrors)
         {
@@ -20,7 +20,7 @@ public static async Task<ObservableCollection<Command>> GetActiveDirectoryComman
 
         foreach (var command in commandListTemp.StdOut)
         {
-            commandList.Add(new Command(command));
+            commandList.Add(new GuiCommand(command));
         }
 
         return commandList;
diff --git a/FAFB-PowerShell-Tool/PowerShell/Command.cs b/FAFB-PowerShell-Tool/PowerShell/Command.cs
deleted file mode 100644
index b102781..0000000
--- a/FAFB-PowerShell-Tool/PowerShell/Command.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System.Collections.ObjectModel;
-
-namespace FAFB_PowerShell_Tool.PowerShell;
-
-public class Command
-{
-    private readonly string _commandName = null!;
-    public string CommandName
-    {
-        get => _commandName;
-        init {
-            if (string.IsNullOrWhiteSpace(value))
-            {
-                throw new ArgumentException("Command name cannot be null or whitespace.", nameof(CommandName));
-            }
-
-            _commandName = value.Trim();
-        }
-    }
-
-    // TODO: Figure out where the 'Parameters' property is used and if it is needed.
-    public string[]? Parameters { get; set; }
-
-    private readonly ObservableCollection<string> _possibleParameters = new();
-    public ObservableCollection<string> PossibleParameters
-    {
-        get {
-            if (_possibleParameters.Count != 0)
-            {
-                return _possibleParameters;
-            }
-            throw new InvalidOperationException(
-                "PossibleParameters has not been populated via 'LoadCommandParametersAsync'.");
-        }
-    }
-
-    public Command(string commandName, string[]? parameters = null)
-    {
-        CommandName = commandName;
-        Parameters = parameters;
-    }
-
-    /// <summary>
-    /// Retrieves a collection of parameter names for '_commandName'.
-    /// </summary>
-    /// <returns>A collection of parameter names for '_commandName'</returns>
-    public async Task LoadCommandParametersAsync()
-    {
-        if (_possibleParameters.Count == 0)
-        {
-            PowerShellExecutor powerShellExecutor = new();
-            ExecuteReturnValues tmpList = await powerShellExecutor.ExecuteAsync(
-                "Get-Command " + _commandName + " | Select -ExpandProperty Parameters | ForEach-Object { $_.Keys }");
-
-            foreach (var command in tmpList.StdOut)
-            {
-                _possibleParameters.Add("-" + command);
-            }
-        }
-    }
-}
diff --git a/FAFB-PowerShell-Tool/PowerShell/GuiCommand.cs b/FAFB-PowerShell-Tool/PowerShell/GuiCommand.cs
new file mode 100644
index 0000000..f11c032
--- /dev/null
+++ b/FAFB-PowerShell-Tool/PowerShell/GuiCommand.cs
@@ -0,0 +1,48 @@
+using System.Collections.ObjectModel;
+
+namespace FAFB_PowerShell_Tool.PowerShell;
+
+public class GuiCommand : InternalCommand
+{
+    private readonly ObservableCollection<string> _possibleParameters = new();
+    public ObservableCollection<string> PossibleParameters
+    {
+        get {
+            if (_possibleParameters.Count != 0)
+            {
+                return _possibleParameters;
+            }
+            throw new InvalidOperationException(
+                "PossibleParameters has not been populated via 'LoadCommandParametersAsync'.");
+        }
+    }
+    
+    /// <summary>
+    /// Commands that are intended to be selected and used via the GUI.
+    /// </summary>
+    /// <param name="commandName">...</param>
+    /// <param name="parameters">...</param>
+    public GuiCommand(string commandName, string[]? parameters = null) : base(commandName, parameters)
+    { }
+
+    /// <summary>
+    /// Retrieves a collection of parameter names for 'CommandName'.
+    /// </summary>
+    /// <returns>A collection of parameter names for 'CommandName'</returns>
+    public async Task LoadCommandParametersAsync()
+    {
+        
+        GuiCommand guiCommandString = new("Get-Command", new[] { CommandName, $"| Select -ExpandProperty Parameters | ForEach-Object {{ $_.Keys }}" });
+        
+        if (_possibleParameters.Count == 0)
+        {
+            PowerShellExecutor powerShellExecutor = new();
+            ExecuteReturnValues tmpList = await powerShellExecutor.ExecuteAsync(guiCommandString);
+
+            foreach (var command in tmpList.StdOut)
+            {
+                _possibleParameters.Add($"-{command}");
+            }
+        }
+    }
+}
diff --git a/FAFB-PowerShell-Tool/PowerShell/ICommand.cs b/FAFB-PowerShell-Tool/PowerShell/ICommand.cs
new file mode 100644
index 0000000..e442982
--- /dev/null
+++ b/FAFB-PowerShell-Tool/PowerShell/ICommand.cs
@@ -0,0 +1,8 @@
+namespace FAFB_PowerShell_Tool.PowerShell;
+
+public interface ICommand
+{
+    string CommandName { get; }
+    string[]? Parameters { get; set; }
+    string CommandString { get; }
+}
\ No newline at end of file
diff --git a/FAFB-PowerShell-Tool/PowerShell/InternalCommand.cs b/FAFB-PowerShell-Tool/PowerShell/InternalCommand.cs
new file mode 100644
index 0000000..ec47d17
--- /dev/null
+++ b/FAFB-PowerShell-Tool/PowerShell/InternalCommand.cs
@@ -0,0 +1,34 @@
+namespace FAFB_PowerShell_Tool.PowerShell;
+
+public class InternalCommand : ICommand
+{
+    public string CommandName { get; }
+    public string[]? Parameters { get; set; }
+    public string CommandString
+    {
+        get
+        {
+            if (Parameters is null) { return CommandName; }
+            return $"{CommandName} {string.Join(" ", Parameters)}";
+        }
+    }
+    
+    /// <summary>
+    /// Commands that are not intended to be used by the user, but rather by the program itself.
+    /// </summary>
+    /// <param name="commandName">...</param>
+    /// <param name="parameters">...</param>
+    /// <exception cref="ArgumentException">...</exception>
+    public InternalCommand(string commandName, string[]? parameters = null)
+    {
+        if (string.IsNullOrWhiteSpace(commandName))
+        {
+            // TODO: Maybe change from internal error to just error...
+            //MessageBoxOutput.Show("Command name cannot be null or whitespace.", MessageBoxOutput.OutputType.InternalError);
+            throw new ArgumentException("Command name cannot be null or whitespace.", nameof(commandName));
+        }
+        
+        CommandName = commandName;
+        Parameters = parameters;
+    }
+}
\ No newline at end of file
diff --git a/FAFB-PowerShell-Tool/PowerShell/PowerShellExecutor.cs b/FAFB-PowerShell-Tool/PowerShell/PowerShellExecutor.cs
index acfb6ae..c269bab 100644
--- a/FAFB-PowerShell-Tool/PowerShell/PowerShellExecutor.cs
+++ b/FAFB-PowerShell-Tool/PowerShell/PowerShellExecutor.cs
@@ -1,8 +1,8 @@
 using System.IO;
+using System.Management.Automation;
 
 namespace FAFB_PowerShell_Tool.PowerShell;
 
-// TODO: Refactor Execute methods to reduce code duplication.
 // TODO: Modify to ensure it works new method of execution.
 public class PowerShellExecutor
 {
@@ -16,34 +16,63 @@ public PowerShellExecutor()
         _powerShell.Commands.Clear();
     }
 
-    public ExecuteReturnValues Execute(string commandText)
+    public ExecuteReturnValues Execute<T>(T commandString) where T : ICommand
     {
-        ExecuteReturnValues returnValues = new();
-        const string filePath = "FAFB-PowerShell-Tool-Output.txt"; // For testing purposes only.
+        ValidateCommandString(commandString);
+        _powerShell.AddScript(commandString.CommandString);
+        var results = _powerShell.Invoke();
+        return ProcessPowerShellResults(results, false);
+    }
 
-        if (string.IsNullOrWhiteSpace(commandText))
+    public async Task<ExecuteReturnValues> ExecuteAsync<T>(T commandString) where T : ICommand
+    {
+        ValidateCommandString(commandString);
+        _powerShell.AddScript(commandString.CommandString);
+        var results = await _powerShell.InvokeAsync();
+        return await ProcessPowerShellResultsAsync(results);
+    }
+
+    private void ValidateCommandString<T>(T commandString) where T : ICommand
+    {
+        if (string.IsNullOrWhiteSpace(commandString.CommandString))
         {
-            throw new ArgumentException("Command text cannot be null or whitespace.", nameof(commandText));
+            MessageBoxOutput.Show("Command text cannot be null or whitespace.", MessageBoxOutput.OutputType.InternalError);
+            throw new ArgumentException("Command text cannot be null or whitespace.", nameof(commandString));
         }
+    }
 
-        _powerShell.AddScript(commandText);
-
-        var results = _powerShell.Invoke();
+    private ExecuteReturnValues ProcessPowerShellResults(IEnumerable<PSObject> results, bool isAsync)
+    {
+        ExecuteReturnValues returnValues = new();
+        const string filePath = "FAFB-PowerShell-Tool-Output.txt"; // For testing purposes only.
 
-        // TODO: Possibly include STDERR, STDOUT, etc., streams in the return values...
         if (_powerShell.HadErrors)
         {
             foreach (var error in _powerShell.Streams.Error)
             {
-                File.WriteAllText(filePath, "Error: " + error); // For testing purposes only.
-                returnValues.StdOut.Add("Error: " + error);
+                if (isAsync)
+                {
+                    File.WriteAllTextAsync(filePath, $"Error: {error}").Wait(); // For testing purposes only.
+                }
+                else
+                {
+                    File.WriteAllText(filePath, $"Error: {error}"); // For testing purposes only.
+                }
+                returnValues.StdErr.Add($"Error: {error}");
             }
         }
         else
         {
             foreach (var result in results)
             {
-                File.WriteAllText(filePath, result.ToString()); // For testing purposes only.
+                if (isAsync)
+                {
+                    File.WriteAllTextAsync(filePath, result.ToString()).Wait(); // For testing purposes only.
+                }
+                else
+                {
+                    File.WriteAllText(filePath, result.ToString()); // For testing purposes only.
+                }
                 returnValues.StdOut.Add(result.ToString());
             }
         }
@@ -51,40 +80,10 @@ public ExecuteReturnValues Execute(string commandText)
         return returnValues;
     }
 
-    public async Task<ExecuteReturnValues> ExecuteAsync(string commandText)
+    private Task<ExecuteReturnValues> ProcessPowerShellResultsAsync(IEnumerable<PSObject> results)
     {
-        ExecuteReturnValues executeReturnValues = new();
-        const string filePath = "FAFB-PowerShell-Tool-Output.txt"; // For testing purposes only.
-
-        if (string.IsNullOrWhiteSpace(commandText))
-        {
-            throw new ArgumentException("Command text cannot be null or whitespace.", nameof(commandText));
-        }
-
-        _powerShell.AddScript(commandText);
-
-        var results = await _powerShell.InvokeAsync().ConfigureAwait(false);
-
-        if (_powerShell.HadErrors)
-        {
-            executeReturnValues.HadErrors = true;
-            foreach (var error in _powerShell.Streams.Error)
-            {
-                await File.WriteAllTextAsync(filePath, "Error: " + error); // For testing purposes only.
-                executeReturnValues.StdOut.Add("Error: " + error);
-            }
-        }
-        else
-        {
-            executeReturnValues.HadErrors = false;
-            foreach (var result in results)
-            {
-                await File.WriteAllTextAsync(filePath, result.ToString()); // For testing purposes only.
-                executeReturnValues.StdOut.Add(result.ToString());
-            }
-        }
-
-        return executeReturnValues;
+        return Task.FromResult(ProcessPowerShellResults(results, true));
     }
+
 }
 

From 1ab6cb3e1e6227fc44ab57d2b23d43958cb84796 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Wed, 10 Jan 2024 19:54:19 -0800
Subject: [PATCH 8/8] Fix tests

---
 FAFB-PowerShell-Tool.Tests/GuiCommandTest.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FAFB-PowerShell-Tool.Tests/GuiCommandTest.cs b/FAFB-PowerShell-Tool.Tests/GuiCommandTest.cs
index 5632439..c11c912 100644
--- a/FAFB-PowerShell-Tool.Tests/GuiCommandTest.cs
+++ b/FAFB-PowerShell-Tool.Tests/GuiCommandTest.cs
@@ -8,8 +8,8 @@ public class GuiCommandTest
     [TestMethod]
     public void CommandNameIsCorrect()
     {
-        GuiCommand guiCommand = new("Get-ADUser");
-        Assert.AreEqual("Get-ADUser", guiCommand.CommandName);
+        InternalCommand internalCommand = new("Get-ADUser");
+        Assert.AreEqual("Get-ADUser",  internalCommand.CommandName);
     }
 
     [TestMethod]