diff --git a/ClientFaux/FauxDeployCMAgent.cs b/ClientFaux/FauxDeployCMAgent.cs
index 0c8dd45..e3e7e2b 100644
--- a/ClientFaux/FauxDeployCMAgent.cs
+++ b/ClientFaux/FauxDeployCMAgent.cs
@@ -1,20 +1,15 @@
 using Microsoft.ConfigurationManagement.Messaging.Framework;
 using Microsoft.ConfigurationManagement.Messaging.Messages;
 using Microsoft.ConfigurationManagement.Messaging.Sender.Http;
-using System.Web;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net;
 using System.Security.Cryptography.X509Certificates;
-using System.Text;
-using System.Threading.Tasks;
-using System.Management;
 using System.Diagnostics;
-using System.Xml;
 using static CMFaux.CMFauxStatusViewClasses;
 using Microsoft.ConfigurationManagement.Messaging.Messages.Server;
 using System.IO;
+using CERTENROLLLib;
 
 namespace CMFaux
 {
@@ -28,7 +23,6 @@ public static SmsClientId RegisterClient(string CMServerName, string ClientName,
             {
                 X509Certificate2 thisCert = new X509Certificate2(CertPath, pass);
 
-
                 Console.WriteLine(@"Using certificate for client authentication with thumbprint of '{0}'", certificate.Thumbprint);
                 Console.WriteLine("Signature Algorithm: " + thisCert.SignatureAlgorithm.FriendlyName);
 
@@ -164,8 +158,7 @@ public static void SendDiscovery(string CMServerName, string ClientName, string
                 //hinvMessage.Settings.Security.EncryptMessage = true;
                 hinvMessage.Discover();
 
-                var Classes = CMFauxStatusViewClasses.GetWMIClasses();
-
+                var Classes = CMFauxStatusViewClasses.GetWMIClasses();                
                 foreach (string Class in Classes)
                 {
 
@@ -188,7 +181,6 @@ public static void SendDiscovery(string CMServerName, string ClientName, string
                 hinvMessage.SendMessage(Sender);
             };
         }
-
         public static void SendCustomDiscovery(string CMServerName, string ClientName, string SiteCode, string FilePath, List<CustomClientRecord> customClientRecords)
         {
             string ddmLocal = FilePath + "\\DDRS\\" + ClientName;
@@ -212,7 +204,7 @@ public static void SendCustomDiscovery(string CMServerName, string ClientName, s
             FileInfo file = di.GetFiles().FirstOrDefault();
             
             File.Copy(file.FullName, CMddmInbox, true);
-            System.IO.Directory.Delete(ddmLocal);
+            System.IO.Directory.Delete(ddmLocal, true);
 
         }
         public static void GetPolicy(string CMServerName, string ClientName, string DomainName, string SiteCode, string outPutDirectory, string CertPath, string pass, SmsClientId clientId)
@@ -237,7 +229,7 @@ public static void GetPolicy(string CMServerName, string ClientName, string Doma
                 userPolicyMessage.Settings.Security.EncryptMessage = encryption;
                 userPolicyMessage.Settings.ReplyCompression = (true == replyCompression) ? MessageCompression.Zlib : MessageCompression.None;
                 userPolicyMessage.Settings.Compression = (true == compression) ? MessageCompression.Zlib : MessageCompression.None;
-                userPolicyMessage.SendMessage(Sender);
+                //userPolicyMessage.SendMessage(Sender);
 
                 ConfigMgrPolicyAssignmentRequest machinePolicyMessage = new ConfigMgrPolicyAssignmentRequest();
                 machinePolicyMessage.Settings.HostName = CMServerName;
@@ -249,11 +241,71 @@ public static void GetPolicy(string CMServerName, string ClientName, string Doma
                 machinePolicyMessage.SmsId = clientId;
                 machinePolicyMessage.SiteCode = SiteCode;
                 machinePolicyMessage.Discover();
-                machinePolicyMessage.SendMessage(Sender);
+                //machinePolicyMessage.SendMessage(Sender);
             }
 
         }
-    
+        public static X509Certificate2 CreateSelfSignedCertificate(string subjectName)
+        {
+            // create DN for subject and issuer
+            var dn = new CX500DistinguishedName();
+            dn.Encode("CN=" + subjectName, X500NameFlags.XCN_CERT_NAME_STR_NONE);
+            // create a new private key for the certificate
+            CX509PrivateKey privateKey = new CX509PrivateKey
+            {
+                ProviderName = "Microsoft Enhanced RSA and AES Cryptographic Provider",
+                MachineContext = false,
+                Length = 2048,
+                KeySpec = X509KeySpec.XCN_AT_SIGNATURE, // use is not limited
+                ExportPolicy = X509PrivateKeyExportFlags.XCN_NCRYPT_ALLOW_PLAINTEXT_EXPORT_FLAG
+            };
+            privateKey.Create();
+
+            // Use the stronger SHA512 hashing algorithm
+            var hashobj = new CObjectId();
+            hashobj.InitializeFromAlgorithmName(ObjectIdGroupId.XCN_CRYPT_HASH_ALG_OID_GROUP_ID,
+                ObjectIdPublicKeyFlags.XCN_CRYPT_OID_INFO_PUBKEY_ANY,
+                AlgorithmFlags.AlgorithmFlagsNone, "SHA256");
+
+            // add extended key usage if you want - look at MSDN for a list of possible OIDs
+            var oid = new CObjectId();
+            oid.InitializeFromValue("1.3.6.1.5.5.7.3.1"); // SSL server
+            var oidlist = new CObjectIds();
+            oidlist.Add(oid);
+            var eku = new CX509ExtensionEnhancedKeyUsage();
+            eku.InitializeEncode(oidlist);
+
+            // Create the self signing request
+            var cert = new CX509CertificateRequestCertificate();
+            cert.InitializeFromPrivateKey(X509CertificateEnrollmentContext.ContextUser, privateKey, "");
+            cert.Subject = dn;
+            cert.Issuer = dn; // the issuer and the subject are the same
+            cert.NotBefore = DateTime.Now;
+            // this cert expires immediately. Change to whatever makes sense for you
+            cert.NotAfter = DateTime.Now.AddYears(1);
+            cert.X509Extensions.Add((CX509Extension)eku); // add the EKU
+            cert.HashAlgorithm = hashobj; // Specify the hashing algorithm
+            cert.Encode(); // encode the certificate
+
+            // Do the final enrollment process
+            var enroll = new CX509Enrollment();
+            enroll.InitializeFromRequest(cert); // load the certificate
+            enroll.CertificateFriendlyName = subjectName; // Optional: add a friendly name
+            string csr = enroll.CreateRequest(); // Output the request in base64
+                                                 // and install it back as the response
+            enroll.InstallResponse(InstallResponseRestrictionFlags.AllowUntrustedCertificate,
+                csr, EncodingType.XCN_CRYPT_STRING_BASE64, ""); // no password
+                                                                // output a base64 encoded PKCS#12 so we can import it back to the .Net security classes
+            var base64encoded = enroll.CreatePFX("", // no password, this is for internal consumption
+                PFXExportOptions.PFXExportChainWithRoot);
+
+            // instantiate the target class with the PKCS#12 data (and the empty password)
+            return new System.Security.Cryptography.X509Certificates.X509Certificate2(
+                System.Convert.FromBase64String(base64encoded), "",
+                // mark the private key as exportable (this is usually what you want to do)
+                System.Security.Cryptography.X509Certificates.X509KeyStorageFlags.Exportable
+            );
+        }
     }   
 }
 
diff --git a/ClientFaux/MainWindow.xaml b/ClientFaux/MainWindow.xaml
index 7dbc805..b0e11bf 100644
--- a/ClientFaux/MainWindow.xaml
+++ b/ClientFaux/MainWindow.xaml
@@ -29,19 +29,20 @@
                             <RowDefinition Height="250"/>
                             <RowDefinition Height="500*"/>
                         </Grid.RowDefinitions>
-                        <!--<Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="550*" />
-                            <ColumnDefinition Width="400*" />
-                        </Grid.ColumnDefinitions>-->
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="700" />
+                        </Grid.ColumnDefinitions>
                         <Image Source="Images\CMFoxv1.0Logo.png" Stretch="Fill" Grid.Row="0" Grid.ColumnSpan="2"></Image>
                         <StackPanel HorizontalAlignment="Stretch" Grid.Column="0" Margin="10" Grid.Row="1">
                             <TextBlock TextWrapping="WrapWithOverflow" FontSize="16">When both are checked off, we're ready to go!</TextBlock>
                             <Label Name="CMSettingsStatusLabel" FontSize="16">CM Settings: ✔</Label>
                             <Label Name="DeviceNameStatusLabel" FontSize="16">Device Naming: ✔</Label>
                             <Button Content="Ready..." MaxWidth="280px" HorizontalAlignment="Left" MinWidth="120px" Background="LawnGreen" Name="CreateClientsButton" Click="CreateClientsButton_Click"/>
-                            <Expander Name="DeviceExpander">
-                                <StackPanel Margin="10">
-                                    <DataGrid Name="dgDevices" AutoGenerateColumns="False">
+                            <Label Name="ClientCount" FontSize="24">Device Count</Label>
+                            <Label Name="Counter" FontSize="24" Content="{Binding IdCounter}"/>
+                            <Expander Name="DeviceExpander" >
+                                <ContentControl HorizontalAlignment="Left" Margin="10,0,0,0" MaxWidth="700"> 
+                                    <DataGrid Name="dgDevices" AutoGenerateColumns="False" MaxHeight="500">
                                         <DataGrid.Columns>
                                             <DataGridTextColumn Header="Name" Binding="{Binding Name}" IsReadOnly="True"/>
                                             <DataGridTextColumn Header="Status" Binding="{Binding Status}" IsReadOnly="True" />
@@ -77,7 +78,7 @@
                                             </DataTemplate>
                                         </DataGrid.RowDetailsTemplate>
                                     </DataGrid>
-                                </StackPanel>
+                                </ContentControl>
                             </Expander>
                         </StackPanel>
                     </Grid>
@@ -108,7 +109,9 @@
                             <Label>Starting Number</Label>
                             <TextBox ToolTip="The starting digit when making multiple clients, something like [10]." Name="StartingNumber" PreviewTextInput="TextBox_OnStartingButtonTextInput" Width="20px" HorizontalAlignment="Left" Margin="0,0,10,0" TextChanged="textChangedEventHandler"></TextBox>
                             <Label>Ending Number</Label>
-                            <TextBox ToolTip="The ending digit when making multiple clients, something like [20]." Name="EndingNumber" PreviewTextInput="TextBox_OnEndingButtonTextInput" Width="20px" HorizontalAlignment="Left" Margin="0,0,30,0" TextChanged="textChangedEventHandler"></TextBox>
+                            <TextBox ToolTip="The ending digit when making multiple clients, something like [20]." Name="EndingNumber" PreviewTextInput="TextBox_OnEndingButtonTextInput" Width="45px" HorizontalAlignment="Left" Margin="0,0,30,0" TextChanged="textChangedEventHandler"></TextBox>
+                            <Label>Maximum Threads</Label>
+                            <TextBox ToolTip="How many threads woudl you like to use?  Seven will max out even very beefy systems." Name="MaximumThreads" PreviewTextInput="TextBox_OnEndingButtonTextInput" Width="20px" HorizontalAlignment="Left" Margin="0,0,30,0" TextChanged="MaximumThreads_TextChanged"></TextBox>
                             <Label>Number of Fake CM Clients to be created </Label>
                             <TextBlock Name="NumberOfClients" Foreground="#FF1053CD">Count will appear here</TextBlock>
                         </StackPanel>
diff --git a/ClientFaux/MainWindow.xaml.cs b/ClientFaux/MainWindow.xaml.cs
index aae89f0..96a7c32 100644
--- a/ClientFaux/MainWindow.xaml.cs
+++ b/ClientFaux/MainWindow.xaml.cs
@@ -5,18 +5,19 @@
 using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Media;
-using CERTENROLLLib;
 using System.IO;
 using System.ComponentModel;
 using static CMFaux.CMFauxStatusViewClasses;
 using System.Collections.ObjectModel;
 using Microsoft.ConfigurationManagement.Messaging.Framework;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace CMFaux
 {
+
     // to do : fix discovery 
-    public partial class MainWindow : Window
+    public partial class MainWindow : Window, INotifyPropertyChanged
     {
         private readonly BackgroundWorker worker = new BackgroundWorker();        
         public string Password { get; private set; }
@@ -25,12 +26,49 @@ public partial class MainWindow : Window
         public string SiteCode { get; private set; }
         public string DomainName { get; private set; }
         public string ExportPath { get; private set; }
-        internal ObservableCollection<Device> Devices { get => devices; set => devices = value; }
+        public int maxThreads { get; private set; }
+        private int _idCounter;
+        public int IdCounter
+        {
+            get { return _idCounter; }
+            set
+            {
+                if (value != _idCounter)
+                {
+                    _idCounter = value;
+                    OnPropertyChanged("IdCounter");
+                }
+            }
+        }
 
-        private ObservableCollection<Device> devices = new ObservableCollection<Device>();
+        private int _DeviceCounter { get; set; }
+        public int DeviceCounter
+        {
+            get { return _DeviceCounter; }
+            set
+            {
+                if (value != _DeviceCounter)
+                {
+                    _DeviceCounter = value;
+                    OnPropertyChanged("DeviceCounter");
+                }
+            }
+        }
 
-        private static object _syncLock = new object();
+        public event PropertyChangedEventHandler PropertyChanged;
+        protected virtual void OnPropertyChanged(string name)
+        {
+            var handler = System.Threading.Interlocked.CompareExchange(ref PropertyChanged, null, null);
+            if (handler != null)
+            {
+                handler(this, new PropertyChangedEventArgs(name));
+            }
+        }
+        internal ObservableCollection<Device> Devices { get => devices; set => devices = value; }               
 
+        private ObservableCollection<Device> devices = new ObservableCollection<Device>();        
+        private static object _syncLock = new object();
+       
         public List<CustomClientRecord> CustomClientRecords = new List<CustomClientRecord> {
             new CustomClientRecord(){ RecordName="Property1", RecordValue="Value1" },
             new CustomClientRecord(){ RecordName="Property2", RecordValue="Value2" }
@@ -41,141 +79,26 @@ public MainWindow()
             InitializeComponent();
             FilePath.Text = System.IO.Directory.GetCurrentDirectory();
             PasswordBox.Password = "Pa$$w0rd!";
+            MaximumThreads.Text = "7";
             DomainName = System.Net.NetworkInformation.IPGlobalProperties.GetIPGlobalProperties().DomainName;
             Password = PasswordBox.Password;
             BaseName = NewClientName.Text;
             CMServer = CMServerName.Text;
             SiteCode = CMSiteCode.Text;
             ExportPath = FilePath.Text;
+            maxThreads = int.Parse(MaximumThreads.Text);
             dgDevices.ItemsSource = Devices;
-            BindingOperations.EnableCollectionSynchronization(Devices, _syncLock);            
+            BindingOperations.EnableCollectionSynchronization(Devices, _syncLock);
+            Counter.SetBinding(ContentProperty, new Binding("IdCounter"));
+            DataContext = this;
+            DeviceCounter = 0;
         }
-        
-        private void StartBackgroundWork(int thisIndex)
+        private void FireProgress(int thisIndex, string statusMessage)
         {
-            BackgroundWorker worker = new BackgroundWorker();
-            worker.WorkerReportsProgress = true;
-            worker.DoWork += worker_DoWork;
-            worker.ProgressChanged += worker_ProgressChanged;
-            worker.RunWorkerCompleted += worker_RunWorkerCompleted;
-            worker.RunWorkerAsync(thisIndex);
-        }
-
-        private void CreateClientsButton_Click(object sender, RoutedEventArgs e)
-        {            
-            DeviceExpander.IsExpanded = true;
+            Device ThisClient = Devices[thisIndex];
             
-            string BaseName = NewClientName.Text;
-            int CountOfMachines = (Int32.TryParse(NumberOfClients.Text, out int unUsed)) ? Int32.Parse(NumberOfClients.Text) : 1;
-            int BeginningWith = (!StartingNumber.Text.Length.Equals(0)) ? Int32.Parse(StartingNumber.Text) : 0;
-            for (int i = BeginningWith; i < CountOfMachines; i++)
-            {
-                string ThisClient = BaseName + i;
-                Device ThisDevice = new Device() { Name = ThisClient, Status = "CertCreated", ImageSource = "Images\\step01.png", ProcessProgress = 10};
-                Devices.Add(ThisDevice);                
-
-                int thisIndex = devices.IndexOf(ThisDevice);
-                StartBackgroundWork(thisIndex);                
-            }
-        }
-
-        public static X509Certificate2 CreateSelfSignedCertificate(string subjectName)
-        {
-            // create DN for subject and issuer
-            var dn = new CX500DistinguishedName();
-            dn.Encode("CN=" + subjectName, X500NameFlags.XCN_CERT_NAME_STR_NONE);
-            // create a new private key for the certificate
-            CX509PrivateKey privateKey = new CX509PrivateKey
-            {
-                ProviderName = "Microsoft Enhanced RSA and AES Cryptographic Provider",
-                MachineContext = false,
-                Length = 2048,
-                KeySpec = X509KeySpec.XCN_AT_SIGNATURE, // use is not limited
-                ExportPolicy = X509PrivateKeyExportFlags.XCN_NCRYPT_ALLOW_PLAINTEXT_EXPORT_FLAG
-            };
-            privateKey.Create();
-
-            // Use the stronger SHA512 hashing algorithm
-            var hashobj = new CObjectId();
-            hashobj.InitializeFromAlgorithmName(ObjectIdGroupId.XCN_CRYPT_HASH_ALG_OID_GROUP_ID,
-                ObjectIdPublicKeyFlags.XCN_CRYPT_OID_INFO_PUBKEY_ANY,
-                AlgorithmFlags.AlgorithmFlagsNone, "SHA256");
-
-            // add extended key usage if you want - look at MSDN for a list of possible OIDs
-            var oid = new CObjectId();
-            oid.InitializeFromValue("1.3.6.1.5.5.7.3.1"); // SSL server
-            var oidlist = new CObjectIds();
-            oidlist.Add(oid);
-            var eku = new CX509ExtensionEnhancedKeyUsage();
-            eku.InitializeEncode(oidlist);
-
-            // Create the self signing request
-            var cert = new CX509CertificateRequestCertificate();
-            cert.InitializeFromPrivateKey(X509CertificateEnrollmentContext.ContextUser, privateKey, "");
-            cert.Subject = dn;
-            cert.Issuer = dn; // the issuer and the subject are the same
-            cert.NotBefore = DateTime.Now;
-            // this cert expires immediately. Change to whatever makes sense for you
-            cert.NotAfter = DateTime.Now.AddYears(1);
-            cert.X509Extensions.Add((CX509Extension)eku); // add the EKU
-            cert.HashAlgorithm = hashobj; // Specify the hashing algorithm
-            cert.Encode(); // encode the certificate
-
-            // Do the final enrollment process
-            var enroll = new CX509Enrollment();
-            enroll.InitializeFromRequest(cert); // load the certificate
-            enroll.CertificateFriendlyName = subjectName; // Optional: add a friendly name
-            string csr = enroll.CreateRequest(); // Output the request in base64
-                                                 // and install it back as the response
-            enroll.InstallResponse(InstallResponseRestrictionFlags.AllowUntrustedCertificate,
-                csr, EncodingType.XCN_CRYPT_STRING_BASE64, ""); // no password
-                                                                // output a base64 encoded PKCS#12 so we can import it back to the .Net security classes
-            var base64encoded = enroll.CreatePFX("", // no password, this is for internal consumption
-                PFXExportOptions.PFXExportChainWithRoot);
-
-            // instantiate the target class with the PKCS#12 data (and the empty password)
-            return new System.Security.Cryptography.X509Certificates.X509Certificate2(
-                System.Convert.FromBase64String(base64encoded), "",
-                // mark the private key as exportable (this is usually what you want to do)
-                System.Security.Cryptography.X509Certificates.X509KeyStorageFlags.Exportable
-            );
-        }      
-
-        void worker_DoWork(object sender, DoWorkEventArgs e)
-        {
-            GetWait();
-            string ThisFilePath = System.IO.Directory.GetCurrentDirectory(); 
-            Device ThisClient = Devices[(Int32.Parse(e.Argument.ToString()))];
-            //Update UI
-            (sender as BackgroundWorker).ReportProgress(Int32.Parse(e.Argument.ToString()), "CreatingCert...");
-            X509Certificate2 newCert = CreateSelfSignedCertificate(ThisClient.Name);
-            string myPath = ExportCert(newCert, ThisClient.Name, ThisFilePath);
-            
-            //Update UI
-            (sender as BackgroundWorker).ReportProgress(Int32.Parse(e.Argument.ToString()), "CertCreated!");
-            System.Threading.Thread.Sleep(1500);
-            (sender as BackgroundWorker).ReportProgress(Int32.Parse(e.Argument.ToString()), "Starting Inventory...");
-            //FauxDeployCMAgent.SimulateClient(CMServer, ThisClient.Name, DomainName, SiteCode, ExportPath, myPath, Password);
-            SmsClientId clientId = FauxDeployCMAgent.RegisterClient(CMServer, ThisClient.Name, DomainName, SiteCode, ExportPath, myPath, Password);
-            
-            //Update UI
-            (sender as BackgroundWorker).ReportProgress(Int32.Parse(e.Argument.ToString()), "SendingDiscovery");
-            FauxDeployCMAgent.SendDiscovery(CMServer, ThisClient.Name, DomainName, SiteCode, ExportPath, myPath, Password, clientId);
-
-            (sender as BackgroundWorker).ReportProgress(Int32.Parse(e.Argument.ToString()), "RequestingPolicy");
-            FauxDeployCMAgent.GetPolicy(CMServer, ThisClient.Name, DomainName, SiteCode, ExportPath, myPath, Password, clientId);
-
-            (sender as BackgroundWorker).ReportProgress(Int32.Parse(e.Argument.ToString()), "SendingCustom");
-            FauxDeployCMAgent.SendCustomDiscovery(CMServer, ThisClient.Name, SiteCode, ThisFilePath, CustomClientRecords);
-            e.Result = ThisClient;
-        }
-
-        void worker_ProgressChanged(object sender, ProgressChangedEventArgs e)
-        {
-            Device ThisClient = Devices[(Int32.Parse(e.ProgressPercentage.ToString()))];
-            string UserState = e.UserState.ToString();
             switch
-                (UserState)
+                (statusMessage)
             {
                 case "CreatingCert...":
                     ThisClient.Status = "Creating Cert...";
@@ -201,27 +124,92 @@ void worker_ProgressChanged(object sender, ProgressChangedEventArgs e)
                     ThisClient.Status = "Requesting Policy...";
                     ThisClient.ProcessProgress = 85;
                     break;
+                case "SendingCustom":
+                    ThisClient.ImageSource = "Images\\step03.png";
+                    ThisClient.Status = "Sending Custom DDRs..";
+                    ThisClient.ProcessProgress = 95;
+                    break;
+                case "Complete":
+                    ThisClient.ImageSource = "Images\\step03.png";
+                    ThisClient.Status = "Complete!";
+                    ThisClient.ProcessProgress = 100;
+                    break;
+                    
                 default:
                     break;
-            }            
+            }
+        }
+        private void RegisterClient(int thisIndex)
+        {
+            GetWait();
+            string ThisFilePath = System.IO.Directory.GetCurrentDirectory();
+            Device ThisClient = Devices[thisIndex];
+            //Update UI
+            FireProgress(thisIndex, "CreatingCert...");
+            X509Certificate2 newCert = FauxDeployCMAgent.CreateSelfSignedCertificate(ThisClient.Name);
+            string myPath = ExportCert(newCert, ThisClient.Name, ThisFilePath);
+
+            //Update UI
+            FireProgress(thisIndex, "CertCreated!");
+            System.Threading.Thread.Sleep(1500);
+            FireProgress(thisIndex, "Starting Inventory...");
+            
+            SmsClientId clientId = FauxDeployCMAgent.RegisterClient(CMServer, ThisClient.Name, DomainName, SiteCode, ExportPath, myPath, Password);
+
+            //Update UI
+            FireProgress(thisIndex, "SendingDiscovery");
+            FauxDeployCMAgent.SendDiscovery(CMServer, ThisClient.Name, DomainName, SiteCode, ExportPath, myPath, Password, clientId);
+
+            FireProgress(thisIndex, "RequestingPolicy");
+            FauxDeployCMAgent.GetPolicy(CMServer, ThisClient.Name, DomainName, SiteCode, ExportPath, myPath, Password, clientId);
+
+            FireProgress(thisIndex, "SendingCustom");
+            FauxDeployCMAgent.SendCustomDiscovery(CMServer, ThisClient.Name, SiteCode, ThisFilePath, CustomClientRecords);
 
+            FireProgress(thisIndex, "Complete");
         }
 
-        void worker_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
-        {            
-            Device ThisClient = (Device)e.Result;
-            ThisClient.Status = "Complete!";
-            ThisClient.ProcessProgress = 100;
-            //ThisClient.ImageSource = "Images\\step02.png";
+        private async void CreateClientsButton_Click(object sender, RoutedEventArgs e)
+        {
+            DeviceExpander.IsExpanded = true;
+
+            string BaseName = NewClientName.Text;
+            int CountOfMachines = (Int32.TryParse(NumberOfClients.Text, out int unUsed)) ? Int32.Parse(NumberOfClients.Text) : 1;
+            int BeginningWith = (!StartingNumber.Text.Length.Equals(0)) ? Int32.Parse(StartingNumber.Text) : 0;
+            List<String> DeviceList = new List<string>();
+
+            var progress = new Progress<int>(_ => IdCounter++) as IProgress<int>;
+
+            for (int i = BeginningWith; i < CountOfMachines; i++)
+            {
+                string ThisClient = BaseName + i;
+                DeviceList.Add(ThisClient);
+
+            }
+
+            var myTask = Task.Run(() =>
+            {                
+                Parallel.ForEach(DeviceList, new ParallelOptions { MaxDegreeOfParallelism = maxThreads}, device =>
+                {
+                    Device ThisDevice = new Device() { Name = device, Status = "CertCreated", ImageSource = "Images\\step01.png", ProcessProgress = 10 };
+                    Devices.Add(ThisDevice);                    
+                    int thisIndex = devices.IndexOf(ThisDevice);
+                    RegisterClient(thisIndex);
+
+                    progress.Report(0);
+             
+                });             
+            });
+
+            await myTask;            
+            
         }
+        
         public string ExportCert(X509Certificate2 newCert, string ThisClient, string FilePath)
         {
             string ExportPath = FilePath + "\\" + ThisClient + ".pfx";
             byte[] certToFile = newCert.Export(X509ContentType.Pfx, PasswordBox.Password);
-
-            File.WriteAllBytes(ExportPath, certToFile); 
-            
-
+            File.WriteAllBytes(ExportPath, certToFile);
             return ExportPath;
         }
 
@@ -322,5 +310,10 @@ private void GetWait()
             int w = random.Next(3, 15);
             System.Threading.Thread.Sleep(100 * w);
         }
+
+        private void MaximumThreads_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            maxThreads = int.Parse(MaximumThreads.Text);
+        }
     }
 }
diff --git a/ClientFaux/StatusViewClasses.cs b/ClientFaux/StatusViewClasses.cs
index 87efae4..fc35cbe 100644
--- a/ClientFaux/StatusViewClasses.cs
+++ b/ClientFaux/StatusViewClasses.cs
@@ -15,15 +15,14 @@ namespace CMFaux
 {
     public class CMFauxStatusViewClasses
     {
-        
         public static List<String> GetWMIClasses()
         {
-            return new List<string> { "Win32_ComputerSystem", "Win32_OperatingSystem", "Win32_LogicalDisk","Win32_Processor","Win32_SystemDevices","Win32_BIOS",
-                    "Win32_SystemEnclosure","Win32_NetworkAdapter","Win32_NetworkAdapterConfiguration", "Win32_DiskDrive","Win32_DiskPartition",
-                    /*"Win32_Product",*/"Win32_Service", "Win32Reg_AddRemovePrograms","CCM_LogicalMemoryConfiguration","Win32_SCSIController","Win32_TapeDrive","Win32_UserProfile",
+            return new List<string> { "Win32_ComputerSystem", "Win32_OperatingSystem", "Win32_BIOS", "Win32_SystemEnclosure","Win32_NetworkAdapter",
+                    "Win32_NetworkAdapterConfiguration", "Win32_DiskDrive","Win32_DiskPartition","Win32_Service", "Win32Reg_AddRemovePrograms","CCM_LogicalMemoryConfiguration",
                     "Win32_POTSModem","Win32_DesktopMonitor","Win32_TSLicenseKeyPack","Win32_PhysicalMemory","Win32_ServerFeature","Win32_ParallelPort","Win32Reg_SMSGuestVirtualMachine64",
                     "Win32_USBController","Office365ProPlusConfigurations","Win32_NetworkClient","Win32Reg_SMSWindowsUpdate","Win32_MotherboardDevice","Win32_TSIssuedLicense","Win32_SoundDevice",
-                    "Win32Reg_SMSGuestVirtualMachine","Win32Reg_SMSAdvancedClientSSLConfiguration","Win32_IDEController","Win32_VideoController","Win32_PnpEntity"
+                    "Win32Reg_SMSGuestVirtualMachine","Win32Reg_SMSAdvancedClientSSLConfiguration","Win32_IDEController","Win32_VideoController","Win32_SCSIController","Win32_TapeDrive"
+                    /*"Win32_LogicalDisk",*//*"Win32_Processor",*//*"Win32_SystemDevices",*//*"Win32_Product","Win32_PnpEntity"*/
                 };
         }
         public static string GetOSRealVersionInfo()
@@ -34,7 +33,7 @@ public static string GetOSRealVersionInfo()
                     "kernel32.dll"));
             return fvi.ProductVersion;
         }
-
+        
         public class CustomClientRecord
         {
             public string RecordName { get; set; }
@@ -49,8 +48,14 @@ public enum Statuses
             RegisteringClient = 2,
             [Description("Sending Discovery")]
             SendingDiscovery = 3
-        }
+        }       
 
+        public event PropertyChangedEventHandler PropertyChanged;
+        public void OnPropertyChanged(string propertyName)
+        {
+            if (PropertyChanged != null)
+                PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+        }
 
         public class Device : INotifyPropertyChanged
         {