diff --git a/src/App.xaml b/src/App.xaml
index 416604b..d7c24bb 100644
--- a/src/App.xaml
+++ b/src/App.xaml
@@ -448,34 +448,7 @@
         </ControlTemplate>
 
         <Style x:Key="{x:Type ComboBox}" TargetType="ComboBox">
-            <Setter Property="ItemTemplate">
-                <Setter.Value>
-                    <DataTemplate DataType="{x:Type models:ActionCatalogItem}">
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock 
-                                Text="{Binding ActionName}"
-                                HorizontalAlignment="Left" 
-                                VerticalAlignment="Center" 
-                                Focusable="True" 
-                                Background="Transparent"
-                                Foreground="{StaticResource TextBrush}"
-                                Width="300"
-                                />
-                            <Button Command="{Binding RemoveActionCatalogItemCommand}"
-                                    CommandParameter="{Binding}"
-                                    Visibility="{Binding IsRemovable, Converter={StaticResource BooleanToVisibilityConverter}}"
-                                    ToolTip="Remove Action" 
-                                    ToolTipService.InitialShowDelay="800" 
-                                    HorizontalContentAlignment="Right"
-                                    HorizontalAlignment="Right"
-                                    Background="Transparent" 
-                                    BorderBrush="Transparent">
-                                <Image Source="../Images/remove_red_26x26.png" Height="12" Width="12"/>
-                            </Button>
-                        </StackPanel>
-                    </DataTemplate>
-                </Setter.Value>
-            </Setter>
+ 
             <Setter Property="Foreground" Value="{StaticResource TextBrush}"/>
             <Setter Property="Template">
                 <Setter.Value>
@@ -483,53 +456,53 @@
                         <Grid>
                             <CheckBox></CheckBox>
                             <ToggleButton 
-                                 Name="ToggleButton" 
-                                 Template="{StaticResource ComboBoxToggleButton}" 
-                                 Grid.Column="2" 
-                                 Focusable="false"
-                                 IsChecked="{Binding Path=IsDropDownOpen,Mode=TwoWay,RelativeSource={RelativeSource TemplatedParent}}"
-                                 ClickMode="Press">
+                                Name="ToggleButton" 
+                                Template="{StaticResource ComboBoxToggleButton}" 
+                                Grid.Column="2" 
+                                Focusable="false"
+                                IsChecked="{Binding Path=IsDropDownOpen,Mode=TwoWay,RelativeSource={RelativeSource TemplatedParent}}"
+                                ClickMode="Press">
                             </ToggleButton>
                             <ContentPresenter
-                                Name="ContentSite"
-                                Content="{TemplateBinding ComboBox.SelectionBoxItem}" 
-                                ContentTemplate="{TemplateBinding ComboBox.SelectionBoxItemTemplate}" 
-                                ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
-                                IsHitTestVisible="False" 
-                                Margin="3,3,23,3"
-                                VerticalAlignment="Center"
-                                HorizontalAlignment="Left" />
+                               Name="ContentSite"
+                               Content="{TemplateBinding ComboBox.SelectionBoxItem}" 
+                               ContentTemplate="{TemplateBinding ComboBox.SelectionBoxItemTemplate}" 
+                               ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
+                               IsHitTestVisible="False" 
+                               Margin="3,3,23,3"
+                               VerticalAlignment="Center"
+                               HorizontalAlignment="Left" />
                             <TextBox x:Name="PART_EditableTextBox"
-                                     Style="{x:Null}" 
-                                     Template="{StaticResource ComboBoxTextBox}" 
-                                     HorizontalAlignment="Left" 
-                                     VerticalAlignment="Center" 
-                                     SelectionBrush="{StaticResource SelectedBorderBrush}"
-                                     CaretBrush="{StaticResource TextBrush}"
-                                     Margin="3,3,23,3"
-                                     Focusable="True" 
-                                     Background="Transparent"
-                                     Foreground="{TemplateBinding Foreground}"
-                                     FontSize="14"
-                                     Visibility="Hidden"
-                                     IsReadOnly="{TemplateBinding IsReadOnly}"/>
+                                    Style="{x:Null}" 
+                                    Template="{StaticResource ComboBoxTextBox}" 
+                                    HorizontalAlignment="Left" 
+                                    VerticalAlignment="Center" 
+                                    SelectionBrush="{StaticResource SelectedBorderBrush}"
+                                    CaretBrush="{StaticResource TextBrush}"
+                                    Margin="3,3,23,3"
+                                    Focusable="True" 
+                                    Background="Transparent"
+                                    Foreground="{TemplateBinding Foreground}"
+                                    FontSize="14"
+                                    Visibility="Hidden"
+                                    IsReadOnly="{TemplateBinding IsReadOnly}"/>
                             <Popup 
