diff --git a/UEVR.sln b/UEVR.sln
index 2507f4d..506b912 100644
--- a/UEVR.sln
+++ b/UEVR.sln
@@ -8,13 +8,19 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{5535C4D3-A0EF-4767-B8E2-F3823EBFD754}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5535C4D3-A0EF-4767-B8E2-F3823EBFD754}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5535C4D3-A0EF-4767-B8E2-F3823EBFD754}.Debug|x64.ActiveCfg = Debug|x64
+		{5535C4D3-A0EF-4767-B8E2-F3823EBFD754}.Debug|x64.Build.0 = Debug|x64
 		{5535C4D3-A0EF-4767-B8E2-F3823EBFD754}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5535C4D3-A0EF-4767-B8E2-F3823EBFD754}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5535C4D3-A0EF-4767-B8E2-F3823EBFD754}.Release|x64.ActiveCfg = Release|x64
+		{5535C4D3-A0EF-4767-B8E2-F3823EBFD754}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/UEVR/GameConfig.cs b/UEVR/GameConfig.cs
index fed2cf7..2193913 100644
--- a/UEVR/GameConfig.cs
+++ b/UEVR/GameConfig.cs
@@ -124,7 +124,7 @@ public static bool ZipContainsDLL(string sourceArchiveFileName) {
         private static void MoveDirectoryContents(string sourceDir, string destinationDir) {
             foreach (var dirPath in Directory.GetDirectories(sourceDir, "*", SearchOption.AllDirectories)) {
                 Directory.CreateDirectory(dirPath.Replace(sourceDir, destinationDir));
-            }
+            }   
 
             foreach (var newPath in Directory.GetFiles(sourceDir, "*.*", SearchOption.AllDirectories)) {
                 File.Copy(newPath, newPath.Replace(sourceDir, destinationDir), true);
diff --git a/UEVR/Injector.cs b/UEVR/Injector.cs
index 9a264a1..57a4656 100644
--- a/UEVR/Injector.cs
+++ b/UEVR/Injector.cs
@@ -11,6 +11,45 @@
 
 namespace UEVR {
     class Injector {
+
+        
+        [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        public static extern bool CreateProcess(string lpApplicationName, string lpCommandLine, IntPtr lpProcessAttributes, IntPtr lpThreadAttributes, bool bInheritHandles, uint dwCreationFlags, IntPtr lpEnvironment, string lpCurrentDirectory, [In] ref STARTUPINFO lpStartupInfo, out PROCESS_INFORMATION lpProcessInformation);
+    [StructLayout(LayoutKind.Sequential)]
+    public struct PROCESS_INFORMATION
+    {
+        public IntPtr hProcess;
+        public IntPtr hThread;
+        public int dwProcessId;
+        public int dwThreadId;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct STARTUPINFO
+    {
+        public int cb;
+        public string lpReserved;
+        public string lpDesktop;
+        public string lpTitle;
+        public int dwX;
+        public int dwY;
+        public int dwXSize;
+        public int dwYSize;
+        public int dwXCountChars;
+        public int dwYCountChars;
+        public int dwFillAttribute;
+        public int dwFlags;
+        public short wShowWindow;
+        public short cbReserved2;
+        public IntPtr lpReserved2;
+        public IntPtr hStdInput;
+        public IntPtr hStdOutput;
+        public IntPtr hStdError;
+    }
+
+    [DllImport("kernel32.dll", SetLastError = true)]
+public static extern uint ResumeThread(IntPtr hThread);
+
         [DllImport("kernel32.dll")]
         public static extern IntPtr OpenProcess(int dwDesiredAccess, bool bInheritHandle, int dwProcessId);
 
@@ -35,6 +74,9 @@ class Injector {
         [DllImport("kernel32.dll", SetLastError = true)]
         static extern bool GetExitCodeThread(IntPtr hThread, out uint lpExitCode);
 
+        [DllImport ( "ntdll.dll" )]
+        public static extern uint RtlAdjustPrivilege ( uint Privilege, bool bEnablePrivilege, bool IsThreadPrivilege, out bool PreviousValue );
+
         [DllImport("kernel32.dll", SetLastError = true)]
         public static extern uint WaitForSingleObject(IntPtr hHandle, uint dwMilliseconds);
 
@@ -173,5 +215,7 @@ public static bool CallFunctionNoArgs(int processId, string dllPath, IntPtr dllB
 
             return true;
         }
+
+        
     }
 }
\ No newline at end of file
diff --git a/UEVR/MainWindow.xaml b/UEVR/MainWindow.xaml
index 12a2f34..661e644 100644
--- a/UEVR/MainWindow.xaml
+++ b/UEVR/MainWindow.xaml
@@ -1,195 +1,379 @@
-<Window x:Class="UEVR.MainWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:UEVR"
-        xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-        TextElement.Foreground="{DynamicResource MaterialDesignBody}"
-        TextElement.FontWeight="Regular"
-        TextElement.FontSize="13"
-        TextOptions.TextFormattingMode="Ideal"
-        TextOptions.TextRenderingMode="Auto"
-        Background="#FF1A1B1C"
-        FontFamily="{DynamicResource MaterialDesignFont}"
-        mc:Ignorable="d"
-        Title="UEVR"
-        Closing="MainWindow_Closing" Loaded="MainWindow_Loaded"
-        SizeToContent="WidthAndHeight" ResizeMode="NoResize" Icon="/UEVR2.png"
-        WindowStartupLocation="CenterScreen"
-        WindowStyle="None"
-        >
+<Window
+    x:Class="UEVR.MainWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:UEVR"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="UEVR"
+    Background="#FF1A1B1C"
+    Closing="MainWindow_Closing"
+    FontFamily="{DynamicResource MaterialDesignFont}"
+    Icon="/UEVR2.png"
+    Loaded="MainWindow_Loaded"
+    ResizeMode="NoResize"
+    SizeToContent="WidthAndHeight"
+    TextElement.FontSize="13"
+    TextElement.FontWeight="Regular"
+    TextElement.Foreground="{DynamicResource MaterialDesignBody}"
+    TextOptions.TextFormattingMode="Ideal"
+    TextOptions.TextRenderingMode="Auto"
+    WindowStartupLocation="CenterScreen"
+    WindowStyle="None"
+    mc:Ignorable="d">
     <StackPanel x:Name="m_vertStackPanel" Orientation="Vertical">
 
-        <Border MouseLeftButtonDown="TitleBar_MouseLeftButtonDown" Background="#FF1A1B1C">
+        <Border Background="#FF1A1B1C" MouseLeftButtonDown="TitleBar_MouseLeftButtonDown">
             <Border.Style>
                 <Style TargetType="{x:Type Border}">
-                    <Setter Property="Cursor" Value="Hand"/>
+                    <Setter Property="Cursor" Value="Hand" />
                     <Style.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Cursor" Value="SizeAll"/>
+                            <Setter Property="Cursor" Value="SizeAll" />
                         </Trigger>
                     </Style.Triggers>
                 </Style>
             </Border.Style>
             <DockPanel Height="30">
-                <TextBlock Text="{Binding Title, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
-                       VerticalAlignment="Center"
-                       Margin="25,0,0,0"
-                       FontWeight="Bold"
-                       Foreground="White" />
-                <Button DockPanel.Dock="Right"
-                    Click="CloseButton_Click"
+                <TextBlock
+                    Margin="25,0,0,0"
+                    VerticalAlignment="Center"
+                    FontWeight="Bold"
+                    Foreground="White"
+                    Text="{Binding Title, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}" />
+                <Button
                     Width="30"
                     Height="30"
+                    HorizontalAlignment="Right"
                     Background="Transparent"
                     BorderBrush="Transparent"
-                    HorizontalAlignment="Right"
-                    Style="{StaticResource MaterialDesignFloatingActionMiniButton}"
-                >
-                    <materialDesign:PackIcon Kind="Close" HorizontalAlignment="Center" Height="30" Width="30" />
+                    Click="CloseButton_Click"
+                    DockPanel.Dock="Right"
+                    Style="{StaticResource MaterialDesignFloatingActionMiniButton}">
+                    <materialDesign:PackIcon
+                        Width="30"
+                        Height="30"
+                        HorizontalAlignment="Center"
+                        Kind="Close" />
                 </Button>
             </DockPanel>
         </Border>
         <StackPanel x:Name="m_sideStackPanel" Orientation="Horizontal">
             <DockPanel>
-                <Menu DockPanel.Dock="Top" HorizontalAlignment="Center">
+                <Menu HorizontalAlignment="Center" DockPanel.Dock="Top">
                     <Menu.ItemsPanel>
                         <ItemsPanelTemplate>
-                            <VirtualizingStackPanel Orientation="Vertical"/>
+                            <VirtualizingStackPanel Orientation="Vertical" />
                         </ItemsPanelTemplate>
                     </Menu.ItemsPanel>
                     <MenuItem>
                         <MenuItem.Header>
                             <StackPanel Width="75">
-                                <materialDesign:PackIcon Kind="QuestionMark" HorizontalAlignment="Center" Height="30" Width="30">
-                                </materialDesign:PackIcon>
+                                <materialDesign:PackIcon
+                                    Width="30"
+                                    Height="30"
+                                    HorizontalAlignment="Center"
+                                    Kind="QuestionMark" />
                             </StackPanel>
                         </MenuItem.Header>
-                        <TextBlock TextWrapping="Wrap" Text="Author: praydog"/>
+                        <TextBlock Text="Author: praydog" TextWrapping="Wrap" />
 
-                        <MenuItem Header="_Documentation" Click="Documentation_Clicked">
-                        </MenuItem>
+                        <MenuItem Click="Documentation_Clicked" Header="_Documentation" />
 
-                        <MenuItem Header="_Donate" Click="Donate_Clicked">
-                        </MenuItem>
+                        <MenuItem Click="Donate_Clicked" Header="_Donate" />
                     </MenuItem>
                     <MenuItem x:Name="m_openGlobalDirectoryBtn" Click="OpenGlobalDir_Clicked">
                         <MenuItem.Header>
                             <StackPanel Width="75">
-                                <materialDesign:PackIcon Kind="Folder" HorizontalAlignment="Center" Height="30" Width="30">
-                                </materialDesign:PackIcon>
-                                <TextBlock Text="Open Global Dir" HorizontalAlignment="Center" FontSize="10"/>
+                                <materialDesign:PackIcon
+                                    Width="30"
+                                    Height="30"
+                                    HorizontalAlignment="Center"
+                                    Kind="Folder" />
+                                <TextBlock
+                                    HorizontalAlignment="Center"
+                                    FontSize="10"
+                                    Text="Open Global Dir" />
                             </StackPanel>
                         </MenuItem.Header>
                     </MenuItem>
-                    <MenuItem Visibility="Collapsed" x:Name="m_openGameDirectoryBtn" Click="OpenGameDir_Clicked">
+                    <MenuItem x:Name="m_LaunchModeButton" Click="LaunchModeButton_Clicked">
                         <MenuItem.Header>
                             <StackPanel Width="75">
-                                <materialDesign:PackIcon Kind="Folder" HorizontalAlignment="Center" Height="30" Width="30">
-                                </materialDesign:PackIcon>
-                                <TextBlock Text="Open Game Dir" HorizontalAlignment="Center" FontSize="10"/>
+                                <materialDesign:PackIcon
+                                    x:Name="m_LaunchModeIcon"
+                                    Width="30"
+                                    Height="30"
+                                    HorizontalAlignment="Center"
+                                    Kind="Launch" />
+                                <TextBlock
+                                    x:Name="m_LaunchModeText"
+                                    HorizontalAlignment="Center"
+                                    FontSize="10"
+                                    RenderTransformOrigin="0.5,0.5"
+                                    Text="Launch Mode">
+                                    <TextBlock.RenderTransform>
+                                        <TransformGroup>
+                                            <ScaleTransform />
+                                            <SkewTransform AngleX="-2.726" />
+                                            <RotateTransform />
+                                            <TranslateTransform X="0.286" />
+                                        </TransformGroup>
+                                    </TextBlock.RenderTransform>
+                                </TextBlock>
                             </StackPanel>
                         </MenuItem.Header>
                     </MenuItem>
-                    <MenuItem Visibility="Visible" x:Name="m_exportConfigBtn" Click="ExportConfig_Clicked">
+                    <MenuItem
+                        x:Name="m_openGameDirectoryBtn"
+                        Click="OpenGameDir_Clicked"
+                        Visibility="Collapsed">
                         <MenuItem.Header>
                             <StackPanel Width="75">
-                                <materialDesign:PackIcon Kind="Export"  HorizontalAlignment="Center" Height="30" Width="30" RenderTransformOrigin="0.5,0.5">
-                                    <materialDesign:PackIcon.RenderTransform>
-                                        <TransformGroup>
-                                            <ScaleTransform/>
-                                            <SkewTransform/>
-                                            <RotateTransform Angle="180"/>
-                                            <TranslateTransform/>
-                                        </TransformGroup>
-                                    </materialDesign:PackIcon.RenderTransform>
-                                </materialDesign:PackIcon>
-                                <TextBlock Text="Export Config" HorizontalAlignment="Center" FontSize="10"/>
+                                <materialDesign:PackIcon
+                                    Width="30"
+                                    Height="30"
+                                    HorizontalAlignment="Center"
+                                    Kind="Folder" />
+                                <TextBlock
+                                    HorizontalAlignment="Center"
+                                    FontSize="10"
+                                    Text="Open Game Dir" />
                             </StackPanel>
                         </MenuItem.Header>
                     </MenuItem>
-                    <MenuItem Visibility="Visible" x:Name="m_importConfigBtn" Click="ImportConfig_Clicked">
+                    <MenuItem
+                        x:Name="m_exportConfigBtn"
+                        Click="ExportConfig_Clicked"
+                        Visibility="Visible">
                         <MenuItem.Header>
                             <StackPanel Width="75">
-                                <materialDesign:PackIcon Kind="Import"  HorizontalAlignment="Center" Height="30" Width="30" RenderTransformOrigin="0.5,0.5">
-                                </materialDesign:PackIcon>
-                                <TextBlock Text="Import Config" HorizontalAlignment="Center" FontSize="10"/>
+                                <materialDesign:PackIcon
+                                    Width="30"
+                                    Height="30"
+                                    HorizontalAlignment="Center"
+                                    Kind="Export" />
+                                <TextBlock
+                                    HorizontalAlignment="Center"
+                                    FontSize="10"
+                                    Text="Export Config" />
+                            </StackPanel>
+                        </MenuItem.Header>
+                    </MenuItem>
+                    <MenuItem
+                        x:Name="m_importConfigBtn"
+                        Click="ImportConfig_Clicked"
+                        Visibility="Visible">
+                        <MenuItem.Header>
+                            <StackPanel Width="75">
+                                <materialDesign:PackIcon
+                                    Width="30"
+                                    Height="30"
+                                    HorizontalAlignment="Center"
+                                    Kind="Import"
+                                    RenderTransformOrigin="0.5,0.5" />
+                                <TextBlock
+                                    HorizontalAlignment="Center"
+                                    FontSize="10"
+                                    Text="Import Config" />
                             </StackPanel>
                         </MenuItem.Header>
                     </MenuItem>
                 </Menu>
-                <StackPanel DockPanel.Dock="Bottom" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Bottom">
-                    <TextBlock TextWrapping="Wrap" Text="Author: praydog"/>
+                <StackPanel
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Bottom"
+                    DockPanel.Dock="Bottom"
+                    Orientation="Horizontal">
+                    <TextBlock Text="Author: praydog" TextWrapping="Wrap" />
                 </StackPanel>
-                <StackPanel DockPanel.Dock="Bottom" Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Bottom">
-                    <Button Margin="5" Click="GitHub_Clicked" Background="Transparent" BorderThickness="0,0,0,0" RenderOptions.BitmapScalingMode="HighQuality" Height="40">
-                        <Image Source="github.png" HorizontalAlignment="Center" Height="30" Width="30" />
+                <StackPanel
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Bottom"
+                    DockPanel.Dock="Bottom"
+                    Orientation="Vertical">
+                    <Button
+                        Height="40"
+                        Margin="5"
+                        Background="Transparent"
+                        BorderThickness="0,0,0,0"
+                        Click="GitHub_Clicked"
+                        RenderOptions.BitmapScalingMode="HighQuality">
+                        <Image
+                            Width="30"
+                            Height="30"
+                            HorizontalAlignment="Center"
+                            Source="github.png" />
                     </Button>
-                    <Button Margin="5" Click="Donate_Clicked" Background="Transparent" BorderThickness="0,0,0,0" RenderOptions.BitmapScalingMode="HighQuality">
-                        <Image Source="donate.png" HorizontalAlignment="Center" Height="30" Width="30" />
+                    <Button
+                        Margin="5"
+                        Background="Transparent"
+                        BorderThickness="0,0,0,0"
+                        Click="Donate_Clicked"
+                        RenderOptions.BitmapScalingMode="HighQuality">
+                        <Image
+                            Width="30"
+                            Height="30"
+                            HorizontalAlignment="Center"
+                            Source="donate.png" />
                     </Button>
-                    <Button Margin="5" Click="Discord_Clicked" Background="Transparent" BorderThickness="0,0,0,0" RenderOptions.BitmapScalingMode="HighQuality">
-                        <Image Source="discord.png" HorizontalAlignment="Center" Height="30" Width="30" />
+                    <Button
+                        Margin="5"
+                        Background="Transparent"
+                        BorderThickness="0,0,0,0"
+                        Click="Discord_Clicked"
+                        RenderOptions.BitmapScalingMode="HighQuality">
+                        <Image
+                            Width="30"
+                            Height="30"
+                            HorizontalAlignment="Center"
+                            Source="discord.png" />
                     </Button>
                 </StackPanel>
             </DockPanel>
             <StackPanel x:Name="m_topStackPanel" Orientation="Vertical">
-                <GroupBox x:Name="m_nNotificationsGroupBox" Header="Notifications" ClipToBounds="True" Visibility="Collapsed">
+                <GroupBox
+                    x:Name="m_nNotificationsGroupBox"
+                    ClipToBounds="True"
+                    Header="Notifications"
+                    Visibility="Collapsed">
                     <StackPanel>
-                        <TextBlock x:Name="m_adminExplanation" TextWrapping="Wrap" Text="Some executables may not show up or fail to inject unless started as Administrator." Visibility="Collapsed"/>
-                        <Button x:Name="m_restartAsAdminButton" Content="Restart as Administrator" Click="RestartAsAdminButton_Click" Visibility="Collapsed"/>
+                        <TextBlock
+                            x:Name="m_adminExplanation"
+                            Text="Some executables may not show up or fail to inject unless started as Administrator."
+                            TextWrapping="Wrap"
+                            Visibility="Collapsed" />
+                        <Button
+                            x:Name="m_restartAsAdminButton"
+                            Click="RestartAsAdminButton_Click"
+                            Content="Restart as Administrator"
+                            Visibility="Collapsed" />
                     </StackPanel>
                 </GroupBox>
                 <StackPanel Orientation="Horizontal">
-                    <GroupBox Header="Inject" ClipToBounds="True">
-                        <StackPanel ClipToBounds="True" HorizontalAlignment="Left">
-                            <ComboBox x:Name="m_processListBox" DropDownOpened="ComboBox_DropDownOpened" SelectionChanged="ComboBox_SelectionChanged" VerticalAlignment="Top" MinWidth="500"/>
-                            <Button x:Name="m_injectButton" Content="Inject" Click="Inject_Clicked"/>
+                    <GroupBox ClipToBounds="True" Header="Inject">
+                        <StackPanel HorizontalAlignment="Left" ClipToBounds="True">
+                            <Button
+                                x:Name="m_LaunchModeAppPicker"
+                                Click="AppPicker_Clicked"
+                                Content="Choose Application to Launch"
+                                Visibility="Collapsed" />
+                            <TextBox
+                                x:Name="m_LaunchTargetView"
+                                IsReadOnly="True"
+                                Text=""
+                                Visibility="Collapsed" />
+                            <ComboBox
+                                x:Name="m_processListBox"
+                                MinWidth="500"
+                                VerticalAlignment="Top"
+                                DropDownOpened="ComboBox_DropDownOpened"
+                                SelectionChanged="ComboBox_SelectionChanged" />
+                            <Button
+                                x:Name="m_LaunchButton"
+                                Click="Launch_Clicked"
+                                Content="Launch and Inject"
+                                Visibility="Collapsed" />
+                            <Button
+                                x:Name="m_injectButton"
+                                Click="Inject_Clicked"
+                                Content="Inject" />
                             <StackPanel Orientation="Horizontal">
-                                <RadioButton x:Name="m_openvrRadio" Content="OpenVR"/>
-                                <RadioButton x:Name="m_openxrRadio" Content="OpenXR"/>
+                                <RadioButton x:Name="m_openvrRadio" Content="OpenVR" />
+                                <RadioButton x:Name="m_openxrRadio" Content="OpenXR" />
                                 <StackPanel Orientation="Horizontal">
-                                    <ToggleButton x:Name="m_nullifyVRPluginsCheckbox" HorizontalAlignment="Left"/>
-                                    <TextBlock TextWrapping="Wrap" Text="Nullify VR Plugins"/>
+                                    <ToggleButton x:Name="m_nullifyVRPluginsCheckbox" HorizontalAlignment="Left" />
+                                    <TextBlock Text="Nullify VR Plugins" TextWrapping="Wrap" />
                                 </StackPanel>
                                 <StackPanel Orientation="Horizontal">
-                                    <ToggleButton x:Name="m_focusGameOnInjectionCheckbox" HorizontalAlignment="Left" IsChecked="True"/>
-                                    <TextBlock TextWrapping="Wrap" Text="Focus game on injection"/>
+                                    <ToggleButton
+                                        x:Name="m_focusGameOnInjectionCheckbox"
+                                        HorizontalAlignment="Left"
+                                        IsChecked="True" />
+                                    <TextBlock Text="Focus game on injection" TextWrapping="Wrap" />
                                 </StackPanel>
                             </StackPanel>
-                            <TextBlock x:Name="m_connectionStatus" TextWrapping="Wrap" Text="Unknown status"/>
+                            <TextBlock
+                                x:Name="m_connectionStatus"
+                                Height="41"
+                                Text="Unknown status"
+                                TextWrapping="Wrap" />
+                            <StackPanel
+                                x:Name="m_CmdLineGroup"
+                                Orientation="Vertical"
+                                Visibility="Collapsed">
+                                <TextBox
+                                    HorizontalAlignment="Left"
+                                    AllowDrop="False"
+                                    Focusable="False"
+                                    IsReadOnly="True"
+                                    Text="Enter Command Line:  " />
+                                <TextBox
+                                    x:Name="m_LaunchModeCmdLine"
+                                    Text=""
+                                    TextChanged="CommandLineText_Updated" />
+                                <TextBlock Text="" TextWrapping="Wrap" />
+                            </StackPanel>
                         </StackPanel>
+
                     </GroupBox>
                 </StackPanel>
-                <GroupBox Header="Game Settings" ClipToBounds="True">
-                    <ListView x:Name="m_iniListView" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" MaxHeight="640">
+                <GroupBox ClipToBounds="True" Header="Game Settings">
+                    <ListView
+                        x:Name="m_iniListView"
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Grid.ColumnSpan="2"
+                        MaxHeight="640">
                         <ListView.Resources>
                             <DataTemplate x:Key="ComboBoxTemplate">
-                                <ComboBox ToolTip="{Binding Tooltip}" ItemsSource="{Binding ComboValues}" SelectedValuePath="Key" DisplayMemberPath="Value" SelectedValue="{Binding Value}" SelectionChanged="ComboChanged_Value"/>
+                                <ComboBox
+                                    DisplayMemberPath="Value"
+                                    ItemsSource="{Binding ComboValues}"
+                                    SelectedValue="{Binding Value}"
+                                    SelectedValuePath="Key"
+                                    SelectionChanged="ComboChanged_Value"
+                                    ToolTip="{Binding Tooltip}" />
                             </DataTemplate>
                             <DataTemplate x:Key="TextBoxTemplate">
-                                <TextBox ToolTip="{Binding Tooltip}" Text="{Binding Value, Mode=TwoWay}" Width="150" TextChanged="TextChanged_Value"/>
+                                <TextBox
+                                    Width="150"
+                                    Text="{Binding Value, Mode=TwoWay}"
+                                    TextChanged="TextChanged_Value"
+                                    ToolTip="{Binding Tooltip}" />
                             </DataTemplate>
                             <DataTemplate x:Key="CheckBoxTemplate">
-                                <CheckBox ToolTip="{Binding Tooltip}" IsChecked="{Binding ValueAsBool,Mode=TwoWay}" Width="150" Checked="CheckChanged_Value" Unchecked="CheckChanged_Value"/>
+                                <CheckBox
+                                    Width="150"
+                                    Checked="CheckChanged_Value"
+                                    IsChecked="{Binding ValueAsBool, Mode=TwoWay}"
+                                    ToolTip="{Binding Tooltip}"
+                                    Unchecked="CheckChanged_Value" />
                             </DataTemplate>
 
                             <DataTemplate x:Key="KeyTemplate">
-                                <TextBlock ToolTip="{Binding Tooltip}" Text="{Binding Key}"/>
+                                <TextBlock Text="{Binding Key}" ToolTip="{Binding Tooltip}" />
                             </DataTemplate>
 
-                            <local:ValueTemplateSelector x:Key="valueTemplateSelector"
-                                     ComboBoxTemplate="{StaticResource ComboBoxTemplate}"
-                                     TextBoxTemplate="{StaticResource TextBoxTemplate}"
-                                     CheckboxTemplate="{StaticResource CheckBoxTemplate}"/>
+                            <local:ValueTemplateSelector
+                                x:Key="valueTemplateSelector"
+                                CheckboxTemplate="{StaticResource CheckBoxTemplate}"
+                                ComboBoxTemplate="{StaticResource ComboBoxTemplate}"
+                                TextBoxTemplate="{StaticResource TextBoxTemplate}" />
 
                         </ListView.Resources>
 
                         <ListView.View>
                             <GridView>
-                                <GridViewColumn Header="Key" Width="200" CellTemplate="{StaticResource KeyTemplate}"/>
-                                <GridViewColumn Header="Value" Width="150" CellTemplateSelector="{StaticResource valueTemplateSelector}"/>
+                                <GridViewColumn
+                                    Width="200"
+                                    CellTemplate="{StaticResource KeyTemplate}"
+                                    Header="Key" />
+                                <GridViewColumn
+                                    Width="150"
+                                    CellTemplateSelector="{StaticResource valueTemplateSelector}"
+                                    Header="Value" />
                             </GridView>
                         </ListView.View>
                     </ListView>
diff --git a/UEVR/MainWindow.xaml.cs b/UEVR/MainWindow.xaml.cs
index 157ea99..e72ee84 100644
--- a/UEVR/MainWindow.xaml.cs
+++ b/UEVR/MainWindow.xaml.cs
@@ -32,13 +32,16 @@
 using System.Threading.Channels;
 using System.Security.Principal;
 using System.Windows.Media.Animation;
+using Microsoft.Win32;
+using Path = System.IO.Path;
+using System.Runtime.Serialization;
 
 namespace UEVR {
     class GameSettingEntry : INotifyPropertyChanged {
         private string _key = "";
         private string _value = "";
         private string _tooltip = "";
-
+     
         public string Key { get => _key; set => SetProperty(ref _key, value); }
         public string Value { 
             get => _value; 
@@ -58,6 +61,8 @@ public bool ValueAsBool {
             } 
         }
 
+    
+
         public Dictionary<string, string> ComboValues { get; set; } = new Dictionary<string, string>();
 
         public event PropertyChangedEventHandler? PropertyChanged;
@@ -160,7 +165,7 @@ public partial class MainWindow : Window {
 
         private string m_lastSelectedProcessName = new string("");
         private int m_lastSelectedProcessId = 0;
-
+        private string m_launchTarget = new string ( "" );
         private SharedMemory.Data? m_lastSharedData = null;
         private bool m_connected = false;
 
@@ -170,16 +175,34 @@ public partial class MainWindow : Window {
 
         private IConfiguration? m_currentConfig = null;
         private string? m_currentConfigPath = null;
-
         private ExecutableFilter m_executableFilter = new ExecutableFilter();
         private string? m_commandLineAttachExe = null;
+
+        private string? m_commandLinePassThroughArgs = null;
         private bool m_ignoreFutureVDWarnings = false;
 
+        private string LaunchModeArgs = "";
+        public bool m_launchMode = true;
+        public bool m_startSuspended = true;
+
+        //TODO child injection
+        //in case a game can't be launched directly we can launch it through its normal means and constantly poll for a known child process
+        //or perhaps there's a better way to watch the child. We could also inject into the parent anyway and create a remote thread to have
+        //the parent handle injecting the child and then unload. In this mode we would need to also ensure we don't inject plugins until we verify the child
+        //probably best to write a new loader module to handle this. For now we can just poll for a name if its given otherwise we'll just inject into the parent
+        //most games should be fine to launch directly. Even games with launchers are usually fine, you just need to check the command line when launching from the official means
+        //  public string? m_injectChild = null;
+        //  public int m_launchInjectDelay = 0;
+
+        //TODO qol injection stuff
+        //   private List<string> m_delayedPlugins = new List<string> ( );
+        //  private int m_pluginDelay = 0;
+        //  private bool m_futureAutoLaunch = false;
+
         [System.Runtime.InteropServices.DllImport("user32.dll")]
         public static extern void SwitchToThisWindow(IntPtr hWnd, bool fAltTab);
 
         private string excludedProcessesFile = "excluded.txt";
-
         public MainWindow() {
             InitializeComponent();
 
@@ -188,8 +211,16 @@ public MainWindow() {
 
             // Parse and handle arguments
             foreach (string arg in args) {
-                if (arg.StartsWith("--attach=")) {
+                if (arg.EndsWith(".exe")) {
                     m_commandLineAttachExe = arg.Split('=')[1];
+                    if (arg.StartsWith("--attach=")) {
+                        m_launchMode = false;
+                    }
+                    //allow directly setting launch mode from arg, leaving old behavior on --attach for other launchers to call
+                    else if (arg.StartsWith("--launch=")){
+                        m_launchMode = true;
+                        m_launchTarget= arg.Split ( '=' ) [ 1 ];
+                    }
                 }
             }
         }
@@ -206,7 +237,9 @@ private void MainWindow_Loaded(object sender, RoutedEventArgs e) {
                 m_adminExplanation.Visibility = Visibility.Visible;
             }
 
-            FillProcessList();
+            if ( !m_launchMode) {
+                 FillProcessList();
+            }
             m_openvrRadio.IsChecked = m_mainWindowSettings.OpenVRRadio;
             m_openxrRadio.IsChecked = m_mainWindowSettings.OpenXRRadio;
             m_nullifyVRPluginsCheckbox.IsChecked = m_mainWindowSettings.NullifyVRPluginsCheckbox;
@@ -266,7 +299,7 @@ private void Update_InjectStatus() {
 
             if (m_commandLineAttachExe == null) {
                 if (m_lastSelectedProcessId == 0) {
-                    m_injectButton.Content = "Inject";
+                    m_injectButton.Content = !m_launchMode ? "Inject" : "Launch and Inject";
                     return;
                 }
 
@@ -282,8 +315,8 @@ private void Update_InjectStatus() {
                         }
                     }
 
-                    m_injectButton.Content = "Inject";
-                } catch (ArgumentException) {
+                    m_injectButton.Content = !m_launchMode ? "Inject" : "Launch and Inject";                }
+                catch (ArgumentException) {
                     var processes = Process.GetProcessesByName(m_lastSelectedProcessName);
 
                     if (processes == null || processes.Length == 0 || !AnyInjectableProcesses(processes)) {
@@ -291,7 +324,7 @@ private void Update_InjectStatus() {
                         return;
                     }
 
-                    m_injectButton.Content = "Inject";
+                    m_injectButton.Content = !m_launchMode ? "Inject" : "Launch and Inject";
                 }
             } else {
                 m_injectButton.Content = "Waiting for " + m_commandLineAttachExe.ToLower() + "...";
@@ -310,6 +343,10 @@ private void Update_InjectStatus() {
                         m_lastSelectedProcessName = p.ProcessName;
                         process = p;
                     }
+                    else
+                        {
+                            
+                        }
                 }
 
                 if (process == null) {
@@ -357,8 +394,9 @@ private void Update_InjectStatus() {
                     }
 
                     m_lastAutoInjectTime = now;
-                    m_commandLineAttachExe = null; // no need anymore.
-                    FillProcessList();
+                    //m_commandLineAttachExe = null;
+                    if (!m_launchMode)
+                        FillProcessList();
                     if (m_focusGameOnInjectionCheckbox.IsChecked == true)
                     {
                         SwitchToThisWindow(process.MainWindowHandle, true);
@@ -398,13 +436,13 @@ private void Update_InjectorConnectionStatus() {
                     lastFrontendSignal = now;
                 }
             } else {
-                if (m_connected && !string.IsNullOrEmpty(m_commandLineAttachExe))
+                if (m_connected && !string.IsNullOrEmpty(m_commandLineAttachExe)) 
                 {
                     // If we launched with an attached game exe, we shut ourselves down once that game closes.
                     Application.Current.Shutdown();
                     return;
                 }
-                
+               
                 m_connectionStatus.Text = UEVRConnectionStatus.NoInstanceDetected;
                 m_connected = false;
                 Hide_ConnectionOptions();
@@ -567,8 +605,8 @@ private void ImportConfig_Clicked(object sender, RoutedEventArgs e) {
             }
         }
 
-        private bool m_virtualDesktopWarned = false;
-        private bool m_virtualDesktopChecked = false;
+        private bool m_virtualDesktopWarned = true;
+        private bool m_virtualDesktopChecked = true;
         private void Check_VirtualDesktop() {
             if (m_virtualDesktopWarned || m_ignoreFutureVDWarnings) {
                 return;
@@ -587,9 +625,24 @@ private void Check_VirtualDesktop() {
             }
         }
 
+        private void Update_LaunchButton ( ) {
+            if ( m_connected ) {
+                m_injectButton.Content = "Terminate Connected Process";
+                return;
+            }
+            else {
+                if ( m_launchMode )
+                    m_injectButton.Content = "Launch and Inject";
+                else
+                    m_injectButton.Content = "Inject";
+            }
+        }
+
+
         private void MainWindow_Update() {
             Update_InjectorConnectionStatus();
             Update_InjectStatus();
+            Update_LaunchButton();
 
             if (m_virtualDesktopChecked == false) {
                 m_virtualDesktopChecked = true;
@@ -726,7 +779,7 @@ private void TextChanged_Value(object sender, RoutedEventArgs e) {
                 var textBox = (TextBox)sender;
                 var keyValuePair = (GameSettingEntry)textBox.DataContext;
 
-                // For some reason the TextBox.text is updated but thne keyValuePair.Value isn't at this point.
+                // For some reason the TextBox.text is updated but the keyValuePair.Value isn't at this point.
                 bool changed = m_currentConfig[keyValuePair.Key] != textBox.Text || keyValuePair.Value != textBox.Text;
                 var newValue = textBox.Text;
 
@@ -866,11 +919,19 @@ private void InitializeConfig_FromPath(string configPath) {
 
             m_currentConfig = builder.Build();
             m_currentConfigPath = configPath;
-
+            string cmdline = "";
+           foreach (var entry in m_currentConfig.AsEnumerable ( ).ToList ( )  )
+            {
+                if ( entry.Key == "Frontend_LauncherCommandLine" )
+                    cmdline = entry.Value;
+            }
+            if ( cmdline != "" ) m_commandLinePassThroughArgs = cmdline;
             foreach (var entry in MandatoryConfig.Entries) {
                 if (m_currentConfig.AsEnumerable().ToList().FindAll(v => v.Key == entry.Key).Count() == 0) {
                     m_currentConfig[entry.Key] = entry.Value;
                 }
+
+                
             }
 
             RefreshConfigUI();
@@ -885,77 +946,90 @@ private void InitializeConfig(string gameName) {
 
         private bool m_isFirstProcessFill = true;
 
-        private void ComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e) {
+        private void ComboBox_SelectionChanged ( object sender, SelectionChangedEventArgs e )
+            {
             //ComboBoxItem comboBoxItem = ((sender as ComboBox).SelectedItem as ComboBoxItem);
 
-            try {
-                var box = (sender as ComboBox);
-                if (box == null || box.SelectedIndex < 0 || box.SelectedIndex > m_processList.Count) {
-                    return;
-                }
-
-                var p = m_processList[box.SelectedIndex];
-                if (p == null || p.HasExited) {
-                    return;
-                }
+                try
+                    {
+                    var box = ( sender as ComboBox );
+                    if ( box == null || box.SelectedIndex < 0 || box.SelectedIndex > m_processList.Count )
+                        {
+                        return;
+                        }
 
-                m_lastSelectedProcessName = p.ProcessName;
-                m_lastSelectedProcessId = p.Id;
+                    var p = m_processList [ box.SelectedIndex ];
+                    if ( p == null || p.HasExited )
+                        {
+                        return;
+                        }
+                
 
                 // Search for the VR plugins inside the game directory
                 // and warn the user if they exist.
-                if (m_lastDisplayedWarningProcess != m_lastSelectedProcessName && p.MainModule != null) {
-                    m_lastDisplayedWarningProcess = m_lastSelectedProcessName;
-
-                    var gamePath = p.MainModule.FileName;
-                    
-                    if (gamePath != null) {
-                        var gameDirectory = System.IO.Path.GetDirectoryName(gamePath);
-
-                        if (gameDirectory != null) {
-                            var pluginsDir = AreVRPluginsPresent(gameDirectory);
-
-                            if (pluginsDir != null) {
-                                MessageBox.Show("VR plugins have been detected in the game install directory.\n" +
-                                                "You may want to delete or rename these as they will cause issues with the mod.\n" +
-                                                "You may also want to pass -nohmd as a command-line option to the game. This can sometimes work without deleting anything.");
-                                var result = MessageBox.Show("Do you want to open the plugins directory now?", "Confirmation", MessageBoxButton.YesNo);
-
-                                switch (result) {
-                                    case MessageBoxResult.Yes:
-                                        NavigateToDirectory(pluginsDir);
-                                        break;
-                                    case MessageBoxResult.No:
-                                        break;
-                                };
-                            }
+                if ( m_lastDisplayedWarningProcess != m_lastSelectedProcessName && p.MainModule != null )
+                        {
+                        m_lastDisplayedWarningProcess = m_lastSelectedProcessName;
+
+                        var gamePath = p.MainModule.FileName;
+
+                        if ( gamePath != null )
+                            {
+                            var gameDirectory = System.IO.Path.GetDirectoryName ( gamePath );
+
+                            if ( gameDirectory != null )
+                                {
+                                var pluginsDir = AreVRPluginsPresent ( gameDirectory );
+
+                                if ( pluginsDir != null )
+                                    {
+                                    MessageBox.Show ( "VR plugins have been detected in the game install directory.\n" +
+                                                    "You may want to delete or rename these as they will cause issues with the mod.\n" +
+                                                    "You may also want to pass -nohmd as a command-line option to the game. This can sometimes work without deleting anything." );
+                                    var result = MessageBox.Show ( "Do you want to open the plugins directory now?", "Confirmation", MessageBoxButton.YesNo );
+
+                                    switch ( result )
+                                        {
+                                        case MessageBoxResult.Yes:
+                                            NavigateToDirectory ( pluginsDir );
+                                            break;
+                                        case MessageBoxResult.No:
+                                            break;
+                                        };
+                                    }
+
+                                Check_VirtualDesktop ( );
 
-                            Check_VirtualDesktop();
+                                m_iniListView.ItemsSource = null; // Because we are switching processes.
+                                InitializeConfig ( p.ProcessName );
 
-                            m_iniListView.ItemsSource = null; // Because we are switching processes.
-                            InitializeConfig(p.ProcessName);
+                                if ( !IsUnrealEngineGame ( gameDirectory, m_lastSelectedProcessName ) && !m_isFirstProcessFill )
+                                    {
+                                    MessageBox.Show ( "Warning: " + m_lastSelectedProcessName + " does not appear to be an Unreal Engine title" );
+                                    }
+                                }
 
-                            if (!IsUnrealEngineGame(gameDirectory, m_lastSelectedProcessName) && !m_isFirstProcessFill) {
-                                MessageBox.Show("Warning: " + m_lastSelectedProcessName + " does not appear to be an Unreal Engine title");
+                            m_lastDefaultProcessListName = GenerateProcessName ( p );
                             }
                         }
-
-                        m_lastDefaultProcessListName = GenerateProcessName(p);
+                    }
+                catch ( Exception ex )
+                    {
+                    Console.WriteLine ( $"Exception caught: {ex}" );
                     }
                 }
-            } catch (Exception ex) {
-                Console.WriteLine($"Exception caught: {ex}");
-            }
-        }
+            
 
-        private void ComboBox_DropDownOpened(object sender, System.EventArgs e) {
-            m_lastSelectedProcessName = "";
-            m_lastSelectedProcessId = 0;
+        private void ComboBox_DropDownOpened ( object sender, System.EventArgs e ) {
+            if ( !m_launchMode ) {
+                m_lastSelectedProcessName = "";
+                m_lastSelectedProcessId = 0;
 
-            FillProcessList();
-            Update_InjectStatus();
+                FillProcessList ( );
+                Update_InjectStatus ( );
 
-            m_isFirstProcessFill = false;
+                m_isFirstProcessFill = false;
+            }
         }
 
         private void Donate_Clicked(object sender, RoutedEventArgs e) {
@@ -972,201 +1046,386 @@ private void GitHub_Clicked(object sender, RoutedEventArgs e) {
             Process.Start(new ProcessStartInfo("https://github.com/praydog/UEVR") { UseShellExecute = true });
         }
 
-        private void Inject_Clicked(object sender, RoutedEventArgs e) {
-            // "Terminate Connected Process"
-            if (m_connected) {
-                try {
-                    var pid = m_lastSharedData?.pid;
+        private void LaunchModeButton_Clicked ( object sender, RoutedEventArgs e){
+          // m_LaunchModeButton.Content = m_launchMode ? "Switch to Inject Mode" : "Switch to Launch Mode";
+            m_launchMode = !m_launchMode;
+            if ( m_launchMode )
+                {
+                m_CmdLineGroup.Visibility = Visibility.Visible;
+                m_LaunchModeAppPicker.Visibility = Visibility.Visible;
+                m_processListBox.Visibility = Visibility.Collapsed;
+                m_LaunchModeText.Text = "Inject Mode";
+                m_LaunchButton.Visibility = Visibility.Visible;
+                m_injectButton.Visibility = Visibility.Collapsed; 
+                if (!string.IsNullOrEmpty(m_launchTarget) ) m_LaunchTargetView.Visibility = Visibility.Collapsed;
+                else m_LaunchTargetView.Visibility = Visibility.Visible;
+                m_LaunchModeIcon.Kind = MaterialDesignThemes.Wpf.PackIconKind.DebugStepInto;
+
+                }
+            else { 
+                m_CmdLineGroup.Visibility = Visibility.Collapsed;
+                m_LaunchModeAppPicker.Visibility = Visibility.Collapsed;
+                m_LaunchModeText.Text = "Launch Mode";
+                m_LaunchButton.Visibility = Visibility.Collapsed;
+                m_injectButton.Visibility = Visibility.Visible;
+                m_processListBox.Visibility = Visibility.Visible;
+                m_LaunchTargetView.Visibility = Visibility.Collapsed;
+                m_LaunchModeIcon.Kind = MaterialDesignThemes.Wpf.PackIconKind.Launch;
+                }
+            }
+
+        private void AppPicker_Clicked(object sender, RoutedEventArgs e )
+            {
+            var openFileDialog = new OpenFileDialog
+                {
+                DefaultExt = ".exe",
+                Filter = "Executable Files (*.exe)|*.exe",
+                };
+            bool? result = openFileDialog.ShowDialog ( );
+            m_launchTarget = openFileDialog.FileName;
+            m_LaunchTargetView.Visibility = Visibility.Visible;      
+            m_LaunchTargetView.Text = m_launchTarget;
+            }
+
+        private void CommandLineText_Updated(object sender, RoutedEventArgs e)
+            {
+            if ( !String.IsNullOrEmpty ( m_LaunchModeCmdLine.Text ) ) LaunchModeArgs = m_LaunchModeCmdLine.Text;
+            }
+
+        //private void Inject_Or_Launch_Clicked ( object sender, RoutedEventArgs e ) {
+        //        {
+        //        if ( m_launchMode )
+        //            {
+        //            Launch_Clicked ( sender, e );
+        //            }
+        //        else Inject_Clicked ( sender, e );
+        //        }
+        //    }
 
-                    if (pid != null) {
-                        var target = Process.GetProcessById((int)pid);
+        
+
+        private void Launch_Clicked ( object sender, RoutedEventArgs e )
+            {
+            if ( m_connected )
+                {
+                try
+                    {
+                    var _pid = m_lastSharedData?.pid;
+
+                    if ( _pid != null )
+                        {
+                        var target = Process.GetProcessById ( ( int )_pid );
 
-                        if (target == null || target.HasExited) {
+                        if ( target == null || target.HasExited )
+                            {
                             return;
-                        }
+                            }
 
-                        target.WaitForInputIdle(100);
+                        target.WaitForInputIdle ( 100 );
 
-                        SharedMemory.SendCommand(SharedMemory.Command.Quit);
+                        SharedMemory.SendCommand ( SharedMemory.Command.Quit );
 
-                        if (target.WaitForExit(2000)) {
+                        if ( target.WaitForExit ( 2000 ) )
+                            {
                             return;
-                        }
+                            }
 
-                        target.Kill();
+                        target.Kill ( );
+                        }
                     }
-                } catch(Exception) {
+                catch ( Exception )
+                    {
 
-                }
+                    }
 
                 return;
-            }
+                }
 
-            var selectedProcessName = m_processListBox.SelectedItem;
+            var now = DateTime.Now;
+            Process? process = null;
+            string runtimeName;
 
-            if (selectedProcessName == null) {
+            if ( m_openvrRadio.IsChecked == true )
+                {
+                runtimeName = "openvr_api.dll";
+                }
+            else if ( m_openxrRadio.IsChecked == true )
+                {
+                runtimeName = "openxr_loader.dll";
+                }
+            else
+                {
+                runtimeName = "openvr_api.dll";
+                }
+            Injector.PROCESS_INFORMATION pi;
+            Injector.STARTUPINFO si = new Injector.STARTUPINFO ( );
+            var cmdline = "";
+            var creationFlag = 4u;
+            if ( !String.IsNullOrEmpty ( m_commandLinePassThroughArgs ) )
+                cmdline += m_commandLinePassThroughArgs;
+            if ( !String.IsNullOrEmpty ( LaunchModeArgs ) )
+                cmdline += LaunchModeArgs;
+
+            var wdir = System.IO.Path.GetDirectoryName( m_launchTarget );
+  
+            var localRuntime = Path.Combine ( wdir, runtimeName );
+            if ( File.Exists ( localRuntime ) ) File.Delete ( localRuntime ); 
+            if ( !Injector.CreateProcess ( m_launchTarget, cmdline, IntPtr.Zero, IntPtr.Zero, true, creationFlag, IntPtr.Zero, wdir, ref si, out pi ) )
+                {
+                MessageBox.Show ( "Failed to launch process" );
                 return;
-            }
+                }
 
-            var index = m_processListBox.SelectedIndex;
-            var process = m_processList[index];
+            var pid = pi.dwProcessId;
+           
+                //if ( m_nullifyVRPluginsCheckbox.IsChecked == true )
+                //    {
+                //    IntPtr nullifierBase;
+                //    if ( Injector.InjectDll ( pid, "UEVRPluginNullifier.dll", out nullifierBase ) && nullifierBase.ToInt64 ( ) > 0 )
+                //        {
+                //        if ( !Injector.CallFunctionNoArgs ( pid, "UEVRPluginNullifier.dll", nullifierBase, "nullify", true ) )
+                //            {
+                //            //MessageBox.Show("Failed to nullify VR plugins.");
+                //            }
+                //        }
+                //    else
+                //        {
+                //        //MessageBox.Show("Failed to inject plugin nullifier.");
+                //        }
+                //    }
+
+
+
+                if ( Injector.InjectDll ( pid, runtimeName ) )
+                    {
+                    InitializeConfig (Path.GetFileName(m_launchTarget) );
 
-            if (process == null) {
-                return;
-            }
+                    try
+                        {
+                        if ( m_currentConfig != null )
+                            {
+                            if ( m_currentConfig [ "Frontend_RequestedRuntime" ] != runtimeName )
+                                {
+                                m_currentConfig [ "Frontend_RequestedRuntime" ] = runtimeName;
+                                RefreshConfigUI ( );
+                                SaveCurrentConfig ( );
+                                }
+                            }
+                        }
+                    catch ( Exception )
+                        {
 
-            // Double check that the process we want to inject into exists
-            // this can happen if the user presses inject again while
-            // the previous combo entry is still selected but the old process
-            // has died.
-            try {
-                var verifyProcess = Process.GetProcessById(m_lastSelectedProcessId);
+                        }
 
-                if (verifyProcess == null || verifyProcess.HasExited || verifyProcess.ProcessName != m_lastSelectedProcessName) {
-                    var processes = Process.GetProcessesByName(m_lastSelectedProcessName);
+                    Injector.InjectDll ( pid, "UEVRBackend.dll" );
+                    }
+                Injector.ResumeThread ( pi.hThread );
+            File.Copy ( runtimeName, localRuntime );
+                m_lastAutoInjectTime = now;
+                //m_commandLineAttachExe = null;
 
-                    if (processes == null || processes.Length == 0 || !AnyInjectableProcesses(processes)) {
-                        return;
+                if ( m_focusGameOnInjectionCheckbox.IsChecked == true )
+                    {
+                    SwitchToThisWindow (Process.GetProcessById(pi.dwProcessId).MainWindowHandle, true );
                     }
+                }           
+
+            private void Inject_Clicked ( object sender, RoutedEventArgs e ) {
+                // "Terminate Connected Process"
+                if ( m_connected ) {
+                    try {
+                        var pid = m_lastSharedData?.pid;
+
+                        if ( pid != null ) {
+                            var target = Process.GetProcessById ( ( int ) pid );
+
+                            if ( target == null || target.HasExited ) {
+                                return;
+                            }
+
+                            target.WaitForInputIdle ( 100 );
 
-                    foreach (var candidate in processes) {
-                        if (IsInjectableProcess(candidate)) {
-                            process = candidate;
-                            break;
+                            SharedMemory.SendCommand ( SharedMemory.Command.Quit );
+
+                            if ( target.WaitForExit ( 2000 ) ) {
+                                return;
+                            }
+
+                            target.Kill ( );
                         }
+                    } catch ( Exception ) {
+
                     }
 
-                    m_processList[index] = process;
-                    m_processListBox.Items[index] = GenerateProcessName(process);
-                    m_processListBox.SelectedIndex = index;
+                    return;
                 }
-            } catch(Exception ex) {
-                MessageBox.Show(ex.Message);
-                return;
-            }
 
-            string runtimeName;
+                var selectedProcessName = m_processListBox.SelectedItem;
 
-            if (m_openvrRadio.IsChecked == true) {
-                runtimeName = "openvr_api.dll";
-            } else if (m_openxrRadio.IsChecked == true) {
-                runtimeName = "openxr_loader.dll";
-            } else {
-                runtimeName = "openvr_api.dll";
-            }
+                if ( selectedProcessName == null ) {
+                    return;
+                }
+
+                var index = m_processListBox.SelectedIndex;
+                var process = m_processList [ index ];
+
+                if ( process == null ) {
+                    return;
+                }
+
+                // Double check that the process we want to inject into exists
+                // this can happen if the user presses inject again while
+                // the previous combo entry is still selected but the old process
+                // has died.
+                try {
+                    var verifyProcess = Process.GetProcessById ( m_lastSelectedProcessId );
+
+                    if ( verifyProcess == null || verifyProcess.HasExited || verifyProcess.ProcessName != m_lastSelectedProcessName ) {
+                        var processes = Process.GetProcessesByName ( m_lastSelectedProcessName );
+
+                        if ( processes == null || processes.Length == 0 || !AnyInjectableProcesses ( processes ) ) {
+                            return;
+                        }
 
-            if (m_nullifyVRPluginsCheckbox.IsChecked == true) {
-                IntPtr nullifierBase;
-                if (Injector.InjectDll(process.Id, "UEVRPluginNullifier.dll", out nullifierBase) && nullifierBase.ToInt64() > 0) {
-                    if (!Injector.CallFunctionNoArgs(process.Id, "UEVRPluginNullifier.dll", nullifierBase, "nullify", true)) {
-                        MessageBox.Show("Failed to nullify VR plugins.");
+                        foreach ( var candidate in processes ) {
+                            if ( IsInjectableProcess ( candidate ) ) {
+                                process = candidate;
+                                break;
+                            }
+                        }
+
+                        m_processList [ index ] = process;
+                        m_processListBox.Items [ index ] = GenerateProcessName ( process );
+                        m_processListBox.SelectedIndex = index;
                     }
+                } catch ( Exception ex ) {
+                    MessageBox.Show ( ex.Message );
+                    return;
+                }
+
+                string runtimeName;
+
+                if ( m_openvrRadio.IsChecked == true ) {
+                    runtimeName = "openvr_api.dll";
+                } else if ( m_openxrRadio.IsChecked == true ) {
+                    runtimeName = "openxr_loader.dll";
                 } else {
-                    MessageBox.Show("Failed to inject plugin nullifier.");
+                    runtimeName = "openvr_api.dll";
                 }
-            }
 
-            if (Injector.InjectDll(process.Id, runtimeName)) {
-                try {
-                    if (m_currentConfig != null) {
-                        if (m_currentConfig["Frontend_RequestedRuntime"] != runtimeName) {
-                            m_currentConfig["Frontend_RequestedRuntime"] = runtimeName;
-                            RefreshConfigUI();
-                            SaveCurrentConfig();
+                if ( m_nullifyVRPluginsCheckbox.IsChecked == true ) {
+                    IntPtr nullifierBase;
+                    if ( Injector.InjectDll ( process.Id, "UEVRPluginNullifier.dll", out nullifierBase ) && nullifierBase.ToInt64 ( ) > 0 ) {
+                        if ( !Injector.CallFunctionNoArgs ( process.Id, "UEVRPluginNullifier.dll", nullifierBase, "nullify", true ) ) {
+                            MessageBox.Show ( "Failed to nullify VR plugins." );
+                        }
+                    } else {
+                        MessageBox.Show ( "Failed to inject plugin nullifier." );
+                    }
+                }
+
+                if ( Injector.InjectDll ( process.Id, runtimeName ) ) {
+                    try {
+                        if ( m_currentConfig != null ) {
+                            if ( m_currentConfig [ "Frontend_RequestedRuntime" ] != runtimeName ) {
+                                m_currentConfig [ "Frontend_RequestedRuntime" ] = runtimeName;
+                                RefreshConfigUI ( );
+                                SaveCurrentConfig ( );
+                            }
                         }
+                    } catch ( Exception ) {
+
                     }
-                } catch (Exception) {
 
+                    Injector.InjectDll ( process.Id, "UEVRBackend.dll" );
                 }
 
-                Injector.InjectDll(process.Id, "UEVRBackend.dll");
+                if ( m_focusGameOnInjectionCheckbox.IsChecked == true )
+                {
+                    SwitchToThisWindow ( process.MainWindowHandle, true );
+                }
             }
 
-            if (m_focusGameOnInjectionCheckbox.IsChecked == true)
-            {
-                SwitchToThisWindow(process.MainWindowHandle, true);
+            private string GenerateProcessName ( Process p ) {
+                return p.ProcessName + " (pid: " + p.Id + ")" + " (" + p.MainWindowTitle + ")";
             }
-        }
 
-        private string GenerateProcessName(Process p) {
-            return p.ProcessName + " (pid: " + p.Id + ")" + " (" + p.MainWindowTitle + ")";
-        }
+            [DllImport ( "kernel32.dll", SetLastError = true, CallingConvention = CallingConvention.Winapi )]
+            [return: MarshalAs ( UnmanagedType.Bool )]
+            private static extern bool IsWow64Process ( [In] IntPtr hProcess, [Out] out bool wow64Process );
 
-        [DllImport("kernel32.dll", SetLastError = true, CallingConvention = CallingConvention.Winapi)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        private static extern bool IsWow64Process([In] IntPtr hProcess, [Out] out bool wow64Process);
+            private bool IsInjectableProcess ( Process process ) {
 
-        private bool IsInjectableProcess(Process process) {
-        
-            try {
-                if (Environment.Is64BitOperatingSystem) {
-                    try {
-                        bool isWow64 = false;
-                        if (IsWow64Process(process.Handle, out isWow64) && isWow64) {
+                try {
+                    if ( Environment.Is64BitOperatingSystem ) {
+                        try {
+                            bool isWow64 = false;
+                            if ( IsWow64Process ( process.Handle, out isWow64 ) && isWow64 ) {
+                                return false;
+                            }
+                        } catch {
+                            // If we threw an exception here, then the process probably can't be accessed anyways.
                             return false;
                         }
-                    } catch {
-                        // If we threw an exception here, then the process probably can't be accessed anyways.
+                    }
+
+                    if ( process.MainWindowTitle.Length == 0 ) {
                         return false;
                     }
-                }
 
-                if (process.MainWindowTitle.Length == 0) {
-                    return false;
-                }
+                    if ( process.Id == Process.GetCurrentProcess ( ).Id ) {
+                        return false;
+                    }
 
-                if (process.Id == Process.GetCurrentProcess().Id) {
-                    return false;
-                }
+                    if ( !m_executableFilter.IsValidExecutable ( process.ProcessName.ToLower ( ) ) ) {
+                        return false;
+                    }
 
-                if (!m_executableFilter.IsValidExecutable(process.ProcessName.ToLower())) {
-                    return false;
-                }
+                    foreach ( ProcessModule module in process.Modules ) {
+                        if ( module.ModuleName == null ) {
+                            continue;
+                        }
 
-                foreach (ProcessModule module in process.Modules) {
-                    if (module.ModuleName == null) {
-                        continue;
+                        string moduleLow = module.ModuleName.ToLower ( );
+                        if ( moduleLow == "d3d11.dll" || moduleLow == "d3d12.dll" ) {
+                            return true;
+                        }
                     }
 
-                    string moduleLow = module.ModuleName.ToLower();
-                    if (moduleLow == "d3d11.dll" || moduleLow == "d3d12.dll") {
-                        return true ;
-                    }
-                }
+                    // Check if the excluded processes file exists
+                    if ( File.Exists ( excludedProcessesFile ) ) {
+
+                        List<string> excludedProcesses = new List<string> ( );
+
+                        // Read excluded process names from the text file
+                        excludedProcesses = File.ReadAllLines ( excludedProcessesFile ).ToList ( );
+
+                        // Check if the process name is in the excluded list
+                        if ( excludedProcesses.Contains ( process.ProcessName ) ) {
+                            return false;
+                        }
 
-                // Check if the excluded processes file exists
-                if (File.Exists(excludedProcessesFile)) {
-                    
-                    List<string> excludedProcesses = new List<string>();
-    
-                    // Read excluded process names from the text file
-                    excludedProcesses = File.ReadAllLines(excludedProcessesFile).ToList();
-    
-                    // Check if the process name is in the excluded list
-                    if (excludedProcesses.Contains(process.ProcessName)) {
-                        return false;
                     }
-                    
-                }
 
-                return false;
-            } catch(Exception ex) {
-                Console.WriteLine(ex.ToString());
-                return false;
+                    return false;
+                } catch ( Exception ex ) {
+                    Console.WriteLine ( ex.ToString ( ) );
+                    return false;
+                }
             }
-        }
 
-        private bool AnyInjectableProcesses(Process[] processList) {
-            foreach (Process process in processList) {
-                if (IsInjectableProcess(process)) {
-                    return true;
+            private bool AnyInjectableProcesses ( Process [ ] processList ) {
+                foreach ( Process process in processList ) {
+                    if ( IsInjectableProcess ( process ) )
+                        return true;
                 }
+                return false;
             }
+        
 
-            return false;
-        }
         private SemaphoreSlim m_processSemaphore = new SemaphoreSlim(1, 1); // create a semaphore with initial count of 1 and max count of 1
         private string? m_lastDefaultProcessListName = null;
+        private TimeSpan oneSecond = TimeSpan.FromSeconds ( 1 );
 
         private async void FillProcessList() {
             // Allow the previous running FillProcessList task to finish first
@@ -1231,5 +1490,6 @@ await Task.Run(() => {
                 m_processSemaphore.Release();
             }
         }
+
     }
 }
diff --git a/UEVR/MainWindowSettings.cs b/UEVR/MainWindowSettings.cs
index 4ac4d09..ca39651 100644
--- a/UEVR/MainWindowSettings.cs
+++ b/UEVR/MainWindowSettings.cs
@@ -42,5 +42,14 @@ public bool FocusGameOnInjection
             get { return (bool)this["FocusGameOnInjection"]; }
             set { this["FocusGameOnInjection"] = value; }
         }
+
+        //[UserScopedSettingAttribute ( )]
+        //[DefaultSettingValueAttribute ( "false" )]
+        //public bool m_LaunchModeButton
+        //{
+        //    get { return ( bool ) this [ "LaunchModeButton" ]; }
+        //    set { this [ "LaunchModeButton" ] = value; }
+        //}
+
     }
 }
diff --git a/UEVR/UEVR.csproj b/UEVR/UEVR.csproj
index 31c8d3c..f3582f7 100644
--- a/UEVR/UEVR.csproj
+++ b/UEVR/UEVR.csproj
@@ -14,12 +14,18 @@
     <PublishSingleFile>true</PublishSingleFile>
     <SelfContained>false</SelfContained>
     <PackageProjectUrl>https://github.com/praydog/uevr-frontend</PackageProjectUrl>
+    <Platforms>AnyCPU;x64</Platforms>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <Optimize>True</Optimize>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Optimize>True</Optimize>
+  </PropertyGroup>
+
   <ItemGroup>
     <None Remove="discord.png" />
     <None Remove="donate.png" />
@@ -43,6 +49,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="7.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="System.Collections" Version="4.3.0" />
   </ItemGroup>
 
   <ItemGroup>