-                                Name="Popup"
-                                Placement="Bottom"
-                                IsOpen="{TemplateBinding IsDropDownOpen}"
-                                AllowsTransparency="True" 
-                                Focusable="False"
-                                PopupAnimation="Slide">
+                               Name="Popup"
+                               Placement="Bottom"
+                               IsOpen="{TemplateBinding IsDropDownOpen}"
+                               AllowsTransparency="True" 
+                               Focusable="False"
+                               PopupAnimation="Slide">
                                 <Grid 
-                                  Name="DropDown"
-                                  Background="Azure"
-                                  SnapsToDevicePixels="True"                
-                                  MinWidth="{TemplateBinding ActualWidth}"
-                                  MaxHeight="{TemplateBinding MaxDropDownHeight}">
+                                 Name="DropDown"
+                                 Background="Azure"
+                                 SnapsToDevicePixels="True"                
+                                 MinWidth="{TemplateBinding ActualWidth}"
+                                 MaxHeight="{TemplateBinding MaxDropDownHeight}">
                                     <Border 
-                                    x:Name="DropDownBorder"
-                                    Background="{StaticResource SelectedBrush}"
-                                    BorderThickness="1"/>
+                                   x:Name="DropDownBorder"
+                                   Background="{StaticResource SelectedBrush}"
+                                   BorderThickness="1"/>
                                     <ScrollViewer Margin="4,6,4,6" SnapsToDevicePixels="True">
                                         <StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Contained" />
                                     </ScrollViewer>
@@ -561,6 +534,8 @@
             </Setter>
         </Style>
 
+
+
         <Style TargetType="TabItem" x:Key="CustomTabItem">
             <Setter Property="Template">
                 <Setter.Value>
diff --git a/src/Controls/KeypressActions.xaml b/src/Controls/KeypressActions.xaml
index 74bd336..7bf2ffb 100644
--- a/src/Controls/KeypressActions.xaml
+++ b/src/Controls/KeypressActions.xaml
@@ -65,7 +65,7 @@
                                         </Image.Style>
                                     </Image>
                                 </Grid>
-                                <TextBox Text="{Binding TimeInMilliseconds}" Width="66" HorizontalAlignment="Stretch" TextAlignment="Center" BorderBrush="{StaticResource HoverBorderBrush}"/>
+                                <TextBox Text="{Binding TimeInMilliseconds}" ToolTip="Time in milliseconds that should pass before this keystroke action should take place" Width="66" HorizontalAlignment="Stretch" TextAlignment="Center" BorderBrush="{StaticResource HoverBorderBrush}"/>
                             </StackPanel>
                         </Grid>
 
diff --git a/src/Controls/MacroTransport.xaml b/src/Controls/MacroTransport.xaml
index 735de66..3a889cf 100644
--- a/src/Controls/MacroTransport.xaml
+++ b/src/Controls/MacroTransport.xaml
@@ -56,7 +56,6 @@
                   SelectionChanged="ActionList_OnSelectionChanged" 
                   Text="{Binding ActionName, UpdateSourceTrigger=LostFocus}" 
                   ItemsSource="{Binding DataContext.ActionCatalog.Catalog, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type DockPanel}}}" 
-                  DisplayMemberPath="ActionName" 
                   IsEditable="True" 
                   IsTextSearchEnabled="False" 
                   FontSize="14" 
@@ -64,12 +63,39 @@
                   Width="300"
                   Margin="0,2,0,0" 
                   HorizontalAlignment="Left" 
-                  VerticalAlignment="Center"/>
+                  VerticalAlignment="Center">
+            <ComboBox.ItemTemplate>
+                <DataTemplate>
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock 
+                              Text="{Binding ActionName}"
+                              HorizontalAlignment="Left" 
+                              VerticalAlignment="Center" 
+                              Focusable="True" 
+                              Background="Transparent"
+                              Foreground="{StaticResource TextBrush}"
+                              Width="300"
+                              />
+                        <Button Command="{Binding RemoveActionCatalogItemCommand}"
+                                  CommandParameter="{Binding}"
+                                  Visibility="{Binding IsRemovable, Converter={StaticResource BooleanToVisibilityConverter}}"
+                                  ToolTip="Remove Action" 
+                                  ToolTipService.InitialShowDelay="800" 
+                                  HorizontalContentAlignment="Right"
+                                  HorizontalAlignment="Right"
+                                  Background="Transparent" 
+                                  BorderBrush="Transparent">
+                            <Image Source="../Images/remove_red_26x26.png" Height="12" Width="12"/>
+                        </Button>
+                    </StackPanel>
+                </DataTemplate>
+            </ComboBox.ItemTemplate>
+        </ComboBox>
 
         <StackPanel Orientation="Horizontal"  VerticalAlignment="Center" Margin="0,0,0,0">
             <CheckBox Margin="0,2,0,0" IsChecked="{Binding IsOneShot}" ToolTip="Play all keystrokes in order. Do not wait for button release" ToolTipService.InitialShowDelay="800">One Shot</CheckBox>
             <Label Content="Repeats" Foreground="{StaticResource TextBrush}" Margin="81,0,0,0"/>
-            <TextBox Text="{Binding RepeatCount}" ToolTip="Number of times to repeat this button press. -1 for infinite" ToolTipService.InitialShowDelay="800" Foreground="{StaticResource TextBrush}" CaretBrush="{StaticResource TextBrush}" Margin="0,0,2,0" Width="100" Height="20" FontSize="12" Background="{StaticResource WindowBackgroundBrush}" BorderBrush="{StaticResource NormalBorderBrush}"/>
+            <TextBox Text="{Binding RepeatCount}" ToolTip="Number of times to repeat this button press. -1 for infinite" ToolTipService.InitialShowDelay="800" Foreground="{StaticResource TextBrush}" CaretBrush="{StaticResource TextBrush}" Margin="0,0,2,0" Width="101" Height="20" FontSize="12" Background="{StaticResource WindowBackgroundBrush}" BorderBrush="{StaticResource NormalBorderBrush}"/>
         </StackPanel>
     </StackPanel>
 </UserControl>
diff --git a/src/Models/ActionCatalogItem.cs b/src/Models/ActionCatalogItem.cs
index 4a6aaea..206650a 100644
--- a/src/Models/ActionCatalogItem.cs
+++ b/src/Models/ActionCatalogItem.cs
@@ -9,6 +9,7 @@
 
 namespace SierraHOTAS.Models
 {
+    [SierraJsonObject(SierraJsonObject.MemberSerialization.OptIn)]
     public class ActionCatalogItem : INotifyPropertyChanged, IComparable<ActionCatalogItem>
     {
         public event EventHandler<ActionCatalogItemRemovedRequestedEventArgs> RemoveRequested;
@@ -16,14 +17,15 @@ public class ActionCatalogItem : INotifyPropertyChanged, IComparable<ActionCatal
         private string _actionName;
         public const string NO_ACTION_TEXT = "<No Action>";
 
+        [SierraJsonProperty]
         public Guid Id { get; set; }
 
-        [SierraJsonIgnore] 
         public bool NoAction { get; set; } = false;
 
-        [SierraJsonIgnore] public bool IsRemovable => !NoAction;
+        public bool IsRemovable => !NoAction;
         
         [DefaultValue("")]
+        [SierraJsonProperty]
         public string ActionName
         {
             get => _actionName;
@@ -35,6 +37,7 @@ public string ActionName
             }
         }
 
+        [SierraJsonProperty]
         public ObservableCollection<ButtonAction> Actions { get; set; }
 
         public event PropertyChangedEventHandler PropertyChanged;
diff --git a/src/Models/FileSystem.cs b/src/Models/FileSystem.cs
index 7515144..a889306 100644
--- a/src/Models/FileSystem.cs
+++ b/src/Models/FileSystem.cs
@@ -35,7 +35,7 @@ public void SaveQuickProfilesList(Dictionary<int, QuickProfileItem> list, string
         {
             fileName = BuildCurrentPath(fileName);
             Logging.Log.Debug($"Saving Quick List as :{fileName}");
-            
+
             try
             {
                 _fileIo.WriteAllText(fileName, Serializer.ToJSON(list, new CustomSierraJsonConverter()));
@@ -145,6 +145,10 @@ public IHOTASCollection FileOpen(string path)
                 if (version == HOTASCollection.FileFormatVersion)
                 {
                     collection = Serializer.ToObject<HOTASCollection>(json, new CustomSierraJsonConverter());
+                    if (collection.ActionCatalog == null)
+                    {
+                        collection.SetCatalog(new ActionCatalog());
+                    }
                     collection.ActionCatalog.PostDeserializeProcess();
                 }
                 //else - based on version, use factory to get old version and convert/map to latest version, then re-save
diff --git a/src/Models/HOTASDevice.cs.bak b/src/Models/HOTASDevice.cs.bak
deleted file mode 100644
index 4769eed..0000000
--- a/src/Models/HOTASDevice.cs.bak
+++ /dev/null
@@ -1,235 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.Linq;
-using System.Reactive.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows.Controls;
-using Newtonsoft.Json;
-using SharpDX.DirectInput;
-
-namespace SierraHOTAS.Models
-{
-    [JsonObject(MemberSerialization.OptIn)]
-    public class HOTASDevice
-    {
-        public event EventHandler<ButtonPressedEventArgs> ButtonPressed;
-
-        [JsonProperty]
-        public Guid InstanceId { get; set; }
-
-        [JsonProperty]
-        public string Name { get; set; }
-
-        public Capabilities Capabilities { get; set; }
-
-        [JsonProperty]
-        public ObservableCollection<HOTASMap> ButtonMap { get; set; }
-
-        private Joystick Joystick { get; set; }
-        private IDisposable _disposableSubscription = null;
-        private bool _isStopRequested = false;
-
-        public HOTASDevice(Guid instanceId, string name)
-        {
-            if (instanceId == Guid.Empty || instanceId == null || string.IsNullOrWhiteSpace(name))
-            {
-                throw new NullReferenceException("Information about Joystick is unavailable");
-            }
-
-            InstanceId = instanceId;
-            Name = name;
-
-            if (MainWindow.IsDebug) return;
-
-            var i = new DirectInput();
-            Joystick = new Joystick(i, InstanceId);
-            Joystick.Properties.BufferSize = 128;
-            Joystick.Acquire();
-
-            Capabilities = Joystick.Capabilities;
-
-            LoadCapabilitiesMapping();
-
-            Console.WriteLine("AxeCount {0}", Capabilities.AxeCount);
-            Console.WriteLine("ButtonCount {0}", Capabilities.ButtonCount);
-            Console.WriteLine("PovCount {0}", Capabilities.PovCount);
-            Console.WriteLine("Flags {0}", Capabilities.Flags);
-        }
-
-
-        private void TEST_LoadCapabilitiesMapping()
-        {
-            ButtonMap = new ObservableCollection<HOTASMap>();
-
-            for (var i = 1; i <= 37; i++)
-            {
-                ButtonMap.Add(new HOTASMap() { Offset = JoystickOffsetValues.Offsets[i], ButtonId = i, Action = "<EMPTY>", ButtonName = $"Button{i}" });
-            }
-        }
-
-        private Task _deviceTask;
-        private CancellationTokenSource _tokenSourceListenLoop;
-        private CancellationToken _tokenListenLoop;
-        public void Listen()
-        {
-            _tokenSourceListenLoop = new CancellationTokenSource();
-            _tokenListenLoop = _tokenSourceListenLoop.Token;
-            _deviceTask = Task.Run(ListenLoop, _tokenListenLoop);
-        }
-
-        private void ListenLoop()
-        {
-            Debug.WriteLine("\n\nReading Joystick...!");
-
-            var p = Joystick.Properties;
-
-            while (!_tokenListenLoop.IsCancellationRequested)
-            {
-                Joystick.Poll();
-                var data = Joystick.GetBufferedData();
-
-                foreach (var state in data)
-                {
-                    if (state.Offset < JoystickOffset.Buttons0 || state.Offset > JoystickOffset.Buttons127)
-                        break;
-
-                    Debug.WriteLine($"State:{state.ToString()}");
-
-
-                    //multiple buttons can be down at once
-                    if (state.Value == 128)
-                    {
-                        //start button down with repeat
-                        //add button id to list
-                    }
-
-                    if (state.Value == 128)
-                    {
-                        //stop button down
-                        //use button id to stop
-                    }
-
-                    OnButtonPress((int)state.Offset);
-                    var map = GetMap(state.Offset);
-                    if (map != null)
-                    {
-                        ProcessButton(map); //event for action trigger
-                    }
-                }
-
-            }
-
-
-
-            //_disposableSubscription = Observable.Interval(TimeSpan.FromMilliseconds(1))
-            //    .SelectMany(x =>
-            //    {
-            //        Joystick.Poll();
-            //        return Joystick.GetBufferedData();
-            //    })
-            //    .Where(state =>
-            //    {
-            //        if (state.Offset < JoystickOffset.Buttons0 || state.Offset > JoystickOffset.Buttons127) return false;
-            //        Debug.WriteLine($"Value:{state.Value}, Offset:{state.Offset}, RawOffset:{state.RawOffset}");
-            //        //if (state.Value == 128) return false;
-            //        Debug.WriteLine($"State:{state.ToString()}");
-            //        return true;
-            //    })
-            //    .Subscribe(async state =>
-            //        {
-            //            OnButtonPress((int)state.Offset);
-            //            var map = GetMap(state.Offset);
-            //            if (map != null)
-            //            {
-            //                await ProcessButton(map); //event for action trigger
-            //            }
-            //        }
-            //    );
-        }
-
-        public void Stop()
-        {
-            _isStopRequested = true;
-
-            if (MainWindow.IsDebug) return;
-
-            _disposableSubscription?.Dispose();
-            _tokenSourceListenLoop.Cancel();
-            if (!_tokenSourceListenLoop.IsCancellationRequested) return;
-            if (_deviceTask.IsCanceled)
-            {
-                _deviceTask.Dispose();
-            }
-        }
-
-        private void LoadCapabilitiesMapping()
-        {
-            ButtonMap = new ObservableCollection<HOTASMap>();
-
-            SeedButtonMap(JoystickOffset.X, Capabilities.AxeCount, HOTASMap.ButtonType.Axis);
-            SeedButtonMap(JoystickOffset.PointOfViewControllers0, Capabilities.PovCount, HOTASMap.ButtonType.POV);
-            SeedButtonMap(JoystickOffset.Buttons0, Capabilities.ButtonCount, HOTASMap.ButtonType.Button);
-        }
-
-        private void SeedButtonMap(JoystickOffset startFrom, int length, HOTASMap.ButtonType type)
-        {
-            var indexStart = JoystickOffsetValues.GetIndex(startFrom.ToString());
-            for (var i = indexStart; i < indexStart + length; i++)
-            {
-                var x = JoystickOffsetValues.GetOffset(i);
-                ButtonMap.Add(new HOTASMap()
-                {
-                    Offset = x,
-                    ButtonId = (int)x,
-                    Type = type,
-                    Action = $"<{type.ToString().ToUpper()}>",
-                    ButtonName = $"{JoystickOffsetValues.GetName(x)}"
-                });
-            }
-        }
-
-        public HOTASMap GetMap(JoystickOffset buttonId)
-        {
-            var offset = (int)buttonId;
-            return ButtonMap.FirstOrDefault(m => m.ButtonId == offset);
-        }
-
-        private void OnButtonPress(int buttonId)
-        {
-            ButtonPressed?.Invoke(this, new ButtonPressedEventArgs() { ButtonId = buttonId, Device = this });
-        }
-
-        private void ProcessButton(HOTASMap map)
-        {
-            if (map.Actions == null) return;
-            //TODO: temp
-            Debug.WriteLine($"Processing map: {map.ButtonName} for {Name}. Sending Keypresses: {map.Action}");
-
-            foreach (var action in map.Actions)
-            {
-                Keyboard.SendKeyPress((Win32Structures.ScanCodeShort)action.ScanCode, action.Flags);
-                System.Threading.Thread.Sleep(action.TimeInMilliseconds + 1);
-            }
-        }
-
-        private async Task ProcessButtonAsync(HOTASMap map)
-        {
-            if (map.Actions == null) return;
-            //TODO: temp
-            Debug.WriteLine($"Processing map: {map.ButtonName} for {Name}. Sending Keypresses: {map.Action}");
-
-            foreach (var action in map.Actions)
-            {
-                Keyboard.SendKeyPress((Win32Structures.ScanCodeShort)action.ScanCode, action.Flags);
-                await Task.Delay(action.TimeInMilliseconds + 1);
-            }
-
-            await Task.CompletedTask;
-        }
-
-    }
-}
diff --git a/src/Serializer/CustomAttributes.cs b/src/Serializer/CustomAttributes.cs
index 1f9de62..afd2102 100644
--- a/src/Serializer/CustomAttributes.cs
+++ b/src/Serializer/CustomAttributes.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Linq;
+using System.Reflection;
 
 namespace SierraJSON
 {
@@ -33,4 +35,26 @@ public SierraJsonIgnore()
         {
         }
     }
+    
+    public class SierraJsonAttributes
+    {
+        public static PropertyInfo[] GetSerializableProperties(Object obj)
+        {
+            var type = obj.GetType();
+            var sierraObjectAttribute = (SierraJsonObject)type.GetCustomAttribute(typeof(SierraJsonObject));
+            var isOptIn = sierraObjectAttribute?.Option == SierraJsonObject.MemberSerialization.OptIn;
+
+            PropertyInfo[] propList;
+            if (isOptIn)
+            {
+                propList = type.GetProperties().Where(p => p.IsDefined(typeof(SierraJsonProperty))).ToArray();
+            }
+            else
+            {
+                propList = type.GetProperties().Where(p => !p.IsDefined(typeof(SierraJsonIgnore))).ToArray();
+            }
+            return propList;
+        }
+    }
+
 }
diff --git a/src/Serializer/Write.cs b/src/Serializer/Write.cs
index f4bb0ad..fc04d6c 100644
--- a/src/Serializer/Write.cs
+++ b/src/Serializer/Write.cs
@@ -177,8 +177,12 @@ private static void WriteBool(bool b)
 
         private static void WriteCollection(ICollection collection)
         {
-            if (collection.Count == 0) return;
-
+            if (collection.Count == 0)
+            {
+                _resultJSON.Append(ARRAY_START);
+                _resultJSON.Append(ARRAY_END);
+                return;
+            }
             _resultJSON.Append(ARRAY_START);
             pendingCollectionStartFormat = true;
 
diff --git a/src/Win32/Keyboard.cs.bak b/src/Win32/Keyboard.cs.bak
deleted file mode 100644
index c6df294..0000000
--- a/src/Win32/Keyboard.cs.bak
+++ /dev/null
@@ -1,205 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Runtime.InteropServices;
-
-namespace SierraHOTAS
-{
-    //https://blogs.msdn.microsoft.com/toub/2006/05/03/low-level-keyboard-hook-in-c/
-    public class Keyboard
-    {
-        [DllImport("user32.dll")]
-        internal static extern uint SendInput(uint nInputs, [MarshalAs(UnmanagedType.LPArray), In] Win32Structures.INPUT[] pInputs, int cbSize);
-
-        [DllImport("user32.dll")]
-        internal static extern uint MapVirtualKeyEx(uint uCode, uint uMapType, IntPtr dwhkl);
-
-        [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
-        internal static extern IntPtr SetWindowsHookEx(int idHook, LowLevelKeyboardProc lpfn, IntPtr hMod, uint dwThreadId);
-
-        [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static extern bool UnhookWindowsHookEx(IntPtr hhk);
-
-        [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
-        internal static extern IntPtr CallNextHookEx(IntPtr hhk, int nCode, IntPtr wParam, IntPtr lParam);
-
-        [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
-        internal static extern IntPtr GetModuleHandle(string lpModuleName);
-
-        internal delegate IntPtr LowLevelKeyboardProc(int nCode, IntPtr wParam, IntPtr lParam);
-
-        [return: MarshalAs(UnmanagedType.Bool)]
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
-        internal static extern bool PostMessage(HandleRef hWnd, uint Msg, IntPtr wParam, IntPtr lParam);
-
-
-        internal static event EventHandler<KeystrokeEventArgs> KeyDownEvent;
-        internal static event EventHandler<KeystrokeEventArgs> KeyUpEvent;
-
-        internal const int WH_KEYBOARD_LL = 13;
-        internal const int WM_KEYDOWN = 0x0100;
-        internal const int WM_KEYUP = 0x0101;
-        internal const int WM_SYSKEYDOWN = 0x0104;
-        internal const int WM_SYSKEYUP = 0x0105;
-        internal const int WM_PREVIOUS_KEYSTATE = 0x40000000;
-
-        internal const uint MAPVK_VK_TO_VSC = 0x00;
-        internal const uint MAPVK_VSC_TO_VK = 0x01;
-        internal const uint MAPVK_VK_TO_CHAR = 0x02;
-        internal const uint MAPVK_VSC_TO_VK_EX = 0x03;
-        internal const uint MAPVK_VK_TO_VSC_EX = 0x04;
-
-        internal static LowLevelKeyboardProc _proc = HookCallback;
-        internal static IntPtr _hookID = IntPtr.Zero;
-
-        public static bool IsKeySuppressionActive { get; set; }
-
-        internal class KeystrokeEventArgs : EventArgs
-        {
-            public int Code { get; set; }
-            public int Flags { get; set; }
-
-            public KeystrokeEventArgs(uint code, Win32Structures.KBDLLHOOKSTRUCTFlags flags)
-            {
-                Code = (int)code;
-                Flags = (int)flags;
-            }
-        }
-
-        public static void Start()
-        {
-            _hookID = SetHook(_proc);
-        }
-
-        public static void Stop()
-        {
-            UnhookWindowsHookEx(_hookID);
-        }
-
-        //public static void SendKeyDown(Win32Structures.VirtualKeyShort vKey)
-        //{
-        //    SendKeyDown((Win32Structures.ScanCodeShort)MapVirtualKeyEx((uint)vKey, Keyboard.MAPVK_VK_TO_VSC, (IntPtr)0));
-        //}
-
-        //public static void SendKeyUp(Win32Structures.VirtualKeyShort vKey)
-        //{
-        //    SendKeyUp((Win32Structures.ScanCodeShort)MapVirtualKeyEx((uint)vKey, Keyboard.MAPVK_VK_TO_VSC, (IntPtr)0));
-        //}
-
-        //public static void SendKeyPressed(Win32Structures.VirtualKeyShort vKey)
-        //{
-        //    SendKeyDown((Win32Structures.ScanCodeShort)MapVirtualKeyEx((uint)vKey, Keyboard.MAPVK_VK_TO_VSC, (IntPtr)0));
-        //    SendKeyUp((Win32Structures.ScanCodeShort)MapVirtualKeyEx((uint)vKey, Keyboard.MAPVK_VK_TO_VSC, (IntPtr)0));
-        //}
-
-
-        //public static void SendKeyUp(Win32Structures.ScanCodeShort scanCode)
-        //{
-        //    var pInputs = new Win32Structures.INPUT[1]
-        //    {
-        //        BuildKeyboardInput(scanCode, true)
-        //    };
-        //    SendInput((uint)pInputs.Length, pInputs, Win32Structures.INPUT.Size);
-        //}
-
-        //public static void SendKeyDown(Win32Structures.ScanCodeShort scanCode)
-        //{
-        //    var pInputs = new Win32Structures.INPUT[1]
-        //    {
-        //        BuildKeyboardInput(scanCode)
-        //    };
-        //    SendInput((uint)pInputs.Length, pInputs, Win32Structures.INPUT.Size);
-        //}
-
-        //public static void SendKeyPressed(Win32Structures.ScanCodeShort scanCode)
-        //{
-        //    var pInputs = new Win32Structures.INPUT[]
-        //    {
-        //        BuildKeyboardInput(scanCode),
-        //        BuildKeyboardInput(scanCode, true)
-        //    };
-        //    SendInput((uint)pInputs.Length, pInputs, Win32Structures.INPUT.Size);
-        //}
-
-        //private static Win32Structures.INPUT BuildKeyboardInput(Win32Structures.ScanCodeShort scanCode)
-        //{
-        //    return BuildKeyboardInput(scanCode, false);
-        //}
-
-
-        public static void SendKeyPress(Win32Structures.ScanCodeShort scanCode, int flags)
-        {
-            var pInputs = new Win32Structures.INPUT[]
-            {
-                BuildKeyboardInput(scanCode, flags),
-            };
-            SendInput((uint)pInputs.Length, pInputs, Win32Structures.INPUT.Size);
-        }
-
-
-        private static Win32Structures.INPUT BuildKeyboardInput(Win32Structures.ScanCodeShort scanCode, int flags)
-        {
-            Win32Structures.KEYEVENTF keyEventFlags = Win32Structures.KEYEVENTF.SCANCODE;
-
-            if ((flags & (int)Win32Structures.KBDLLHOOKSTRUCTFlags.LLKHF_EXTENDED) == (int)Win32Structures.KBDLLHOOKSTRUCTFlags.LLKHF_EXTENDED)
-                keyEventFlags |= Win32Structures.KEYEVENTF.EXTENDEDKEY;
-
-            if ((flags & (int)Win32Structures.KBDLLHOOKSTRUCTFlags.LLKHF_UP) == (int)Win32Structures.KBDLLHOOKSTRUCTFlags.LLKHF_UP)
-                keyEventFlags |= Win32Structures.KEYEVENTF.KEYUP;
-
-            return new Win32Structures.INPUT()
-            {
-                type = Win32Structures.INPUT_KEYBOARD,
-                U = new Win32Structures.InputUnion()
-                {
-                    ki = new Win32Structures.KEYBDINPUT()
-                    {
-                        scanCode = scanCode,
-                        vkCode = 0,
-                        flags = keyEventFlags,
-                        time = 0,
-                        dwExtraInfo = (UIntPtr)0
-                    }
-                }
-            };
-        }
-
-        private static IntPtr SetHook(LowLevelKeyboardProc proc)
-        {
-            using (var curProcess = Process.GetCurrentProcess())
-            using (var curModule = curProcess.MainModule)
-            {
-                if (curModule != null)
-                    return SetWindowsHookEx(WH_KEYBOARD_LL, proc, GetModuleHandle(curModule.ModuleName), 0);
-            }
-            return (IntPtr)0;
-        }
-
-        private static IntPtr HookCallback(int nCode, IntPtr wParam, IntPtr lParam)
-        {
-            if (nCode < 0) return CallNextHookEx(_hookID, nCode, wParam, lParam);
-
-            var key = Marshal.PtrToStructure<Win32Structures.KBDLLHOOKSTRUCT>(lParam);
-
-            if (IsKeySuppressionActive)
-            {
-                Debug.WriteLine($"[Recording]scanCode:{key.scanCode}, vkCode:{key.vkCode}, flags:{key.flags} (flagsBin:{Convert.ToString((int)key.flags, 2):0}");
-            }
-
-            if (wParam == (IntPtr)WM_KEYDOWN || wParam == (IntPtr)WM_SYSKEYDOWN)
-            {
-                KeyDownEvent?.Invoke(null, new KeystrokeEventArgs(key.scanCode, key.flags));
-            }
-
-            if (wParam == (IntPtr)WM_KEYUP || wParam == (IntPtr)WM_SYSKEYUP)
-            {
-                KeyUpEvent?.Invoke(null, new KeystrokeEventArgs(key.scanCode, key.flags));
-            }
-
-            
-            var callbackValue = 0;//process this keypress as normal
-            if(IsKeySuppressionActive) callbackValue = 1;//don't continue handling this keystroke. prevents ALT from opening menue, alt-tab from switching screens, etc. Only do this when recording keypresses.
-            return (IntPtr)callbackValue;
-        }
-    }
-}