From d28f42c91af0c1eabe38d2cd1810b4ffed3385a7 Mon Sep 17 00:00:00 2001
From: Anthony Williams <dexter35803@hotmail.com>
Date: Thu, 22 Feb 2018 15:15:10 -0500
Subject: [PATCH] Removed System.XML requirement, Added NanoXML, Added ability
 to add groups to elscar command, added better VCF sync handling to improve
 client connection performance and not bring server to crawl, removed crap,
 added indicator sync for all vehicles, added sounds, added forced patterns
 sync to sirens and horn, Fixed networking to get vehicle from all scripts,
 added better tick management to keep fps up, Changed controls to avoid
 conflicts with other scripts

---
 README.md                                     |   28 +-
 server/ELS-Server/Class1.cs                   |   20 +-
 server/ELS-Server/Configuration.cs            |   12 +-
 server/ELS-Server/CustomPatterns.cs           |   25 +-
 server/ELS-Server/ELS-Server.csproj           |    3 +-
 server/ELS-Server/NanoXMLParser.cs            |  314 ++++
 server/ELS-Server/Properties/AssemblyInfo.cs  |    4 +-
 server/ELS-Server/VCF.cs                      |    6 +-
 server/ELS-Server/VcfSync.cs                  |    6 +-
 src/Decorator/DecorManager.cs                 |   24 -
 src/Decorator/EntityDecoration.cs             |   83 --
 src/ELS.cs                                    |   84 +-
 src/ELS.csproj                                |   13 +-
 src/ELS.ini                                   |   15 +-
 src/ELSStates/State.cs                        |   12 -
 src/Extra/Extra.cs                            |   66 +-
 src/FileLoader.cs                             |    2 +-
 src/Light/IPatterns.cs                        |    1 +
 src/Light/Indicator.cs                        |  125 ++
 src/Light/Light.Loop.cs                       |    1 +
 src/Light/LightStage.cs                       |   67 -
 src/Light/Lights.Patterns.cs                  |   78 +-
 src/Light/Lights.cs                           |    2 +-
 src/Light/Lights.logic.cs                     |   64 +-
 src/Light/Patterns/CustomPattern.cs           |   24 +
 src/Light/Stage.cs                            |    3 +-
 src/Manager/VehicleList.cs                    |   55 +-
 src/Manager/VehicleManager.cs                 |  102 +-
 src/NUI/ELSVehicleUIState.cs                  |   71 -
 src/NUI/ElsUiPanel.cs                         |   12 +
 src/Properties/AssemblyInfo.cs                |    6 +-
 src/RemoteEventManager.cs                     |    5 +-
 src/Siren/MainSiren/MainSiren.FullSync.cs     |    2 +-
 src/Siren/MainSiren/MainSiren.cs              |   11 +-
 src/Siren/Siren/Controls/Siren.Controls.KB.cs |    4 +-
 src/Siren/Siren/Siren.Logic.cs                |  125 +-
 src/Siren/Siren/Siren.Loop.cs                 |    7 +-
 src/Siren/Siren/Siren.cs                      |   26 +-
 src/Siren/Tone/Tone.cs                        |   27 +-
 src/TrafficControl/Vehicles.cs                |   21 +-
 src/Vehicle/ELSVehicle.cs                     |   53 +-
 src/__resource.lua                            |   11 +-
 src/configuration/ElsConfiguration.cs         |   12 +
 src/configuration/NanoXMLParser.cs            |  314 ++++
 src/configuration/VCF.cs                      | 1303 +++++++++++------
 src/{ELS-FiveM.sln => elsplus.sln}            |    0
 src/extentions.cs                             |    2 +-
 src/panel/test.cs                             |  178 ---
 48 files changed, 2213 insertions(+), 1216 deletions(-)
 create mode 100644 server/ELS-Server/NanoXMLParser.cs
 delete mode 100644 src/Decorator/DecorManager.cs
 delete mode 100644 src/Decorator/EntityDecoration.cs
 delete mode 100644 src/ELSStates/State.cs
 create mode 100644 src/Light/Indicator.cs
 delete mode 100644 src/Light/LightStage.cs
 create mode 100644 src/Light/Patterns/CustomPattern.cs
 delete mode 100644 src/NUI/ELSVehicleUIState.cs
 create mode 100644 src/configuration/NanoXMLParser.cs
 rename src/{ELS-FiveM.sln => elsplus.sln} (100%)
 delete mode 100644 src/panel/test.cs

diff --git a/README.md b/README.md
index d07f1e9..4c446ab 100644
--- a/README.md
+++ b/README.md
@@ -14,20 +14,20 @@ See: https://github.com/ejb1123/ELS-Plus/issues to submit an issue. It is import
 
 |Action Key|Default Key|Default Binding
 |---|---|---|
-|Team Text Chat | Y key | Horn control|
-|Select Unarmed Weapon | 1 Key | Wail tone |
-|Select Melee Weapon | 2 Key | Yelp tone |
-|Select Shotgun Weapon | 3 Key | Auxilary tone 1|
-|Select Heavy Weapon | 4 Key | Auxilary tone 2|
-|Select Special Weapon | 5 Key | Toggles Dual Siren Mode|
-|Chat All| T Key|Goes to next tone or plays tone 1|
-|Throw Grenade| G Key|Toggles main siren|
-|Vehicle Horn | E Key | Toggles vehicle's Light Stages|
-|Multiplayer Info | Z Key | Toggles vehicle's Primary Patterns|
-| | X Key | Toggles vehicle's Secondary Patterns|
-| | C Key | Toggles vehicle's Warning Patterns|
-|Cover | Q Key | Toggles vehicle's Takedown Lights (Extra 12)|
-|Cover | Alt + Q Key | Toggles vehicle's Scene Lights (Extra 11)|
+| Vehicle Horn  | E key | Horn control|
+| Select Unarmed Weapon | 1 Key | Wail tone |
+| Select Melee Weapon | 2 Key | Yelp tone |
+| Select Shotgun Weapon | 3 Key | Auxilary tone 1|
+| Select Heavy Weapon | 4 Key | Auxilary tone 2|
+| Select Special Weapon | 5 Key | Toggles Dual Siren Mode|
+| Chat All| Y Key|Goes to next tone or plays tone 1|
+| Throw Grenade| G Key|Toggles main siren|
+| Radio Wheel | Q Key | Toggles vehicle's Light Stages|
+| Multiplayer Info | Z Key | Toggles vehicle's Primary Patterns|
+| Drop Projectile | X Key | Toggles vehicle's Secondary Patterns|
+| Look Behind | C Key | Toggles vehicle's Warning Patterns|
+| Vehicle Next Radio Track | . Key | Toggles vehicle's Takedown Lights (Extra 12)|
+| Vehicle Next Radio Track | Alt + . Key | Toggles vehicle's Scene Lights (Extra 11)|
 |Replay Show Hot Key | K Key | Toggles vehicle's secondary lights|
 |Cinematic Slo Mo | L Key | Toggles vehicle's warning lights|
 || [ Key | Toggles vehicle's Cruise Lights|
diff --git a/server/ELS-Server/Class1.cs b/server/ELS-Server/Class1.cs
index 39ff35a..e18ef9f 100644
--- a/server/ELS-Server/Class1.cs
+++ b/server/ELS-Server/Class1.cs
@@ -14,11 +14,11 @@ public class Class1 : BaseScript
         VcfSync _vcfSync;
         public Class1()
         {
-            
-            API.ExecuteCommand("add_ace group.admin command.elscar allow");
-            API.ExecuteCommand("add_ace group.superadmin command.elscar allow");
-            Debug.WriteLine("Welcome to ELS for FiveM");
-
+            Debug.WriteLine("Welcome to ELS+ for FiveM");
+            foreach(string s in Configuration.ElsVehicleGroups)
+            {
+                API.ExecuteCommand($"add_ace group.{s} command.elscar allow");
+            }
             API.RegisterCommand("vcfrefresh", new Action<int, List<object>, string>((source, arguments, raw) =>
             {
                 Debug.WriteLine($"{Players[source].Name} has activated a VCF Refresh");
@@ -39,10 +39,12 @@ public Class1()
                 TriggerClientEvent(Players[source], "ELS:SpawnCar", arguments[0]);
             }), Configuration.ElsCarAdminOnly);
 
-            EventHandlers["ELS:VcfSync:Server"] += new Action<int>((int source) =>
+            EventHandlers["ELS:VcfSync:Server"] += new Action<int>(async (int source) =>
             {
+                Utils.DebugWriteLine($"Sending Data to {Players[source].Name}");
                 _vcfSync = new VcfSync();
-                _vcfSync.CheckVCF(Players[source]);
+                await _vcfSync.CheckVCF(Players[source]);
+                await CustomPatterns.CheckCustomPatterns(Players[source]);
             });
 
             EventHandlers["baseevents:enteredVehicle"] += new Action<int,int,string>((veh,seat,name) =>
@@ -51,7 +53,7 @@ public Class1()
                 TriggerClientEvent("ELS:VehicleEntered", veh);
             });
 
-            EventHandlers.Add("onResourceStart", new Action<string>((resource) =>
+            /*EventHandlers.Add("onResourceStart", new Action<string>((resource) =>
             {
                 if (VcfSync.ElsResources.Exists(res => res.Equals(resource)))
                 {
@@ -60,7 +62,7 @@ public Class1()
                         VcfSync.LoadFilesPromScript(resource, p);
                     }
                 }
-            }));
+            }));*/
             EventHandlers["ELS:FullSync:Unicast"] += new Action(() => { });
             EventHandlers["ELS:FullSync:Broadcast"] += new Action<System.Dynamic.ExpandoObject, int>((dataDic, playerID) =>
              {
diff --git a/server/ELS-Server/Configuration.cs b/server/ELS-Server/Configuration.cs
index 1bd9a37..72c773b 100644
--- a/server/ELS-Server/Configuration.cs
+++ b/server/ELS-Server/Configuration.cs
@@ -34,13 +34,23 @@ internal static bool ElsCarAdminOnly
             get; private set;
         }
 
+        internal static List<string> ElsVehicleGroups
+        {
+            get; set;
+        }
+
         static Configuration()
         {
             var data = API.LoadResourceFile(API.GetCurrentResourceName(), "ELS.ini");
             if (isValidData(data))
             {
-                var u = SharpConfig.Configuration.LoadFromString(data);
+                SharpConfig.Configuration u = SharpConfig.Configuration.LoadFromString(data);
                 ElsCarAdminOnly = u["ADMIN"]["ElsCarAdminOnly"].BoolValue;
+                ElsVehicleGroups = new List<string>();
+                foreach(string s in u["ADMIN"]["Groups"].StringValueArray)
+                {
+                    ElsVehicleGroups.Add(s);
+                }
             }
         }
 
diff --git a/server/ELS-Server/CustomPatterns.cs b/server/ELS-Server/CustomPatterns.cs
index 8b454bd..03a0539 100644
--- a/server/ELS-Server/CustomPatterns.cs
+++ b/server/ELS-Server/CustomPatterns.cs
@@ -11,16 +11,16 @@ namespace ELS_Server
 {
     public class CustomPatterns
     {
+        static List<Tuple<string, string, string>> Patterns = new List<Tuple<string, string, string>>();
         internal static bool IsValidPatternData(string data)
         {
             if (String.IsNullOrEmpty(data)) return false;
-            System.Xml.XmlDocument doc = new System.Xml.XmlDocument();
-            doc.LoadXml(data);
+            NanoXMLDocument doc = new NanoXMLDocument(data);
             //TODO change how below is detected to account for xml meta tag being before it.
-            return doc.DocumentElement.Name == "pattern";
+            return doc.RootNode.Name == "pattern";
         }
 
-        public void CheckVCF(Player player)
+        public async static Task CheckCustomPatterns(Player player)
         {
             var numResources = API.GetNumResources();
             for (int x = 0; x < numResources; x++)
@@ -28,6 +28,7 @@ public void CheckVCF(Player player)
                 var name = Function.Call<string>(Hash.GET_RESOURCE_BY_FIND_INDEX, x);
                 ParsePatterns(name, player);
             }
+            Class1.TriggerClientEvent(player, "ELS:PatternSync:Client", Patterns);
         }
 
         internal static void ParsePatterns(string name, Player player)
@@ -39,33 +40,25 @@ internal static void ParsePatterns(string name, Player player)
                 for (int i = 0; i < num; i++)
                 {
                     var filename = Function.Call<string>(Hash.GET_RESOURCE_METADATA, name, "file", i);
-
                     var data = Function.Call<string>(Hash.LOAD_RESOURCE_FILE, name, filename);
-
-#if DEBUG
-                    CitizenFX.Core.Debug.WriteLine($"Checking {filename}");
-#endif
+                    Utils.DebugWriteLine($"Checking {filename}");
                     if (Path.GetExtension(filename).ToLower() == ".xml")
                     {
 
                         if (CustomPatterns.IsValidPatternData(data))
                         {
-                            Class1.TriggerClientEvent(player, "ELS:PatternSync:Client", name, filename, data);
+                            Patterns.Add(new Tuple<string, string, string>(name, filename, data));
                         }
                         else
                         {
-#if DEBUG
-                            CitizenFX.Core.Debug.WriteLine($"XML Pattern data for {filename} is not valid");
-#endif
+                            Utils.DebugWriteLine($"XML Pattern data for {filename} is not valid");
                         }
                     }
                 }
             }
             else
             {
-#if DEBUG
-                CitizenFX.Core.Debug.WriteLine($"{name} is not an ELS Vehicle Resource");
-#endif
+                Utils.DebugWriteLine($"{name} is not an ELS Vehicle Resource");
             }
         }
     }
diff --git a/server/ELS-Server/ELS-Server.csproj b/server/ELS-Server/ELS-Server.csproj
index 9bd7813..7fe4acd 100644
--- a/server/ELS-Server/ELS-Server.csproj
+++ b/server/ELS-Server/ELS-Server.csproj
@@ -38,17 +38,16 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Class1.cs" />
     <Compile Include="Configuration.cs" />
     <Compile Include="CustomPatterns.cs" />
+    <Compile Include="NanoXMLParser.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Utils.cs" />
     <Compile Include="VCF.cs" />
diff --git a/server/ELS-Server/NanoXMLParser.cs b/server/ELS-Server/NanoXMLParser.cs
new file mode 100644
index 0000000..0a7fa59
--- /dev/null
+++ b/server/ELS-Server/NanoXMLParser.cs
@@ -0,0 +1,314 @@
+using System;
+using System.Collections.Generic;
+
+namespace ELS_Server
+{
+  /// <summary>
+  /// Base class containing usefull features for all XML classes
+  /// </summary>
+  class NanoXMLBase
+  {
+    protected static bool IsSpace(char c)
+    {
+      return c == ' ' || c == '\t' || c == '\n' || c == '\r';
+    }
+
+    protected static void SkipSpaces(string str, ref int i)
+    {
+      while (i < str.Length)
+      {
+        if (!IsSpace(str[i]))
+        {
+          if (str[i] == '<' && i + 4 < str.Length && str[i + 1] == '!' && str[i + 2] == '-' && str[i + 3] == '-')
+          {
+            i += 4; // skip <!--
+
+            while (i + 2 < str.Length && !(str[i] == '-' && str[i + 1] == '-'))
+              i++;
+
+            i += 2; // skip --
+          }
+          else
+            break;
+        }
+
+        i++;
+      }
+    }
+
+    protected static string GetValue(string str, ref int i, char endChar, char endChar2, bool stopOnSpace)
+    {
+      int start = i;
+      while ((!stopOnSpace || !IsSpace(str[i])) && str[i] != endChar && str[i] != endChar2) i++;
+
+      return str.Substring(start, i - start);
+    }
+
+    protected static bool IsQuote(char c)
+    {
+      return c == '"' || c == '\'';
+    }
+
+    // returns name
+    protected static string ParseAttributes(string str, ref int i, List<NanoXMLAttribute> attributes, char endChar, char endChar2)
+    {
+      SkipSpaces(str, ref i);
+      string name = GetValue(str, ref i, endChar, endChar2, true);
+
+      SkipSpaces(str, ref i);
+
+      while (str[i] != endChar && str[i] != endChar2)
+      {
+        string attrName = GetValue(str, ref i, '=', '\0', true);
+
+        SkipSpaces(str, ref i);
+        i++; // skip '='
+        SkipSpaces(str, ref i);
+
+        char quote = str[i];
+        if (!IsQuote(quote))
+          throw new XMLParsingException("Unexpected token after " + attrName);
+
+        i++; // skip quote
+        string attrValue = GetValue(str, ref i, quote, '\0', false);
+        i++; // skip quote
+
+        attributes.Add(new NanoXMLAttribute(attrName, attrValue));
+
+        SkipSpaces(str, ref i);
+      }
+
+      return name;
+    }
+  }
+
+  /// <summary>
+  /// Class representing whole DOM XML document
+  /// </summary>
+  class NanoXMLDocument: NanoXMLBase
+  {
+    private NanoXMLNode rootNode;
+    private List<NanoXMLAttribute> declarations = new List<NanoXMLAttribute>();
+    /// <summary>
+    /// Public constructor. Loads xml document from raw string
+    /// </summary>
+    /// <param name="xmlString">String with xml</param>
+    public NanoXMLDocument(string xmlString)
+    {
+      int i = 0;
+
+      while (true)
+      {
+        SkipSpaces(xmlString, ref i);
+
+        if (xmlString[i] != '<')
+          throw new XMLParsingException("Unexpected token");
+
+        i++; // skip <
+
+        if (xmlString[i] == '?') // declaration
+        {
+          i++; // skip ?
+          ParseAttributes(xmlString, ref i, declarations, '?', '>');
+          i++; // skip ending ?
+          i++; // skip ending >
+
+          continue;
+        }
+
+        if (xmlString[i] == '!') // doctype
+        {
+          while (xmlString[i] != '>') // skip doctype
+            i++;
+
+          i++; // skip >
+
+          continue;
+        }
+
+        rootNode = new NanoXMLNode(xmlString, ref i);
+        break;
+      }
+    }
+    /// <summary>
+    /// Root document element
+    /// </summary>
+    public NanoXMLNode RootNode
+    {
+      get { return rootNode; }
+    }
+    /// <summary>
+    /// List of XML Declarations as <see cref="NanoXMLAttribute"/>
+    /// </summary>
+    public IEnumerable<NanoXMLAttribute> Declarations
+    {
+      get { return declarations; }
+    }
+  }
+
+  /// <summary>
+  /// Element node of document
+  /// </summary>
+  class NanoXMLNode: NanoXMLBase
+  {
+    private string value;
+    private string name;
+
+    private List<NanoXMLNode> subNodes = new List<NanoXMLNode>();
+    private List<NanoXMLAttribute> attributes = new List<NanoXMLAttribute>();
+
+    internal NanoXMLNode(string str, ref int i)
+    {
+      name = ParseAttributes(str, ref i, attributes, '>', '/');
+
+      if (str[i] == '/') // if this node has nothing inside
+      {
+        i++; // skip /
+        i++; // skip >
+        return; 
+      }
+
+      i++; // skip >
+
+      // temporary. to include all whitespaces into value, if any
+      int tempI = i;
+
+      SkipSpaces(str, ref tempI);
+
+      if (str[tempI] == '<')
+      {
+        i = tempI;
+
+        while (str[i + 1] != '/') // parse subnodes
+        {
+          i++; // skip <
+          subNodes.Add(new NanoXMLNode(str, ref i));
+
+          SkipSpaces(str, ref i);
+
+          if (i >= str.Length)
+            return; // EOF
+
+          if (str[i] != '<')
+            throw new XMLParsingException("Unexpected token");
+        }
+
+        i++; // skip <
+      }
+      else // parse value
+      {
+        value = GetValue(str, ref i, '<', '\0', false);
+        i++; // skip <
+
+        if (str[i] != '/')
+          throw new XMLParsingException("Invalid ending on tag " + name);
+      }
+
+      i++; // skip /
+      SkipSpaces(str, ref i);
+
+      string endName = GetValue(str, ref i, '>', '\0', true);
+      if (endName != name)
+        throw new XMLParsingException("Start/end tag name mismatch: " + name + " and " + endName);
+      SkipSpaces(str, ref i);
+
+      if (str[i] != '>')
+        throw new XMLParsingException("Invalid ending on tag " + name);
+
+      i++; // skip >
+    }
+    /// <summary>
+    /// Element value
+    /// </summary>
+    public string Value
+    {
+      get { return value; }
+    }
+    /// <summary>
+    /// Element name
+    /// </summary>
+    public string Name
+    {
+      get { return name; }
+    }
+    /// <summary>
+    /// List of subelements
+    /// </summary>
+    public IEnumerable<NanoXMLNode> SubNodes
+    {
+      get { return subNodes; }
+    }
+    /// <summary>
+    /// List of attributes
+    /// </summary>
+    public IEnumerable<NanoXMLAttribute> Attributes
+    {
+      get { return attributes; }
+    }
+    /// <summary>
+    /// Returns subelement by given name
+    /// </summary>
+    /// <param name="nodeName">Name of subelement to get</param>
+    /// <returns>First subelement with given name or NULL if no such element</returns>
+    public NanoXMLNode this[string nodeName]
+    {
+      get
+      {
+        foreach (NanoXMLNode nanoXmlNode in subNodes)
+          if (nanoXmlNode.name == nodeName)
+            return nanoXmlNode;
+
+        return null;
+      }
+    }
+    /// <summary>
+    /// Returns attribute by given name
+    /// </summary>
+    /// <param name="attributeName">Attribute name to get</param>
+    /// <returns><see cref="NanoXMLAttribute"/> with given name or null if no such attribute</returns>
+    public NanoXMLAttribute GetAttribute(string attributeName)
+    {
+      foreach (NanoXMLAttribute nanoXmlAttribute in attributes)
+        if (nanoXmlAttribute.Name == attributeName)
+          return nanoXmlAttribute;
+
+      return null;
+    }
+  }
+
+  /// <summary>
+  /// XML element attribute
+  /// </summary>
+  class NanoXMLAttribute
+  {
+    private string name;
+    private string value;
+    /// <summary>
+    /// Attribute name
+    /// </summary>
+    public string Name
+    {
+      get { return name; }
+    }
+    /// <summary>
+    /// Attribtue value
+    /// </summary>
+    public string Value
+    {
+      get { return value; }
+    }
+
+    internal NanoXMLAttribute(string name, string value)
+    {
+      this.name = name;
+      this.value = value;
+    }
+  }
+
+  class XMLParsingException: Exception
+  {
+    public XMLParsingException(string message) : base(message)
+    {
+    }
+  }
+}
\ No newline at end of file
diff --git a/server/ELS-Server/Properties/AssemblyInfo.cs b/server/ELS-Server/Properties/AssemblyInfo.cs
index 31db0b3..4009a1c 100644
--- a/server/ELS-Server/Properties/AssemblyInfo.cs
+++ b/server/ELS-Server/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.2.0.1")]
-[assembly: AssemblyFileVersion("0.2.0.1")]
+[assembly: AssemblyVersion("0.2.1.0")]
+[assembly: AssemblyFileVersion("0.2.1.0")]
diff --git a/server/ELS-Server/VCF.cs b/server/ELS-Server/VCF.cs
index 72c1f86..0b3f63c 100644
--- a/server/ELS-Server/VCF.cs
+++ b/server/ELS-Server/VCF.cs
@@ -19,7 +19,6 @@ You should have received a copy of the GNU Lesser General Public License
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using System.Xml.Serialization;
 using CitizenFX.Core;
 
 namespace ELS_Server
@@ -33,10 +32,9 @@ public VCF()
         internal static bool isValidData(string data)
         {
             if (String.IsNullOrEmpty(data)) return false;
-            System.Xml.XmlDocument doc = new System.Xml.XmlDocument();
-            doc.LoadXml(data);
+            NanoXMLDocument doc = new NanoXMLDocument(data);
             //TODO change how below is detected to account for xml meta tag being before it.
-            return doc.DocumentElement.Name == "vcfroot";
+            return doc.RootNode.Name == "vcfroot";
         }
         
         
diff --git a/server/ELS-Server/VcfSync.cs b/server/ELS-Server/VcfSync.cs
index cb5e481..4d183ec 100644
--- a/server/ELS-Server/VcfSync.cs
+++ b/server/ELS-Server/VcfSync.cs
@@ -13,13 +13,14 @@ public class VcfSync
     {
 
         public static List<string> ElsResources = new List<string>();
+        public static List<Tuple<string,string,string>> VcfData = new List<Tuple<string,string,string>>();
 
         public VcfSync()
         {
             Debug.WriteLine("Loading VCF Sync");
         }
 
-        public void CheckVCF(Player player)
+        public async Task CheckVCF(Player player)
         {
             var numResources = Function.Call<int>(Hash.GET_NUM_RESOURCES);
             for (int x = 0; x < numResources; x++)
@@ -27,6 +28,7 @@ public void CheckVCF(Player player)
                 var name = Function.Call<string>(Hash.GET_RESOURCE_BY_FIND_INDEX, x);
                 LoadFilesPromScript(name, player);
             }
+            Class1.TriggerClientEvent(player, "ELS:VcfSync:Client", VcfData);
         }
 
         internal static void LoadFilesPromScript(string name, Player player)
@@ -54,7 +56,7 @@ internal static void LoadFilesPromScript(string name, Player player)
 
                         if (VCF.isValidData(data))
                         {
-                            Class1.TriggerClientEvent(player, "ELS:VcfSync:Client", name, filename, data);
+                            VcfData.Add(new Tuple<string, string, string>(name,filename,data));
                         }
                         else
                         {
diff --git a/src/Decorator/DecorManager.cs b/src/Decorator/DecorManager.cs
deleted file mode 100644
index 1d24bc8..0000000
--- a/src/Decorator/DecorManager.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-    ELS FiveM - A ELS implementation for FiveM
-    Copyright (C) 2017  E.J. Bevenour
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-namespace ELS
-{
-    public class DecorManager
-    {
-        
-    }
-}
\ No newline at end of file
diff --git a/src/Decorator/EntityDecoration.cs b/src/Decorator/EntityDecoration.cs
deleted file mode 100644
index 7b5b88e..0000000
--- a/src/Decorator/EntityDecoration.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-using CitizenFX.Core;
-using CitizenFX.Core.Native;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ELS
-{
-    public enum DecorationType
-    {
-        Float = 1,
-        Bool = 2,
-        Int = 3,
-        Time = 5
-    }
-
-    public class EntityDecoration
-    {
-        protected static Type floatType = typeof(float);
-        protected static Type boolType = typeof(bool);
-        protected static Type intType = typeof(int);
-
-        public static bool ExistOn(Entity entity, string propertyName)
-        {
-            return Function.Call<bool>(Hash.DECOR_EXIST_ON, entity.NativeValue, propertyName);
-        }
-
-        public static void RegisterProperty(string propertyName, DecorationType type)
-        {
-            Function.Call(Hash.DECOR_REGISTER, propertyName, (int)type);
-        }
-
-        public static void Set(Entity entity, string propertyName, float floatValue)
-        {
-            Function.Call(Hash._DECOR_SET_FLOAT, entity.NativeValue, propertyName, floatValue);
-        }
-
-        public static void Set(Entity entity, string propertyName, int intValue)
-        {
-            Function.Call(Hash.DECOR_SET_INT, entity.NativeValue, propertyName, intValue);
-        }
-
-        public static void Set(Entity entity, string propertyName, bool boolValue)
-        {
-            Function.Call(Hash.DECOR_SET_BOOL, entity.NativeValue, propertyName, boolValue);
-        }
-
-        public static T Get<T>(Entity entity, string propertyName)
-        {
-            if (!ExistOn(entity, propertyName))
-            {
-                throw new EntityDecorationUnregisteredPropertyException();
-            }
-
-            Type genericType = typeof(T);
-            Hash nativeMethod;
-
-            if (genericType == floatType)
-            {
-                nativeMethod = Hash._DECOR_GET_FLOAT;
-            }
-            else if (genericType == intType)
-            {
-                nativeMethod = Hash.DECOR_GET_INT;
-            }
-            else if (genericType == boolType)
-            {
-                nativeMethod = Hash.DECOR_GET_BOOL;
-            }
-            else
-            {
-                throw new EntityDecorationUndefinedTypeException();
-            }
-
-            return (T)Function.Call<T>(nativeMethod, entity.NativeValue, propertyName);
-        }
-    }
-
-    public class EntityDecorationUnregisteredPropertyException : Exception { }
-    public class EntityDecorationUndefinedTypeException : Exception { }
-}
diff --git a/src/ELS.cs b/src/ELS.cs
index 14c68a9..9ac0f6e 100644
--- a/src/ELS.cs
+++ b/src/ELS.cs
@@ -23,7 +23,6 @@ You should have received a copy of the GNU Lesser General Public License
 using CitizenFX.Core.Native;
 using System;
 using ELS.Light;
-using ELS.panel;
 using System.Collections.Generic;
 using ELS.Manager;
 using ELS.NUI;
@@ -38,7 +37,6 @@ public class ELS : BaseScript
         private SpotLight _spotLight;
         private readonly VehicleManager _vehicleManager;
         private ElsConfiguration _controlConfiguration;
-        panel.test _test = new test();
         private bool _firstTick = false;
 
         public ELS()
@@ -57,7 +55,6 @@ public ELS()
                         try
                         {
                             _FileLoader.RunLoader(obj);
-                            //TODO: make a load files from all resouces.
                             Screen.ShowNotification($"Welcome {LocalPlayer.Name}\n ELS Plus\n\n ELS Plus is Licensed under LGPL 3.0\n\nMore inforomation can be found at http://els.friendsincode.com");
                             SetupConnections();
                             TriggerServerEvent("ELS:VcfSync:Server", Game.Player.ServerId);
@@ -88,8 +85,6 @@ public ELS()
                             Screen.ShowNotification($"ERROR:{e.StackTrace}");
                         }
                     }
-
-                    //_spotLight= new SpotLight();
                 });
 
         }
@@ -106,25 +101,19 @@ private void SetupConnections()
             //command that siren state has changed.
             //recieves a command
             //EventHandlers["ELS:SirenUpdated"] += new Action<string, int, int, bool>(_vehicleManager.UpdateRemoteSirens);
-            EventHandlers["onPlayerJoining"] += new Action(() =>
-            {
-
-            });
             EventHandlers["ELS:SpawnCar"] += new Action<string>((veh) =>
             {
                 SpawnCar(veh);
             });
-            EventHandlers["ELS:VcfSync:Client"] += new Action<string, string, string>((a, b, c) =>
+            EventHandlers["ELS:VcfSync:Client"] += new Action<List<dynamic>>((vcfs) =>
               {
-                  try
-                  {
-                      VCF.load(SettingsType.Type.VCF, b, c, a);
-                  }
-                  catch (Exception e)
-                  {
-                      CitizenFX.Core.Debug.Write($"VCF for {b} due to {e.Message}");
-                  }
+                  VCF.ParseVcfs(vcfs);
               });
+            EventHandlers.Add("ELS:PatternSync:Client", new Action<List<dynamic>>((patterns) =>
+            {
+
+                VCF.ParsePatterns(patterns);
+            }));
             EventHandlers["ELS:FullSync:NewSpawnWithData"] += new Action<System.Dynamic.ExpandoObject>((a) =>
             {
                 _vehicleManager.SyncAllVehiclesOnFirstSpawn(a);
@@ -141,7 +130,7 @@ private void SetupConnections()
             {
                 Utils.DebugWriteLine("Vehicle entered");
                 Vehicle vehicle = new Vehicle(veh);
-                if (vehicle.IsEls())
+                if (vehicle.IsEls() && VehicleManager.vehicleList.ContainsKey(vehicle.GetNetworkId()))
                 {
                     Utils.DebugWriteLine("ELS Vehicle entered syncing UI");
                     VehicleManager.SyncUI(vehicle.GetNetworkId());
@@ -178,7 +167,7 @@ private void SetupConnections()
                 var listString = "";
                 listString += $"Available ELS Vehicles\n" +
                               $"----------------------\n";
-                foreach (var entry in VCF.ELSVehicle)
+                foreach (var entry in VCF.ELSVehicle.Values)
                 {
                     if (entry.modelHash.IsValid)
                     {
@@ -189,22 +178,47 @@ private void SetupConnections()
             }), false);
         }
 
-        private void SetupExports()
+        internal async Task<Vehicle> SpawnCar(string veh)
         {
-            Exports.Add("SpawnCar", new Action<string>(async (veh) =>
+            Model hash = Game.GenerateHash(veh);
+            if (String.IsNullOrEmpty(veh))
             {
-                SpawnCar(veh);
-            }));
+                Screen.ShowNotification("Vehicle not found please try again");
+                return null;
+            }
+            if (!VCF.ELSVehicle.ContainsKey(hash))
+            {
+                Screen.ShowNotification("Vehicle not ELS please try again");
+                return null;
+            }
+            if (Game.PlayerPed.IsInVehicle())
+            {
+                if (Game.PlayerPed.CurrentVehicle.IsEls())
+                {
+                    VehicleManager.vehicleList[Game.PlayerPed.CurrentVehicle.GetNetworkId()].Delete();
+                }
+                else
+                {
+                    Game.PlayerPed.CurrentVehicle.Delete();
+                }
+            }
+            CitizenFX.Core.Debug.WriteLine($"Attempting to spawn: {veh}");
+            var polModel = new Model((VehicleHash)hash);
+            await polModel.Request(-1);
+            Vehicle _veh = await World.CreateVehicle(polModel, Game.PlayerPed.Position + new Vector3(0f,5f,0f));
+            Game.PlayerPed.SetIntoVehicle(_veh, VehicleSeat.Driver);
+            return _veh;
         }
 
-        internal async Task<Vehicle> SpawnCar(string veh)
+        internal async Task<Vehicle> SpawnCar(string veh, dynamic coords)
         {
+            Model hash = Game.GenerateHash(veh);
             if (String.IsNullOrEmpty(veh))
             {
                 Screen.ShowNotification("Vehicle not found please try again");
                 return null;
             }
-            if (!VCF.ELSVehicle.Exists(elscar => elscar.modelHash == Game.GenerateHash(veh)))
+            if (!VCF.ELSVehicle.ContainsKey(hash))
             {
                 Screen.ShowNotification("Vehicle not ELS please try again");
                 return null;
@@ -213,7 +227,7 @@ internal async Task<Vehicle> SpawnCar(string veh)
             {
                 if (Game.PlayerPed.CurrentVehicle.IsEls())
                 {
-                    VehicleManager.vehicleList.Find(o => o.GetNetworkId() == Game.PlayerPed.CurrentVehicle.GetNetworkId()).Delete();
+                    VehicleManager.vehicleList[Game.PlayerPed.CurrentVehicle.GetNetworkId()].Delete();
                 }
                 else
                 {
@@ -221,9 +235,11 @@ internal async Task<Vehicle> SpawnCar(string veh)
                 }
             }
             CitizenFX.Core.Debug.WriteLine($"Attempting to spawn: {veh}");
-            var polModel = new Model((VehicleHash)Game.GenerateHash(veh));
+            var polModel = new Model((VehicleHash)hash);
             await polModel.Request(-1);
-            Vehicle _veh = await World.CreateVehicle(polModel, Game.PlayerPed.Position + new Vector3(0f,10f,0f));
+            Vehicle _veh = await World.CreateVehicle(polModel, coords);
+            polModel.MarkAsNoLongerNeeded();
+            _veh.PlaceOnGround();
             Game.PlayerPed.SetIntoVehicle(_veh, VehicleSeat.Driver);
             return _veh;
         }
@@ -265,17 +281,7 @@ private async Task Class1_Tick()
                     RegisterNUICallback("keyPress", ElsUiPanel.KeyPress);
                     _firstTick = true;
                 }
-                /* Text text = new Text($"ELS Build dev-v0.0.2.4\nhttp://ELS.ejb1123.tk", new PointF(640f, 10f), 0.5f);
-                 text.Alignment = Alignment.Center;
-                 text.Centered = true;
-                 text.Draw();*/
-                //_sirenManager.Runtick();
-                //_spotLight.RunTick();
                 _vehicleManager.RunTickAsync();
-                if (Game.IsControlJustReleased(0, Control.MultiplayerInfo))
-                {
-                    //await Debug.Spawn();
-                }
 
                 if (Game.PlayerPed.IsInVehicle() && Game.PlayerPed.CurrentVehicle.IsEls())
                 {
diff --git a/src/ELS.csproj b/src/ELS.csproj
index f12ca10..45210aa 100644
--- a/src/ELS.csproj
+++ b/src/ELS.csproj
@@ -21,6 +21,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -91,23 +92,19 @@
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml.net">
-      <HintPath>..\libs\System.Xml.net.dll</HintPath>
-    </Reference>
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Board\ArrowBoard.cs" />
     <Compile Include="configuration\ElsConfiguration.cs" />
     <Compile Include="configuration\Global.cs" />
+    <Compile Include="configuration\NanoXMLParser.cs" />
     <Compile Include="configuration\SettingsType.cs" />
     <Compile Include="Debug.cs" />
-    <Compile Include="Decorator\DecorManager.cs" />
     <Compile Include="ELS.cs" />
-    <Compile Include="Decorator\EntityDecoration.cs" />
-    <Compile Include="ELSStates\State.cs" />
     <Compile Include="Extra\Extra.FullSync.cs" />
     <Compile Include="Light\IMangerEntry.cs" />
+    <Compile Include="Light\Indicator.cs" />
     <Compile Include="Light\IPatterns.cs" />
     <Compile Include="Light\Light.Loop.cs" />
     <Compile Include="Light\Lights.FullSync.cs" />
@@ -115,6 +112,7 @@
     <Compile Include="Light\Lights.Patterns.cs" />
     <Compile Include="Light\Patterns\Arrow.cs" />
     <Compile Include="Light\Patterns\CHP.cs" />
+    <Compile Include="Light\Patterns\CustomPattern.cs" />
     <Compile Include="Light\Patterns\DRO.cs" />
     <Compile Include="Light\Patterns\Marquee.cs" />
     <Compile Include="Light\Patterns\PatternUtils.cs" />
@@ -132,14 +130,11 @@
     <Compile Include="Light\Lights.cs" />
     <Compile Include="Light\LightArray.cs" />
     <Compile Include="Light\Patterns\Leds.cs" />
-    <Compile Include="Light\LightStage.cs" />
     <Compile Include="Light\SpotLight.cs" />
     <Compile Include="Manager\Manager.cs" />
     <Compile Include="Manager\VehicleList.cs" />
     <Compile Include="Manager\VehicleManager.cs" />
     <Compile Include="NUI\ElsUiPanel.cs" />
-    <Compile Include="NUI\ELSVehicleUIState.cs" />
-    <Compile Include="panel\test.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RemoteEventManager.cs" />
     <Compile Include="Siren\IManagerEntry.cs" />
diff --git a/src/ELS.ini b/src/ELS.ini
index 92eb0f1..cae65f5 100644
--- a/src/ELS.ini
+++ b/src/ELS.ini
@@ -2,6 +2,7 @@
 VcfContainerFolder = pack_default
 VehicleDeleteInterval = 3.0
 ElsCarAdminOnly = true
+Groups = { admin,superadmin }
 
 [ LIGHTING ]
 LightFlashDelayMainLts = 38
@@ -19,6 +20,8 @@ EnvLtMultCrnaOthr_Siz = 1.0
 EnvLtMultCrnaOthr_Rng = 1.0
 EnvLtMultCrnaOthr_Int = 1.0
 LodCoronaInitDistance = 10.0
+AutoInd = true
+AutoIndDelay = 60
 
 
 [ AUDIO ]
@@ -32,22 +35,26 @@ ElsMaxRangeAi = 500
 ElsActiveOnAi = true
 ElsTrafCtrlOn = true
 
+
 [ CONTROL ]
 AllowController = true
-Toggle_LSTG = 86
+Toggle_LSTG = 85
 Toggle_SECL = 311
 Toggle_WRNL = 7
 Toggle_CRSL = 100
 Toggle_BRD = 100
-Toggle_TKDL = 85
+Toggle_TKDL = 81
 Toggle_BLKT = 220
 Toggle_SIRN = 58
 Toggle_DSRN = 165
 ChgPat_PRML = 48
 ChgPat_SECL = 73
 ChgPat_WRNL = 79
-Sound_Ahorn = 246
-Sound_Manul = 245
+Toggle_LIND = 84
+Toggle_RIND = 83
+Toggle_HAZ = 202
+Sound_Ahorn = 86 
+Sound_Manul = 246
 Snd_SrnTon1 = 157
 Snd_SrnTon2 = 158
 Snd_SrnTon3 = 160
diff --git a/src/ELSStates/State.cs b/src/ELSStates/State.cs
deleted file mode 100644
index 51d1f1b..0000000
--- a/src/ELSStates/State.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ELS.ELSStates
-{
-    class State
-    {
-    }
-}
diff --git a/src/Extra/Extra.cs b/src/Extra/Extra.cs
index 0cc1f53..1ec0282 100644
--- a/src/Extra/Extra.cs
+++ b/src/Extra/Extra.cs
@@ -161,13 +161,7 @@ internal Extra(Entity entity, int id, configuration.Extra ex, string format = ""
             SetInfo();
             PatternType = format;
             TurnedOn = false;
-            if (!API.DoesExtraExist(entity.Handle, id))
-            {
-                CitizenFX.Core.Debug.WriteLine($"Extra id: {id} does not exsist");
-            }
-#if DEBUG
-            CitizenFX.Core.Debug.WriteLine($"Registered extra_{_Id} successfully");
-#endif
+            Utils.DebugWriteLine($"Registered extra_{_Id} successfully");
         }
 
         internal void SetState(bool state)
@@ -196,19 +190,7 @@ private void SetFalse()
         bool firstTick = true;
         internal async void ExtraTicker()
         {
-            /*if (firstTick)
-           {
-               Delay = 100;
-               firstTick = false;
-           }
-          flashrate = (int)Game.FPS / ((int)Game.FPS * 60 / Delay);
-#if DEBUG
-           //CitizenFX.Core.Debug.WriteLine($"Flash rate: {flashrate}");
-           //CitizenFX.Core.Debug.WriteLine($"Allow Flash: {allowflash}");
-#endif
-           if (flashrate == allowflash)
-           {*/
-            if (flashrate != 0 && Game.GameTime - flashrate >= Global.PrimDelay)
+            if (flashrate != 0 && Game.GameTime - flashrate >= Delay)
             {
                 allowflash = 1;
                 if (IsPatternRunning)
@@ -218,7 +200,7 @@ internal async void ExtraTicker()
                         CleanUp();
                         return;
                     }
-                    if (Pattern[count].Equals('0'))
+                    if (Pattern.ToCharArray()[count].Equals('0'))
                     {
                         SetState(false);
                         if (!IsPatternRunning)
@@ -238,7 +220,7 @@ internal async void ExtraTicker()
 
                     }
                     count++;
-                    if (count > Pattern.Length - 1)
+                    if (count == Pattern.Length - 1)
                     {
                         count = 0;
                     }
@@ -249,23 +231,10 @@ internal async void ExtraTicker()
                     }
                 }
                 flashrate = Game.GameTime;
-#if DEBUG
-                //CitizenFX.Core.Debug.WriteLine($"Allow flash ran on extra {Id}");
-#endif
-            }
-            /*else if (allowflash > flashrate)
-            {
-                allowflash = 1;
+
             }
-            else
-            {
-                allowflash++;
-            }*/
             if (TurnedOn && spotLight != null)
             {
-#if DEBUG
-                //CitizenFX.Core.Debug.WriteLine("Spotlight tick ran");
-#endif
                 spotLight.RunTick();
             }
 
@@ -306,17 +275,6 @@ internal void DrawEnvLight()
                 return;
             }
             var extraoffset = _vehicle.GetOffsetPosition(off + new Vector3(_extraInfo.OffsetX, _extraInfo.OffsetY, _extraInfo.OffsetZ));
-
-
-            //float hx = (float)((double)extraoffset.X + 5 * Math.Cos(((double)anglehorizontal + Game.Player.Character.CurrentVehicle.Rotation.Z) * Math.PI / 180.0));
-            //float hy = (float)((double)extraoffset.Y + 5 * Math.Sin(((double)anglehorizontal + Game.Player.Character.CurrentVehicle.Rotation.Z) * Math.PI / 180.0));
-            //float vz = (float)((double)extraoffset.Z + 5 * Math.Sin((double)anngleVirtical * Math.PI / 180.0));
-
-            //Vector3 destinationCoords = (new Vector3(hx, hy, vz));
-
-            //dirVector = destinationCoords - extraoffset;
-            //dirVector.Normalize();
-            //API.DrawSpotLightWithShadow(extraoffset.X, extraoffset.Y, extraoffset.Z, dirVector.X, dirVector.Y, dirVector.Z, Color['r'], Color['g'], Color['b'], 100.0f, 1f, 0.0f, 13.0f, 1f, 100f);
             API.DrawLightWithRangeAndShadow(extraoffset.X, extraoffset.Y, extraoffset.Z, Color['r'], Color['g'], Color['b'], Global.EnvLightRng, Global.EnvLightInt, 0.01f);
         }
 
@@ -324,62 +282,52 @@ internal void DrawEnvLight()
 
         internal void SetInfo()
         {
+            Delay = Global.PrimDelay;
             switch (_Id)
             {
                 case 1:
                     LightType = LightType.PRML;
-                    Delay = 100;
                     Pattern = "";
                     break;
                 case 2:
                     LightType = LightType.PRML;
-                    Delay = 100;
                     Pattern = "";
                     break;
                 case 3:
                     LightType = LightType.PRML;
-                    Delay = 100;
                     Pattern = "";
                     break;
                 case 4:
                     LightType = LightType.PRML;
-                    Delay = 100;
                     Pattern = "";
                     break;
                 case 5:
                     LightType = LightType.WRNL;
-                    Delay = 100;
                     Pattern = "";
                     break;
                 case 6:
                     LightType = LightType.WRNL;
-                    Delay = 100;
                     Pattern = "";
                     break;
                 case 7:
                     LightType = LightType.SECL;
-                    Delay = 100;
                     Pattern = "";
                     break;
                 case 8:
                     LightType = LightType.SECL;
-                    Delay = 100;
                     Pattern = "";
                     break;
                 case 9:
                     LightType = LightType.SECL;
-                    Delay = 100;
                     Pattern = "";
                     break;
                 case 10:
                     LightType = LightType.SBRN;
-                    Delay = 100;
                     Pattern = "";
                     IsPatternRunning = false;
                     break;
                 case 11:
                     LightType = LightType.SCL;
-                    Delay = 100;
                     Pattern = "";
                     IsPatternRunning = false;
                     spotLight = new SpotLight(_Id, _vehicle.GetNetworkId());
@@ -389,7 +337,7 @@ internal void SetInfo()
                     break;
                 case 12:
                     LightType = LightType.TDL;
-                    Delay = 100;
+                    Delay = Global.PrimDelay;
                     Pattern = "";
                     IsPatternRunning = false;
                     spotLight = new SpotLight(_Id, _vehicle.GetNetworkId());
diff --git a/src/FileLoader.cs b/src/FileLoader.cs
index d4ed5bf..272e605 100644
--- a/src/FileLoader.cs
+++ b/src/FileLoader.cs
@@ -71,7 +71,7 @@ private static void LoadFilesPromScript(string name)
         }
         internal void UnLoadFilesFromScript(string name)
         {
-            VCF.unload(name);   
+            VCF.unload(name);
         }
     }
 }
diff --git a/src/Light/IPatterns.cs b/src/Light/IPatterns.cs
index 277cfa7..53ad438 100644
--- a/src/Light/IPatterns.cs
+++ b/src/Light/IPatterns.cs
@@ -11,5 +11,6 @@ internal interface IPatterns
         int CurrentPrmPattern { get; set; }
         int CurrentSecPattern { get; set; }
         int CurrentWrnPattern { get; set; }
+        int CurrentStage { get; }
     }
 }
diff --git a/src/Light/Indicator.cs b/src/Light/Indicator.cs
new file mode 100644
index 0000000..59f128a
--- /dev/null
+++ b/src/Light/Indicator.cs
@@ -0,0 +1,125 @@
+using CitizenFX.Core;
+using CitizenFX.Core.Native;
+using ELS.configuration;
+using ELS.FullSync;
+using ELS.NUI;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ELS.Light
+{
+    internal enum IndicatorState
+    {
+        Off,
+        Left,
+        Right,
+        Hazard
+    }
+
+    internal class Indicator
+    {
+
+        public static IndicatorState CurrentIndicatorState(Vehicle veh) {
+            return (IndicatorState)API.GetVehicleIndicatorLights(veh.Handle);
+        }
+
+        public static Dictionary<string, IndicatorState> IndStateLib = new Dictionary<string, IndicatorState>()
+        {
+            {"Off",IndicatorState.Off },
+            {"Left", IndicatorState.Left },
+            { "Right", IndicatorState.Right },
+            { "Hazard", IndicatorState.Hazard }
+        };
+
+        public static int IndicatorDelay { get; set; }
+
+        public static bool ActivateIndicatorTimer { get; set; }
+
+        public static void ToggleInicatorState(Vehicle veh, IndicatorState state)
+        {
+            switch (state)
+            {
+                case IndicatorState.Off:
+                    veh.IsLeftIndicatorLightOn = false;
+                    veh.IsRightIndicatorLightOn = false;
+                    break;
+                case IndicatorState.Left:
+                    veh.IsLeftIndicatorLightOn = true;
+                    veh.IsRightIndicatorLightOn = false;
+                    break;
+                case IndicatorState.Right:
+                    veh.IsLeftIndicatorLightOn = false;
+                    veh.IsRightIndicatorLightOn = true;
+                    break;
+                case IndicatorState.Hazard:
+                    veh.IsLeftIndicatorLightOn = true;
+                    veh.IsRightIndicatorLightOn = true;
+                    break;
+            }
+        }
+
+        internal static void RunAsync(Vehicle veh)
+        {
+            Game.DisableControlThisFrame(0, ElsConfiguration.KeyBindings.ToggleLIND);
+            Game.DisableControlThisFrame(0, ElsConfiguration.KeyBindings.ToggleRIND);
+            Game.DisableControlThisFrame(0, ElsConfiguration.KeyBindings.ToggleHAZ);
+
+            if (Game.IsDisabledControlJustPressed(0, ElsConfiguration.KeyBindings.ToggleLIND))
+            {
+                if (CurrentIndicatorState(veh) == IndicatorState.Left)
+                {
+                    Utils.DebugWriteLine("Toggle Off");
+                    ToggleInicatorState(veh, IndicatorState.Off);
+                    ActivateIndicatorTimer = false;
+                    ElsUiPanel.PlayUiSound(false);
+                    RemoteEventManager.SendEvent(RemoteEventManager.Commands.ToggleInd, veh, true, Game.Player.ServerId);
+                    return;
+                }
+                Utils.DebugWriteLine("Toggle Left");
+                ToggleInicatorState(veh, IndicatorState.Left);
+                ElsUiPanel.PlayUiSound(true);
+                ActivateIndicatorTimer = true;
+                RemoteEventManager.SendEvent(RemoteEventManager.Commands.ToggleInd, veh, true, Game.Player.ServerId);
+            }
+            else if (Game.IsDisabledControlJustPressed(0, ElsConfiguration.KeyBindings.ToggleRIND))
+            {
+                if (CurrentIndicatorState(veh) == IndicatorState.Right)
+                {
+                    Utils.DebugWriteLine("Toggle Off");
+                    ToggleInicatorState(veh, IndicatorState.Off);
+                    ActivateIndicatorTimer = false;
+                    ElsUiPanel.PlayUiSound(false);
+                    RemoteEventManager.SendEvent(RemoteEventManager.Commands.ToggleInd, veh, true, Game.Player.ServerId);
+                    return;
+                }
+                Utils.DebugWriteLine("Toggle Right");
+                ToggleInicatorState(veh, IndicatorState.Right);
+                ActivateIndicatorTimer = true;
+                ElsUiPanel.PlayUiSound(true);
+                RemoteEventManager.SendEvent(RemoteEventManager.Commands.ToggleInd, veh, true, Game.Player.ServerId);
+            }
+            else if (Game.IsDisabledControlJustPressed(0, ElsConfiguration.KeyBindings.ToggleHAZ))
+            {
+                if (CurrentIndicatorState(veh) == IndicatorState.Hazard)
+                {
+                    Utils.DebugWriteLine("Toggle Off");
+                    ToggleInicatorState(veh, IndicatorState.Off);
+                    ActivateIndicatorTimer = false;
+                    ElsUiPanel.PlayUiSound(false);
+                    RemoteEventManager.SendEvent(RemoteEventManager.Commands.ToggleInd, veh, true, Game.Player.ServerId);
+                    return;
+                }
+                Utils.DebugWriteLine("Toggle Hazard");
+                ToggleInicatorState(veh, IndicatorState.Hazard);
+                ActivateIndicatorTimer = true;
+                ElsUiPanel.PlayUiSound(true);
+                RemoteEventManager.SendEvent(RemoteEventManager.Commands.ToggleInd, veh, true, Game.Player.ServerId);
+            }
+
+
+        }
+    }
+}
diff --git a/src/Light/Light.Loop.cs b/src/Light/Light.Loop.cs
index 3966876..d495ce3 100644
--- a/src/Light/Light.Loop.cs
+++ b/src/Light/Light.Loop.cs
@@ -136,6 +136,7 @@ public async void ExternalTicker()
             {
                 _vehicle.IsEngineRunning = true;
             }
+
             if (_extras.BRD.HasBoard)
             {
                 _extras.BRD.BoardTicker();
diff --git a/src/Light/LightStage.cs b/src/Light/LightStage.cs
deleted file mode 100644
index 191146a..0000000
--- a/src/Light/LightStage.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using ELS.configuration;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ELS.Light
-{
-    enum ELightStage
-    {
-        Lstg0=0,
-        Lstg1 =1,
-        Lstg2=2,
-        Lstg3=3
-    }
-    class LightStage
-    {
-        ELightStage currentStage;
-        internal LightStage(): this(ELightStage.Lstg0)
-        {
-            
-        }
-        internal LightStage(ELightStage stage)
-        {
-            currentStage = stage;
-        }
-        internal void NextStage()
-        {
-
-        }
-        internal void PrevousStage()
-        {
-
-        }
-
-        internal Lstg GetPresetPrimaryLstg(ELightStage stage, Vcfroot root)
-        {
-            switch (stage)
-            {
-                case ELightStage.Lstg1:
-                    return root.PRML.PresetPatterns.Lstg1;
-                case ELightStage.Lstg2:
-                    return root.PRML.PresetPatterns.Lstg2;
-                case ELightStage.Lstg3:
-                    return root.PRML.PresetPatterns.Lstg3;
-                default:
-                    return new Lstg();
-            }
-        }
-
-        internal Lstg GetPresetSecondaryLstg(ELightStage stage, Vcfroot root)
-        {
-            switch (stage)
-            {
-                case ELightStage.Lstg1:
-                    return root.SECL.PresetPatterns.Lstg1;
-                case ELightStage.Lstg2:
-                    return root.SECL.PresetPatterns.Lstg2;
-                case ELightStage.Lstg3:
-                    return root.SECL.PresetPatterns.Lstg3;
-                default:
-                    return new Lstg();
-            }
-        }
-    }
-}
diff --git a/src/Light/Lights.Patterns.cs b/src/Light/Lights.Patterns.cs
index 9fd1023..fb4bfca 100644
--- a/src/Light/Lights.Patterns.cs
+++ b/src/Light/Lights.Patterns.cs
@@ -108,13 +108,19 @@ public int CurrentPrmPattern
                                 }
                                 _prefix = "C";
                                 break;
+                            case "custom":
+                                e.Pattern = _vcfroot.CustomPatterns.Values.ElementAt(CurrentPrmPattern).PatternData[e.Id];
+                                e.Delay = _vcfroot.CustomPatterns.Values.ElementAt(CurrentPrmPattern).PrmDelay;
+                                _prmPatterns = _vcfroot.CustomPatterns.Count;
+                                Utils.DebugWriteLine($"Got custom patterns for extra {e.Id} with {e.Pattern}  at {e.Delay}");
+                                break;
                             default:
                                 e.Pattern = Leds.PrimaryPatterns[CurrentPrmPattern][e.Id];
                                 _prefix = "L";
                                 break;
                         }
                         e.PatternNum = CurrentPrmPattern;
-                        e.Delay = Global.PrimDelay;
+                        
                     }
                     catch (Exception ex)
                     {
@@ -125,7 +131,15 @@ public int CurrentPrmPattern
                Utils.DebugWriteLine($"Current primary pattern is {CurrentPrmPattern}");
                 if (Game.PlayerPed.IsInPoliceVehicle && Game.PlayerPed.CurrentVehicle.GetNetworkId() == _vehicle.GetNetworkId())
                 {
-                    ElsUiPanel.SetUiDesc(_prefix + CurrentPrmPattern.ToString().PadLeft(3, '0'), ExtraEnum.PRML.ToString());
+                    if (_vcfroot.PRML.LightingFormat.Equals("custom"))
+                    {
+                        string input = _vcfroot.CustomPatterns.Keys.ElementAt(CurrentPrmPattern);
+                        ElsUiPanel.SetUiDesc(input.First().ToString().ToUpper() + input.Substring(1), ExtraEnum.PRML.ToString());
+                    }
+                    else
+                    {
+                        ElsUiPanel.SetUiDesc(_prefix + CurrentPrmPattern.ToString().PadLeft(3, '0'), ExtraEnum.PRML.ToString());
+                    }
                 }
             }
         }
@@ -188,13 +202,18 @@ public int CurrentSecPattern
                                 }
                                 _prefix = "C";
                                 break;
+                            case "custom":
+                                e.Pattern = _vcfroot.CustomPatterns.Values.ElementAt(CurrentSecPattern).PatternData[e.Id];
+                                e.Delay = _vcfroot.CustomPatterns.Values.ElementAt(CurrentSecPattern).SecDelay;
+                                _secPatterns = _vcfroot.CustomPatterns.Count;
+                                Utils.DebugWriteLine($"Got custom patterns for extra {e.Id} with {e.Pattern}  at {e.Delay}");
+                                break;
                             default:
                                 e.Pattern = Leds.PrimaryPatterns[CurrentSecPattern][e.Id];
                                 _prefix = "L";
                                 break;
                         }
                         e.PatternNum = CurrentSecPattern;
-                        e.Delay = Global.PrimDelay;
                     }
                     catch (Exception ex)
                     {
@@ -203,7 +222,15 @@ public int CurrentSecPattern
                 }
                 if (Game.PlayerPed.IsInPoliceVehicle && Game.PlayerPed.CurrentVehicle.GetNetworkId() == _vehicle.GetNetworkId())
                 {
-                    ElsUiPanel.SetUiDesc(_prefix + CurrentSecPattern.ToString().PadLeft(3, '0'), ExtraEnum.SECL.ToString());
+                    if (_vcfroot.SECL.LightingFormat.Equals("custom"))
+                    {
+                        string input = _vcfroot.CustomPatterns.Keys.ElementAt(CurrentSecPattern);
+                        ElsUiPanel.SetUiDesc(input.First().ToString().ToUpper() + input.Substring(1), ExtraEnum.SECL.ToString());
+                    }
+                    else
+                    {
+                        ElsUiPanel.SetUiDesc(_prefix + CurrentSecPattern.ToString().PadLeft(3, '0'), ExtraEnum.SECL.ToString());
+                    }
                 }
                  Utils.DebugWriteLine($"Current secondary pattern is {CurrentSecPattern}");
             }
@@ -252,13 +279,18 @@ public int CurrentWrnPattern
                                 }
                                 _prefix = "C";
                                 break;
+                            case "custom":
+                                e.Pattern = _vcfroot.CustomPatterns.Values.ElementAt(CurrentWrnPattern).PatternData[e.Id];
+                                e.Delay = _vcfroot.CustomPatterns.Values.ElementAt(CurrentWrnPattern).SecDelay * 1000;
+                                _wrnPatterns = _vcfroot.CustomPatterns.Count;
+                                Utils.DebugWriteLine($"Got custom patterns for extra {e.Id} with {e.Pattern}  at {e.Delay}");
+                                break;
                             default:
                                 e.Pattern = Leds.WarningPatterns[CurrentWrnPattern][e.Id];
                                 _prefix = "L";
                                 break;
                         }
                         e.PatternNum = CurrentWrnPattern;
-                        e.Delay = Global.PrimDelay;
                     }
                     catch (Exception ex)
                     {
@@ -267,32 +299,40 @@ public int CurrentWrnPattern
                 }
                 if (Game.PlayerPed.IsInPoliceVehicle && Game.PlayerPed.CurrentVehicle.GetNetworkId() == _vehicle.GetNetworkId())
                 {
-                    ElsUiPanel.SetUiDesc(_prefix + CurrentWrnPattern.ToString().PadLeft(3, '0'), ExtraEnum.WRNL.ToString());
+                    if (_vcfroot.SECL.LightingFormat.Equals("custom"))
+                    {
+                        string input = _vcfroot.CustomPatterns.Keys.ElementAt(CurrentWrnPattern);
+                        ElsUiPanel.SetUiDesc(input.First().ToString().ToUpper() + input.Substring(1), ExtraEnum.WRNL.ToString());
+                    }
+                    else
+                    {
+                        ElsUiPanel.SetUiDesc(_prefix + CurrentWrnPattern.ToString().PadLeft(3, '0'), ExtraEnum.WRNL.ToString());
+                    }
                 }
                 Utils.DebugWriteLine($"Current warning pattern is {CurrentWrnPattern}");
             }
         }
 
+        public int CurrentStage
+        { get { return _stage.CurrentStage; } }
+
         private void SetupPatternsPrm()
         {
             CurrentPrmPattern = 0;
             PrmScanPatts = new List<int>();
             if (_stage.PRML.ScanPatternCustomPool.Enabled) {
-#if DEBUG
-                CitizenFX.Core.Debug.WriteLine($"Adding Primary Scan pool patterns");
-#endif
+                Utils.DebugWriteLine($"Adding Primary Scan pool patterns");
                 foreach (int p in _stage.PRML.ScanPatternCustomPool.Pattern)
                 {
                     PrmScanPatts.Add(p);
-#if DEBUG
-                    CitizenFX.Core.Debug.WriteLine($"Added {p} to primary scan patterns");
-#endif
+                    Utils.DebugWriteLine($"Added {p} to primary scan patterns");
                 }
                 CurrentPrmPattern = PrmScanPatts[0];
             }
-            else
+            if (_extras.PRML.Count == 0)
             {
-
+                _prmPatterns = 0;
+                ElsUiPanel.SetUiDesc("--", ExtraEnum.PRML.ToString());
             }
         }
 
@@ -314,6 +354,11 @@ private void SetupSecPatterns()
                 }
                 CurrentSecPattern = SecScanPatts[0];
             }
+            if (_extras.PRML.Count == 0)
+            {
+                _secPatterns = 0;
+                ElsUiPanel.SetUiDesc("--", ExtraEnum.SECL.ToString());
+            }
         }
 
         private void SetupWrnPatterns()
@@ -334,6 +379,11 @@ private void SetupWrnPatterns()
                 }
                 CurrentWrnPattern = WrnScanPatts[0];
             }
+            if (_extras.PRML.Count == 0)
+            {
+                _wrnPatterns = 0;
+                ElsUiPanel.SetUiDesc("--", ExtraEnum.WRNL.ToString());
+            }
         }
 
         internal void SetCHP()
diff --git a/src/Light/Lights.cs b/src/Light/Lights.cs
index 69b9dd0..c913b45 100644
--- a/src/Light/Lights.cs
+++ b/src/Light/Lights.cs
@@ -53,7 +53,7 @@ partial class Lights : IManagerEntry
 
         private Vcfroot _vcfroot;
         private Vehicle _vehicle;
-        private Stage _stage;
+        internal Stage _stage;
        
 
         internal Lights(Vehicle vehicle, Vcfroot vcfroot, [Optional]IDictionary<string, object> data)
diff --git a/src/Light/Lights.logic.cs b/src/Light/Lights.logic.cs
index 738789b..958801a 100644
--- a/src/Light/Lights.logic.cs
+++ b/src/Light/Lights.logic.cs
@@ -34,6 +34,7 @@ internal void ToggleSecLights()
             }
             secLights = !secLights;
             ElsUiPanel.ToggleUiBtnState(secLights, "SECL");
+            ElsUiPanel.PlayUiSound(secLights);
         }
 
         bool wrnLights = false;
@@ -53,6 +54,7 @@ internal void ToggleWrnLights()
             }
             wrnLights = !wrnLights;
             ElsUiPanel.ToggleUiBtnState(wrnLights, "WRNL");
+            ElsUiPanel.PlayUiSound(wrnLights);
         }
 
         bool crsLights = false;
@@ -113,18 +115,21 @@ internal async void ToggleCrs()
             }
             crsLights = !crsLights;
             ElsUiPanel.ToggleUiBtnState(crsLights, "CRS");
+            ElsUiPanel.PlayUiSound(crsLights);
         }
 
         internal void ToggleTdl()
         {
             _extras.TDL.TurnedOn = !_extras.TDL.State;
             ElsUiPanel.ToggleUiBtnState(_extras.TDL.TurnedOn, "TDL");
+            ElsUiPanel.PlayUiSound(_extras.TDL.TurnedOn);
         }
 
         internal void ToggleScl()
         {
             _extras.SCL.TurnedOn = !_extras.SCL.State;
             ElsUiPanel.ToggleUiBtnState(_extras.SCL.TurnedOn, "SCL");
+            ElsUiPanel.PlayUiSound(_extras.SCL.TurnedOn);
         }
 
         internal async void ChgPrmPatt(bool decrement)
@@ -139,6 +144,7 @@ internal async void ChgPrmPatt(bool decrement)
                 {
                     CurrentPrmPattern--;
                 }
+                ElsUiPanel.PlayUiSound(false);
             }
             else
             {
@@ -150,6 +156,7 @@ internal async void ChgPrmPatt(bool decrement)
                 {
                     CurrentPrmPattern++;
                 }
+                ElsUiPanel.PlayUiSound(true);
             }
         }
 
@@ -165,6 +172,7 @@ internal async void ChgSecPatt(bool decrement)
                 {
                     CurrentSecPattern--;
                 }
+                ElsUiPanel.PlayUiSound(false);
             }
             else
             {
@@ -176,6 +184,7 @@ internal async void ChgSecPatt(bool decrement)
                 {
                     CurrentSecPattern++;
                 }
+                ElsUiPanel.PlayUiSound(true);
             }
         }
 
@@ -191,6 +200,7 @@ internal async void ChgWrnPatt(bool decrement)
                 {
                     CurrentWrnPattern--;
                 }
+                ElsUiPanel.PlayUiSound(false);
             }
             else
             {
@@ -202,6 +212,7 @@ internal async void ChgWrnPatt(bool decrement)
                 {
                     CurrentWrnPattern++;
                 }
+                ElsUiPanel.PlayUiSound(true);
             }
         }
 
@@ -469,8 +480,13 @@ private void SetStage()
                     ElsUiPanel.ToggleUiBtnState(prmLights, "PRML");
                     ElsUiPanel.ToggleUiBtnState(secLights, "SECL");
                     ElsUiPanel.ToggleUiBtnState(wrnLights, "WRNL");
+                    ElsUiPanel.PlayUiSound(false);
                     break;
                 case 1:
+                    if (_vcfroot.MISC.DfltSirenLtsActivateAtLstg == 1)
+                    {
+                        SetGTASirens(true);
+                    }
                     foreach (Extra.Extra e in _extras.SECL.Values)
                     {
                         if (_stage.SECL.PresetPatterns.Lstg1.Enabled)
@@ -481,7 +497,7 @@ private void SetStage()
                             }
                             else
                             {
-                                CurrentSecPattern = int.Parse(_stage.SECL.PresetPatterns.Lstg1.Pattern);
+                                CurrentSecPattern = _stage.SECL.PresetPatterns.Lstg1.IntPattern;
                             }
                         }
                         else
@@ -510,8 +526,13 @@ private void SetStage()
                     ElsUiPanel.ToggleUiBtnState(prmLights, "PRML");
                     ElsUiPanel.ToggleUiBtnState(secLights, "SECL");
                     ElsUiPanel.ToggleUiBtnState(wrnLights, "WRNL");
+                    ElsUiPanel.PlayUiSound(true);
                     break;
                 case 2:
+                    if (_vcfroot.MISC.DfltSirenLtsActivateAtLstg == 2)
+                    {
+                        SetGTASirens(true);
+                    }
                     foreach (Extra.Extra e in _extras.PRML.Values)
                     {
                         e.IsPatternRunning = false;
@@ -530,7 +551,7 @@ private void SetStage()
                             }
                             else
                             {
-                                CurrentSecPattern = int.Parse(_stage.SECL.PresetPatterns.Lstg2.Pattern);
+                                CurrentSecPattern = _stage.SECL.PresetPatterns.Lstg2.IntPattern;
                             }
                         }
                         else
@@ -542,24 +563,27 @@ private void SetStage()
                     secLights = true;
                     foreach (int i in extras)
                     {
-                        Extra.Extra e = _extras.PRML[i];
-                        if (_stage.PRML.PresetPatterns.Lstg2.Enabled)
+                        if (_extras.PRML.ContainsKey(i))
                         {
-                            if (_stage.PRML.PresetPatterns.Lstg2.Pattern.ToLower().Equals("scan"))
+                            Extra.Extra e = _extras.PRML[i];
+                            if (_stage.PRML.PresetPatterns.Lstg2.Enabled)
                             {
-                                _scan = true;
+                                if (_stage.PRML.PresetPatterns.Lstg2.Pattern.ToLower().Equals("scan"))
+                                {
+                                    _scan = true;
+                                }
+                                else
+                                {
+                                    CurrentPrmPattern = _stage.PRML.PresetPatterns.Lstg2.IntPattern;
+                                }
                             }
                             else
                             {
-                                CurrentPrmPattern = int.Parse(_stage.PRML.PresetPatterns.Lstg2.Pattern);
-                            }
-                        }
-                        else
-                        {
 
+                            }
+                            e.IsPatternRunning = false;
+                            e.IsPatternRunning = true;
                         }
-                        e.IsPatternRunning = false;
-                        e.IsPatternRunning = true;
                     }
                     if (_vcfroot.PRML.LightingFormat.ToLower().Equals("chp"))
                     {
@@ -573,9 +597,13 @@ private void SetStage()
                     ElsUiPanel.ToggleUiBtnState(prmLights, "PRML");
                     ElsUiPanel.ToggleUiBtnState(secLights, "SECL");
                     ElsUiPanel.ToggleUiBtnState(wrnLights, "WRNL");
+                    ElsUiPanel.PlayUiSound(true);
                     break;
                 case 3:
-                    SetGTASirens(true);
+                    if (_vcfroot.MISC.DfltSirenLtsActivateAtLstg == 3)
+                    {
+                        SetGTASirens(true);
+                    }
                     foreach (Extra.Extra e in _extras.SECL.Values)
                     {
 
@@ -587,7 +615,7 @@ private void SetStage()
                             }
                             else
                             {
-                                CurrentSecPattern = int.Parse(_stage.SECL.PresetPatterns.Lstg3.Pattern);
+                                CurrentSecPattern = _stage.SECL.PresetPatterns.Lstg3.IntPattern;
                             }
                         }
                         if (_vcfroot.SECL.DisableAtLstg3)
@@ -614,7 +642,7 @@ private void SetStage()
                             }
                             else
                             {
-                                CurrentPrmPattern = int.Parse(_stage.PRML.PresetPatterns.Lstg3.Pattern);
+                                CurrentPrmPattern = _stage.PRML.PresetPatterns.Lstg3.IntPattern;
                             }
                         }
                         if (_vcfroot.PRML.DisableAtLstg3)
@@ -642,7 +670,7 @@ private void SetStage()
                             }
                             else
                             {
-                                CurrentWrnPattern = int.Parse(_stage.WRNL.PresetPatterns.Lstg3.Pattern);
+                                CurrentWrnPattern = _stage.WRNL.PresetPatterns.Lstg3.IntPattern;
                             }
                         }
                         if (_vcfroot.WRNL.DisableAtLstg3)
@@ -665,7 +693,7 @@ private void SetStage()
                         _extras.SBRN.Pattern = CHP.LightStage3[CurrentWrnPattern][10];
                         _extras.SBRN.IsPatternRunning = true;
                     }
-                    
+                    ElsUiPanel.PlayUiSound(true);
                     break;
             }
         }
diff --git a/src/Light/Patterns/CustomPattern.cs b/src/Light/Patterns/CustomPattern.cs
new file mode 100644
index 0000000..fcc5b9d
--- /dev/null
+++ b/src/Light/Patterns/CustomPattern.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ELS.Light.Patterns
+{
+    public struct CustomPattern
+    {
+        internal CustomPattern(int prm, int sec, int ta, Dictionary<int,string> dict) 
+        {
+            PrmDelay = prm;
+            SecDelay = sec;
+            TADelay = ta;
+            PatternData = dict;
+        }
+        internal Dictionary<int,string> PatternData { get; set; }
+        internal int PrmDelay { get; set; }
+        internal int SecDelay { get; set; }
+        internal int TADelay { get; set; }
+
+    }
+}
diff --git a/src/Light/Stage.cs b/src/Light/Stage.cs
index 0d8d25f..7fb7ae3 100644
--- a/src/Light/Stage.cs
+++ b/src/Light/Stage.cs
@@ -26,6 +26,7 @@ internal Stage(configuration.Lights prml, configuration.Lights secl, configurati
             CurrentStage = 0;
             vehicleId = veh;
             ActivationType = acttype.ToLower();
+            Utils.DebugWriteLine($"Light Stage activation type is {ActivationType}");
         }
 
         internal int CurrentStage
@@ -34,7 +35,7 @@ internal int CurrentStage
             private set
             {
                 stage = value;
-                if (Game.PlayerPed.IsInPoliceVehicle && vehicleId == Game.PlayerPed.CurrentVehicle.GetNetworkId())
+                if (Game.PlayerPed.IsSittingInELSVehicle() && vehicleId == Game.PlayerPed.CurrentVehicle.GetNetworkId())
                 {
                     ElsUiPanel.ToggleStages(CurrentStage);
                 }
diff --git a/src/Manager/VehicleList.cs b/src/Manager/VehicleList.cs
index 2d5cf72..4999a47 100644
--- a/src/Manager/VehicleList.cs
+++ b/src/Manager/VehicleList.cs
@@ -1,4 +1,5 @@
-using CitizenFX.Core.Native;
+using CitizenFX.Core;
+using CitizenFX.Core.Native;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -9,16 +10,16 @@
 
 namespace ELS.Manager
 {
-    class VehicleList : List<ELSVehicle>
+    class VehicleList : Dictionary<int,ELSVehicle>
     {
-        public new void Add(ELSVehicle veh)
+        /*public new void Add(ELSVehicle veh)
         {
             base.Add(veh);
-        }
+        }*/
         public void Add(int NetworkID)
         {
             var veh = new ELSVehicle(API.NetToVeh(NetworkID));
-            Add(veh);
+            Add(veh.GetNetworkId(),veh);
         }
         public bool IsReadOnly => throw new NotImplementedException();
         public void RunTick()
@@ -29,7 +30,7 @@ public void RunExternalTick([Optional] ELSVehicle vehicle)
         {
             try
             {
-                foreach (var t in this)
+                foreach (var t in this.Values)
                 {
                     if (vehicle == null ||  t.Handle!=vehicle.Handle)
                     t.RunExternalTick();
@@ -44,25 +45,32 @@ public bool MakeSureItExists(int NetworkID, [Optional]out ELSVehicle vehicle)
         {
             if (NetworkID == 0)
             {
-                CitizenFX.Core.Debug.WriteLine("ERROR Try to add vehicle\nNetwordID equals 0");
+                Utils.DebugWriteLine("ERROR Try to add vehicle\nNetwordID equals 0");
                 vehicle = null;
                 return false;
             }
 
-            else if (!Exists(poolObject => (poolObject).GetNetworkId() == NetworkID))
+            else if (!ContainsKey(NetworkID))
             {
                 try
                 {
-                    var veh = new ELSVehicle(API.NetToVeh(NetworkID));
-                    Add(veh);
+                    ELSVehicle veh = null;
+                    int handle = API.NetToVeh(NetworkID);
+                    if (handle == 0)
+                    {
+                        veh = new ELSVehicle(Game.PlayerPed.CurrentVehicle.Handle);
+                    }
+                    else
+                    {
+                        veh = new ELSVehicle(handle);
+                    }
+                    Add(NetworkID,veh);
                     vehicle = veh;
                     return true;
                 }
                 catch (Exception ex)
                 {
-#if DEBUG 
-                    CitizenFX.Core.Debug.Write($"Exsits Error: {ex.Message} due to {ex.InnerException}");
-#endif
+                    Utils.DebugWriteLine($"Exists Error: {ex.Message} due to {ex.InnerException}");
                     vehicle = null;
                     return false;
                     throw ex;
@@ -71,7 +79,7 @@ public bool MakeSureItExists(int NetworkID, [Optional]out ELSVehicle vehicle)
             }
             else
             {
-                vehicle = Find(poolObject => ((ELSVehicle)poolObject).GetNetworkId() == NetworkID);
+                vehicle = this[NetworkID];//Find(poolObject => ((ELSVehicle)poolObject).GetNetworkId() == NetworkID);
                 return true;
             }
         }
@@ -79,28 +87,24 @@ public bool MakeSureItExists(int NetworkID, IDictionary<string, object> data, [O
         {
             if (NetworkID == 0)
             {
-                CitizenFX.Core.Debug.WriteLine("ERROR NetwordID equals 0\n");
+                Utils.DebugWriteLine("ERROR NetwordID equals 0\n");
                 vehicle = null;
                 return false;
             }
 
-            else if (!Exists(poolObject => (poolObject).GetNetworkId() == NetworkID))
+            else if (!ContainsKey(NetworkID))
             {
                 try
                 {
                     var veh = new ELSVehicle(API.NetToVeh(NetworkID), data);
-                    Add(veh);
-#if DEBUG
-                    CitizenFX.Core.Debug.Write($"Adding Vehicle");
-#endif
+                    Add(veh.GetNetworkId(),veh);
+                    Utils.DebugWriteLine($"Adding Vehicle");
                     vehicle = veh;
                     return true;
                 }
                 catch (Exception ex)
                 {
-#if DEBUG
                     CitizenFX.Core.Debug.Write($"Exsits Error With Data: {ex.Message}");
-#endif
                     vehicle = null;
                     return false;
                     throw ex;
@@ -109,13 +113,16 @@ public bool MakeSureItExists(int NetworkID, IDictionary<string, object> data, [O
             }
             else
             {
-                vehicle = Find(poolObject => ((ELSVehicle)poolObject).GetNetworkId() == NetworkID) as ELSVehicle;
+                vehicle = this[NetworkID];
                 return true;
             }
         }
         public void CleanUP()
         {
-            ForEach((veh) => { veh.CleanUP(); });
+            foreach(ELSVehicle v in this.Values)
+            {
+                v.CleanUP();
+            }
         }
         ~VehicleList()
         {
diff --git a/src/Manager/VehicleManager.cs b/src/Manager/VehicleManager.cs
index fbe0aed..5e07f3c 100644
--- a/src/Manager/VehicleManager.cs
+++ b/src/Manager/VehicleManager.cs
@@ -9,6 +9,8 @@
 using System.Collections;
 using System.Threading.Tasks;
 using ELS.configuration;
+using ELS.Light;
+using static ELS.RemoteEventManager;
 
 namespace ELS.Manager
 {
@@ -27,32 +29,32 @@ private void makenetworked(Vehicle veh)
             ///  THANKS to Antivirus-chan in the FiveM community for supplying this code
             ///
             //////////
-            //if (!veh.Model.IsLoaded) veh.Model.Request(-1);
+            //
             var net1 = API.VehToNet(veh.Handle);
-            var attempts = 0;
-            do
-            {
-                BaseScript.Delay(500);
-                var netid = API.NetworkGetNetworkIdFromEntity(veh.Handle);
-                API.NetworkRegisterEntityAsNetworked(veh.Handle);
-                API.SetEntityAsMissionEntity(veh.Handle, false, false);
-                API.SetNetworkIdCanMigrate(netid, true);
-                API.SetNetworkIdExistsOnAllMachines(netid, true);
-                API.NetworkRequestControlOfEntity(veh.Handle);
-                attempts++;
-            }
-            while (!API.NetworkDoesEntityExistWithNetworkId(veh.Handle) && attempts < 20);
-            if (attempts == 20 && !notified)
-            {
-                CitizenFX.Core.Debug.WriteLine("Failed to register entity on net");
-                notified = true;
-            }
-            else if (!notified)
-            {
-                CitizenFX.Core.Debug.WriteLine($"Registered {veh.Handle} on net as {net1}");
-                ELS.TriggerEvent("ELS:VehicleEntered");
-                notified = true;
-            }
+                var attempts = 0;
+                do
+                {
+                    BaseScript.Delay(500);
+                    net1 = API.NetworkGetNetworkIdFromEntity(veh.Handle);
+                    API.NetworkRegisterEntityAsNetworked(veh.Handle);
+                    API.SetEntityAsMissionEntity(veh.Handle, false, false);
+                    API.SetNetworkIdCanMigrate(net1, true);
+                    API.SetNetworkIdExistsOnAllMachines(net1, true);
+                    API.NetworkRequestControlOfEntity(veh.Handle);
+                    attempts++;
+                }
+                while (veh.GetNetworkId() == 0 && attempts < 100 && !notified);
+                if (attempts == 100 && !notified)
+                {
+                    CitizenFX.Core.Debug.WriteLine("Failed to register entity on net");
+                    notified = true;
+                }
+                else if (!notified)
+                {
+                    CitizenFX.Core.Debug.WriteLine($"Registered {veh.Handle} on net as {net1}");
+                    ELS.TriggerEvent("ELS:VehicleEntered");
+                    notified = true;
+                }
         }
         internal async void RunTickAsync()
         {
@@ -62,14 +64,17 @@ internal async void RunTickAsync()
                         (Game.PlayerPed.CurrentVehicle.GetPedOnSeat(VehicleSeat.Driver) == Game.PlayerPed
                         || Game.PlayerPed.CurrentVehicle.GetPedOnSeat(VehicleSeat.Passenger) == Game.PlayerPed))
                 {
-                    if (vehicleList.MakeSureItExists(API.VehToNet(Game.PlayerPed.CurrentVehicle.Handle), vehicle: out ELSVehicle _currentVehicle))
+                    Utils.DebugWriteLine($"Player is in police vehicle with net id of {Game.PlayerPed.CurrentVehicle.GetNetworkId()}");
+                    if (vehicleList.MakeSureItExists(Game.PlayerPed.CurrentVehicle.GetNetworkId(), vehicle: out ELSVehicle _currentVehicle))
                     {
+                        Utils.DebugWriteLine("Vehicle is in vehicle list");
                         _currentVehicle?.RunTick();
                         vehicleList.RunExternalTick(_currentVehicle);
                         Game.PlayerPed.CurrentVehicle.SetExistOnAllMachines(true);
                     }
                     else
                     {
+                        Utils.DebugWriteLine("Vehicle does not exist");
                         makenetworked(Game.PlayerPed.CurrentVehicle);
                         //var pos = Game.PlayerPed.CurrentVehicle.Position;
                         //var rot = Game.PlayerPed.CurrentVehicle.Rotation;
@@ -98,6 +103,13 @@ internal async void RunTickAsync()
                 {
                     vehicleList.RunExternalTick();
                 }
+                if (Game.PlayerPed.IsInVehicle() && (Game.PlayerPed.CurrentVehicle.GetPedOnSeat(VehicleSeat.Driver) == Game.PlayerPed)
+                    && (VehicleClass.Boats != Game.PlayerPed.CurrentVehicle.ClassType || VehicleClass.Trains != Game.PlayerPed.CurrentVehicle.ClassType
+                    || VehicleClass.Planes != Game.PlayerPed.CurrentVehicle.ClassType || VehicleClass.Helicopters != Game.PlayerPed.CurrentVehicle.ClassType))
+                {
+                    makenetworked(Game.PlayerPed.CurrentVehicle);
+                    Indicator.RunAsync(Game.PlayerPed.CurrentVehicle);
+                }
             }
             catch (Exception e)
             {
@@ -113,10 +125,10 @@ internal async void RunTickAsync()
         /// <param name="dataDic">data</param>
         async internal void SetVehicleSyncData(IDictionary<string, object> dataDic,int PlayerId)
         {
+            Utils.DebugWriteLine($"Got Sync Data for {dataDic["NetworkID"]}");
             if (Game.Player.ServerId == PlayerId) return;
-            var bo = vehicleList.MakeSureItExists((int)dataDic["NetworkID"]
-                        , dataDic, out ELSVehicle veh1);
-            if (bo)
+            var bo = vehicleList.MakeSureItExists((int)dataDic["NetworkID"], dataDic, out ELSVehicle veh1);
+            if (bo && dataDic.ContainsKey("siren") || dataDic.ContainsKey("light"))
             {
                 veh1.SetData(dataDic);
 
@@ -124,6 +136,11 @@ async internal void SetVehicleSyncData(IDictionary<string, object> dataDic,int P
                 CitizenFX.Core.Debug.Write($" Applying vehicle data with NETID of {(int)dataDic["NetworkID"]} LOCALID of {CitizenFX.Core.Native.API.NetToVeh((int)dataDic["NetworkID"])}");
 #endif
             }
+else if (dataDic.ContainsKey("IndState"))
+            {
+                Utils.DebugWriteLine($"Ind sync data for {dataDic["NetworkID"].ToString()} is {dataDic["IndState"]}");
+                Indicator.ToggleInicatorState((Vehicle)Vehicle.FromHandle(API.NetworkGetEntityFromNetworkId((int)dataDic["NetworkID"])), Indicator.IndStateLib[dataDic["IndState"].ToString()]);
+            }
         }
 
         internal static void SyncUI(int netId)
@@ -133,20 +150,33 @@ internal static void SyncUI(int netId)
                 Utils.DebugWriteLine("Vehicle net ID is empty");
                 return;
             }
-            (vehicleList.Find(o => o.GetNetworkId() == netId)).SyncUi();
+            vehicleList[netId].SyncUi();
         }
 
-        internal static void SyncRequestReply(int NetworkId,int PlayerId)
+        internal static void SyncRequestReply(Commands command,int NetworkId,int PlayerId)
         {
             if (NetworkId == 0)
             {
-                CitizenFX.Core.Debug.WriteLine("ERROR sending vehicle data NetwordID equals 0\n");
+                Utils.DebugWriteLine("ERROR sending vehicle data NetwordID equals 0\n");
                 return;
             }
-            FullSync.FullSyncManager.SendDataBroadcast(
-                (vehicleList.Find(o => o.GetNetworkId() == NetworkId)).GetData(),
-                PlayerId
-            );
+            switch(command)
+            {
+                case Commands.ToggleInd:
+                    Dictionary<string, object> dict = new Dictionary<string, object>
+                    {
+                        {"NetworkID",NetworkId },
+                        {"IndState", Indicator.CurrentIndicatorState((Vehicle)Vehicle.FromHandle(API.NetworkGetEntityFromNetworkId(NetworkId))).ToString() }
+                    };
+                    Utils.DebugWriteLine($"Sending sync data for {dict["NetworkID"]} is {dict["IndState"]}");
+                    FullSync.FullSyncManager.SendDataBroadcast(dict, PlayerId);
+                    break;
+                default:
+                    FullSync.FullSyncManager.SendDataBroadcast(vehicleList[NetworkId].GetData(), PlayerId);
+                    break;
+
+            }
+            
         }
         internal void SyncAllVehiclesOnFirstSpawn(System.Dynamic.ExpandoObject data)
         {
diff --git a/src/NUI/ELSVehicleUIState.cs b/src/NUI/ELSVehicleUIState.cs
deleted file mode 100644
index 22b1c10..0000000
--- a/src/NUI/ELSVehicleUIState.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ELS.NUI
-{
-    public class ELSVehicleUIState
-    {
-
-        public bool PrimarySiren
-        {
-            get;
-            set;
-        }
-
-        public bool SecondarySiren
-        {
-            get;
-            set;
-        }
-
-        public bool WarningSiren
-        {
-            get;
-            set;
-        }
-
-        public bool TakedownLights
-        {
-            get;
-            set;
-        }
-
-        public bool CRSLights
-        {
-            get;
-            set;
-        }
-
-        public int MainSirenNumber
-        {
-            get;
-            set;
-        }
-
-        public int MainSirenPattern
-        {
-            get;
-            set;
-        }
-
-        public string MainSirenMode
-        {
-            get;
-            set;
-        }
-
-        public ELSVehicleUIState(bool priS = false,bool secS = false, bool wrnS = false, bool tkdL = false, bool crsL = false, int mainSNum = 0, int mainSirenPattern = 255, string mainSirenMode = "SCAN") {
-            PrimarySiren = priS;
-            SecondarySiren = secS;
-            WarningSiren = wrnS;
-            TakedownLights = tkdL;
-            CRSLights = crsL;
-            MainSirenNumber = mainSNum;
-            MainSirenPattern = mainSirenPattern;
-            MainSirenMode = mainSirenMode;
-        }
-    }
-}
diff --git a/src/NUI/ElsUiPanel.cs b/src/NUI/ElsUiPanel.cs
index e308d71..da83485 100644
--- a/src/NUI/ElsUiPanel.cs
+++ b/src/NUI/ElsUiPanel.cs
@@ -59,6 +59,18 @@ internal static void SetEuro(bool euro)
             API.SendNuiMessage($"{{\"type\":\"seteuro\", \"euro\":{euro.ToString().ToLower()}}}");
         }
 
+        static internal void PlayUiSound(bool state)
+        {
+            if (state)
+            {
+                API.PlaySoundFrontend(-1, "NAV_LEFT_RIGHT", "HUD_FRONTEND_DEFAULT_SOUNDSET", true);
+            }
+            else
+            {
+                API.PlaySoundFrontend(-1, "NAV_LEFT_RIGHT", "HUD_FRONTEND_DEFAULT_SOUNDSET", true);
+            }
+        }
+
         /// <summary>
         /// Send lighting data to display 
         /// </summary>
diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs
index d88e9ea..6b235c4 100644
--- a/src/Properties/AssemblyInfo.cs
+++ b/src/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Friendsincode")]
-[assembly: AssemblyProduct("ELS-FiveM")]
+[assembly: AssemblyProduct("ELS Plus")]
 [assembly: AssemblyCopyright("Copyright ©2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.2.0.1")]
-[assembly: AssemblyFileVersion("0.2.0.1")]
+[assembly: AssemblyVersion("0.2.1.0")]
+[assembly: AssemblyFileVersion("0.2.1.0")]
diff --git a/src/RemoteEventManager.cs b/src/RemoteEventManager.cs
index e64c5b7..affa990 100644
--- a/src/RemoteEventManager.cs
+++ b/src/RemoteEventManager.cs
@@ -52,7 +52,8 @@ internal enum Commands
             MoveSpotlightUp,
             MoveSpotlightDown,
             MoveSpotlightLeft,
-            MoveSpotlightRight
+            MoveSpotlightRight,
+            ToggleInd
         }
         internal enum MessageTypes
         {
@@ -67,7 +68,7 @@ internal enum MessageTypes
         internal static void SendEvent(Commands type, Vehicle vehicle, bool state, int playerID)
         {
             CitizenFX.Core.Debug.WriteLine($"sendding data for netID {vehicle.GetNetworkId()}");
-            Manager.VehicleManager.SyncRequestReply(vehicle.GetNetworkId(),playerID);
+            Manager.VehicleManager.SyncRequestReply(type, vehicle.GetNetworkId(),playerID);
 
             //var netId = Function.Call<int>(Hash.VEH_TO_NET, vehicle.Handle);
             //var ped = vehicle.GetPedOnSeat(VehicleSeat.Driver);
diff --git a/src/Siren/MainSiren/MainSiren.FullSync.cs b/src/Siren/MainSiren/MainSiren.FullSync.cs
index 0135909..97b1cc2 100644
--- a/src/Siren/MainSiren/MainSiren.FullSync.cs
+++ b/src/Siren/MainSiren/MainSiren.FullSync.cs
@@ -6,7 +6,7 @@ namespace ELS.Siren
 {
     partial class Siren
     {
-        private partial class MainSiren
+        internal partial class MainSiren
         {
 
 
diff --git a/src/Siren/MainSiren/MainSiren.cs b/src/Siren/MainSiren/MainSiren.cs
index 45564cc..f581991 100644
--- a/src/Siren/MainSiren/MainSiren.cs
+++ b/src/Siren/MainSiren/MainSiren.cs
@@ -2,12 +2,13 @@
 using System;
 using System.Collections.Generic;
 using ELS.FullSync;
+using ELS.NUI;
 
 namespace ELS.Siren
 {
     partial class Siren : IManagerEntry
     {
-        private partial class MainSiren : IFullSyncComponent
+        internal partial class MainSiren : IFullSyncComponent
         {
             internal bool _enable { get; private set; }
             internal bool interupted = false;
@@ -30,10 +31,18 @@ internal void SetEnable(bool enable)
                 if (_enable) //turning the main siren on
                 {
                     currentTone.SetState(true);
+                    if (Game.PlayerPed.IsSittingInELSVehicle())
+                    {
+                        ElsUiPanel.ToggleUiBtnState(_enable, "SRN");
+                    }
                 }
                 else
                 {
                     currentTone.SetState(false);
+                    if (Game.PlayerPed.IsSittingInELSVehicle())
+                    {
+                        ElsUiPanel.ToggleUiBtnState(_enable, "SRN");
+                    }
                 }
             }
 
diff --git a/src/Siren/Siren/Controls/Siren.Controls.KB.cs b/src/Siren/Siren/Controls/Siren.Controls.KB.cs
index 97d6896..8c67455 100644
--- a/src/Siren/Siren/Controls/Siren.Controls.KB.cs
+++ b/src/Siren/Siren/Controls/Siren.Controls.KB.cs
@@ -15,7 +15,6 @@ void AirHornControlsKB()
             {
 #if !REMOTETEST
                 AirHornLogic(true, true);
-                //Vehicles.MoveTraffic().Start();
 #endif
                 RemoteEventManager.SendEvent(RemoteEventManager.Commands.AirHorn, _vehicle, true, Game.Player.ServerId);
 
@@ -25,6 +24,7 @@ void AirHornControlsKB()
                 || (Game.IsControlJustReleased(2, Control.SpecialAbility) && Game.CurrentInputMode == InputMode.GamePad && Global.AllowController))
             {
 #if !REMOTETEST
+                int[] patts = { _patternController.CurrentPrmPattern, _patternController.CurrentSecPattern, _patternController.CurrentWrnPattern };
                 AirHornLogic(false, true);
 #endif
                 RemoteEventManager.SendEvent(RemoteEventManager.Commands.AirHorn, _vehicle, false, Game.Player.ServerId);
@@ -109,7 +109,7 @@ void DualSirenControlsKB()
 #endif
                 System.Collections.Generic.Dictionary<String, object> dic = new System.Collections.Generic.Dictionary<string, object>();
                // Manager.VehicleManager.SyncRequestReply(_vehicle.GetNetworkId());
-                //RemoteEventManager.SendEvent(RemoteEventManager.Commands.DualSiren, _vehicle, true, Game.Player.ServerId);
+                RemoteEventManager.SendEvent(RemoteEventManager.Commands.DualSiren, _vehicle, true, Game.Player.ServerId);
             }
         }
         int pressedTime;
diff --git a/src/Siren/Siren/Siren.Logic.cs b/src/Siren/Siren/Siren.Logic.cs
index e9ae6dc..f12a5dc 100644
--- a/src/Siren/Siren/Siren.Logic.cs
+++ b/src/Siren/Siren/Siren.Logic.cs
@@ -4,11 +4,13 @@
 using Control = CitizenFX.Core.Control;
 using ELS.Light;
 using ELS.NUI;
+using ELS.TrafficControl;
 
 namespace ELS.Siren
 {
     partial class Siren : IManagerEntry
     {
+        int[] patts = { 0, 0, 0 };
         void AirHornLogic(bool pressed, bool disableControls = false)
         {
             if (disableControls)
@@ -18,8 +20,24 @@ void AirHornLogic(bool pressed, bool disableControls = false)
             }
             if (pressed)
             {
+                //Vehicles.MoveTraffic();
+                patts[0] = _patternController.CurrentPrmPattern;
+                patts[1] = _patternController.CurrentSecPattern;
+                patts[2] = _patternController.CurrentWrnPattern;
                 ElsUiPanel.ToggleUiBtnState(true, "HRN");
                 ElsUiPanel.SetUiDesc("AH", "HRN");
+                if (_vcf.PRML.ForcedPatterns.MainHorn.Enabled)
+                {
+                    _patternController.CurrentPrmPattern = _vcf.PRML.ForcedPatterns.MainHorn.IntPattern;
+                }
+                if (_vcf.SECL.ForcedPatterns.MainHorn.Enabled)
+                {
+                    _patternController.CurrentSecPattern = _vcf.SECL.ForcedPatterns.MainHorn.IntPattern;
+                }
+                if (_vcf.WRNL.ForcedPatterns.MainHorn.Enabled)
+                {
+                    _patternController.CurrentWrnPattern = _vcf.WRNL.ForcedPatterns.MainHorn.IntPattern;
+                }
                 if (_vcf.SOUNDS.MainHorn.InterruptsSiren)
                 {
                     if (_mainSiren._enable)
@@ -32,6 +50,18 @@ void AirHornLogic(bool pressed, bool disableControls = false)
             }
             if (!pressed)
             {
+                if (_vcf.PRML.ForcedPatterns.MainHorn.Enabled)
+                {
+                    _patternController.CurrentPrmPattern = patts[0];
+                }
+                if (_vcf.SECL.ForcedPatterns.MainHorn.Enabled)
+                {
+                    _patternController.CurrentSecPattern = patts[1];
+                }
+                if (_vcf.WRNL.ForcedPatterns.MainHorn.Enabled)
+                {
+                    _patternController.CurrentWrnPattern = patts[2];
+                }
                 ElsUiPanel.ToggleUiBtnState(false, "HRN");
                 _tones.horn.SetState(false);
                 if (_vcf.SOUNDS.MainHorn.InterruptsSiren &&
@@ -48,19 +78,35 @@ void SirenTone1Logic(bool pressed, bool disableControls = false)
         {
             if (disableControls) Game.DisableControlThisFrame(0, ElsConfiguration.KeyBindings.Snd_SrnTon1);
 
-            if (pressed)
+            if (pressed && _tones.tone1.AllowUse)
             {
                 if (_mainSiren._enable) //Is the MainSiren Active
                 {
                     if (_mainSiren.currentTone != _tones.tone1)
                     {
                         _mainSiren.setMainTone(_tones.tone1);
+                        if (_vcf.PRML.ForcedPatterns.SrnTone1.Enabled)
+                        {
+                            _patternController.CurrentPrmPattern = _vcf.PRML.ForcedPatterns.SrnTone1.IntPattern;
+                        }
+                        if (_vcf.SECL.ForcedPatterns.SrnTone1.Enabled)
+                        {
+                            _patternController.CurrentSecPattern = _vcf.SECL.ForcedPatterns.SrnTone1.IntPattern;
+                        }
+                        if (_vcf.WRNL.ForcedPatterns.SrnTone1.Enabled)
+                        {
+                            _patternController.CurrentWrnPattern = _vcf.WRNL.ForcedPatterns.SrnTone1.IntPattern;
+                        }
                     }
-                    else if (dual_siren && _tones.tone2._state || _tones.tone4._state || _tones.tone3._state)
+                    else if (_mainSiren._enable && dual_siren && _mainSiren.currentTone != _tones.tone1)
                     {
-                        _tones.tone1.SetState(!_tones.tone1._state);
+                        _tones.tone4.SetState(false);
+                        _tones.tone1.SetState(true);
+                        _tones.tone2.SetState(false);
+                        _tones.tone3.SetState(false);
                     }
                     ElsUiPanel.SetUiDesc(_mainSiren.currentTone.Type, "SRN");
+                    ElsUiPanel.PlayUiSound(true);
                 }
             }
 
@@ -69,7 +115,7 @@ void SirenTone2Logic(bool pressed, bool disableControls = false)
         {
             if (disableControls) Game.DisableControlThisFrame(0, ElsConfiguration.KeyBindings.Snd_SrnTon2);
 
-            if (pressed)
+            if (pressed && _tones.tone2.AllowUse)
             {
 
                 if (_mainSiren._enable)
@@ -77,52 +123,103 @@ void SirenTone2Logic(bool pressed, bool disableControls = false)
                     if (_mainSiren.currentTone != _tones.tone2)
                     {
                         _mainSiren.setMainTone(_tones.tone2);
+                        if (_vcf.PRML.ForcedPatterns.SrnTone2.Enabled)
+                        {
+                            _patternController.CurrentPrmPattern = _vcf.PRML.ForcedPatterns.SrnTone2.IntPattern;
+                        }
+                        if (_vcf.SECL.ForcedPatterns.SrnTone2.Enabled)
+                        {
+                            _patternController.CurrentSecPattern = _vcf.SECL.ForcedPatterns.SrnTone2.IntPattern;
+                        }
+                        if (_vcf.WRNL.ForcedPatterns.SrnTone2.Enabled)
+                        {
+                            _patternController.CurrentWrnPattern = _vcf.WRNL.ForcedPatterns.SrnTone2.IntPattern;
+                        }
                     }
-                    ElsUiPanel.SetUiDesc(_mainSiren.currentTone.Type, "SRN");
+                    
                 }
-                else if (dual_siren && _tones.tone1._state || _tones.tone4._state || _tones.tone3._state)
+                else if (_mainSiren._enable && dual_siren && _mainSiren.currentTone != _tones.tone2)
                 {
-                   _tones.tone2.SetState(!_tones.tone2._state);
+                    _tones.tone4.SetState(false);
+                    _tones.tone1.SetState(false);
+                    _tones.tone2.SetState(true);
+                    _tones.tone3.SetState(false);
                 }
+                ElsUiPanel.SetUiDesc(_mainSiren.currentTone.Type, "SRN");
+                ElsUiPanel.PlayUiSound(true);
             }
         }
         void SirenTone3Logic(bool pressed, bool disableControls = false)
         {
             if (disableControls) Game.DisableControlThisFrame(0, ElsConfiguration.KeyBindings.Snd_SrnTon3);
-            if (pressed)
+            if (pressed && _tones.tone3.AllowUse)
             {
                 if (_mainSiren._enable)
                 {
                     if (_mainSiren.currentTone != _tones.tone3)
                     {
                         _mainSiren.setMainTone(_tones.tone3);
+                        if (_vcf.PRML.ForcedPatterns.SrnTone3.Enabled)
+                        {
+                            _patternController.CurrentPrmPattern = _vcf.PRML.ForcedPatterns.SrnTone3.IntPattern;
+                        }
+                        if (_vcf.SECL.ForcedPatterns.SrnTone3.Enabled)
+                        {
+                            _patternController.CurrentSecPattern = _vcf.SECL.ForcedPatterns.SrnTone3.IntPattern;
+                        }
+                        if (_vcf.WRNL.ForcedPatterns.SrnTone3.Enabled)
+                        {
+                            _patternController.CurrentWrnPattern = _vcf.WRNL.ForcedPatterns.SrnTone3.IntPattern;
+                        }
                     }
                     ElsUiPanel.SetUiDesc(_mainSiren.currentTone.Type, "SRN");
                 }
-                else if (dual_siren && _tones.tone1._state || _tones.tone2._state || _tones.tone4._state)
+
+                if (_mainSiren._enable && dual_siren && _mainSiren.currentTone != _tones.tone3)
                 {
-                   _tones.tone3.SetState(!_tones.tone3._state);
+                    _tones.tone3.SetState(true);
+                    _tones.tone1.SetState(false);
+                    _tones.tone2.SetState(false);
+                    _tones.tone4.SetState(false);
                 }
             }
+            ElsUiPanel.PlayUiSound(true);
         }
         void SirenTone4Logic(bool pressed, bool disableControls = false)
         {
             if (disableControls) Game.DisableControlThisFrame(0, ElsConfiguration.KeyBindings.Snd_SrnTon4);
-            if (pressed)
+            if (pressed && _tones.tone4.AllowUse)
             {
                 if (_mainSiren._enable)
                 {
                     if (_mainSiren.currentTone != _tones.tone4)
                     {
                         _mainSiren.setMainTone(_tones.tone4);
+                        if (_vcf.PRML.ForcedPatterns.SrnTone4.Enabled)
+                        {
+                            _patternController.CurrentPrmPattern = _vcf.PRML.ForcedPatterns.SrnTone4.IntPattern;
+                        }
+                        if (_vcf.SECL.ForcedPatterns.SrnTone4.Enabled)
+                        {
+                            _patternController.CurrentSecPattern = _vcf.SECL.ForcedPatterns.SrnTone4.IntPattern;
+                        }
+                        if (_vcf.WRNL.ForcedPatterns.SrnTone4.Enabled)
+                        {
+                            _patternController.CurrentWrnPattern = _vcf.WRNL.ForcedPatterns.SrnTone4.IntPattern;
+                        }
                     }
                     ElsUiPanel.SetUiDesc(_mainSiren.currentTone.Type, "SRN");
                 }
-                else if(dual_siren && _tones.tone1._state || _tones.tone2._state || _tones.tone3._state)
+
+                if (_mainSiren._enable && dual_siren && _mainSiren.currentTone != _tones.tone4)
                 {
-                    _tones.tone4.SetState(!_tones.tone4._state);
+                    _tones.tone4.SetState(true);
+                    _tones.tone1.SetState(false);
+                    _tones.tone2.SetState(false);
+                    _tones.tone3.SetState(false);
                 }
             }
+            ElsUiPanel.PlayUiSound(true);
         }
 
         private void MainSirenToggleLogic(bool toggle, bool disableControls = false)
@@ -131,8 +228,8 @@ private void MainSirenToggleLogic(bool toggle, bool disableControls = false)
             if (toggle)
             {
                 _mainSiren.SetEnable(!_mainSiren._enable);
-                ElsUiPanel.ToggleUiBtnState(_mainSiren._enable, "SRN");
                 ElsUiPanel.SetUiDesc(_mainSiren.currentTone.Type, "SRN");
+                ElsUiPanel.PlayUiSound(_mainSiren._enable);
             }
         }
 
diff --git a/src/Siren/Siren/Siren.Loop.cs b/src/Siren/Siren/Siren.Loop.cs
index 259295d..9935db1 100644
--- a/src/Siren/Siren/Siren.Loop.cs
+++ b/src/Siren/Siren/Siren.Loop.cs
@@ -13,12 +13,7 @@ partial class Siren : IManagerEntry
     {
         public void Ticker()
         {
-           /*Game.DisableControlThisFrame(0, Control.VehicleHorn);
-            if (Game.IsDisabledControlJustReleased(0, Control.VehicleHorn))
-            {
-                _vehicle.IsSirenActive = !_vehicle.IsSirenActive;
-            }*/
-
+            Game.DisableControlThisFrame(0, Control.VehicleHorn);
             AirHornControlsKB();
             ManualTone1ControlsKB();
             ManualTone2ControlsKB();
diff --git a/src/Siren/Siren/Siren.cs b/src/Siren/Siren/Siren.cs
index e14161d..48655c1 100644
--- a/src/Siren/Siren/Siren.cs
+++ b/src/Siren/Siren/Siren.cs
@@ -8,6 +8,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using ELS.NUI;
+using ELS.Light;
 
 namespace ELS.Siren
 {
@@ -19,28 +20,27 @@ namespace ELS.Siren
     partial class Siren : IManagerEntry
     {
         private Vcfroot _vcf;
-        private bool dual_siren;
+        internal bool dual_siren;
         public Vehicle _vehicle { get; set; }
-        private MainSiren _mainSiren;
+        public MainSiren _mainSiren;
+        IPatterns _patternController;
         Tones _tones;
-        public Siren(Vehicle vehicle,Vcfroot vcfroot,[Optional]IDictionary<string,object> data)
+        public Siren(Vehicle vehicle,Vcfroot vcfroot,[Optional]IDictionary<string,object> data, IPatterns patt)
         {
             _vcf = vcfroot;
             _vehicle = vehicle;
-            
+            _patternController = patt;
             Function.Call(Hash.DISABLE_VEHICLE_IMPACT_EXPLOSION_ACTIVATION, _vehicle, true);
-#if DEBUG
-            CitizenFX.Core.Debug.WriteLine(_vehicle.DisplayName);
-#endif
+            Utils.DebugWriteLine(_vehicle.DisplayName);
 
             _tones = new Tones
             {
-                horn = new Tone(vcfroot.SOUNDS.MainHorn.AudioString, _vehicle, ToneType.Horn),
-                tone1 = new Tone(vcfroot.SOUNDS.SrnTone1.AudioString, _vehicle, ToneType.SrnTon1),
-                tone2 = new Tone(vcfroot.SOUNDS.SrnTone2.AudioString, _vehicle, ToneType.SrnTon2),
-                tone3 = new Tone(vcfroot.SOUNDS.SrnTone3.AudioString, _vehicle, ToneType.SrnTon3),
-                tone4 = new Tone(vcfroot.SOUNDS.SrnTone4.AudioString, _vehicle, ToneType.SrnTon4),
-                panicAlarm = new Tone(vcfroot.SOUNDS.PanicMde.AudioString, _vehicle, ToneType.SrnPnic)
+                horn = new Tone(vcfroot.SOUNDS.MainHorn.AudioString, _vehicle, ToneType.Horn, true),
+                tone1 = new Tone(vcfroot.SOUNDS.SrnTone1.AudioString, _vehicle, ToneType.SrnTon1,vcfroot.SOUNDS.SrnTone1.AllowUse),
+                tone2 = new Tone(vcfroot.SOUNDS.SrnTone2.AudioString, _vehicle, ToneType.SrnTon2, vcfroot.SOUNDS.SrnTone2.AllowUse),
+                tone3 = new Tone(vcfroot.SOUNDS.SrnTone3.AudioString, _vehicle, ToneType.SrnTon3, vcfroot.SOUNDS.SrnTone3.AllowUse),
+                tone4 = new Tone(vcfroot.SOUNDS.SrnTone4.AudioString, _vehicle, ToneType.SrnTon4, vcfroot.SOUNDS.SrnTone4.AllowUse),
+                panicAlarm = new Tone(vcfroot.SOUNDS.PanicMde.AudioString, _vehicle, ToneType.SrnPnic, vcfroot.SOUNDS.PanicMde.AllowUse)
             };
 
             dual_siren = false;
diff --git a/src/Siren/Tone/Tone.cs b/src/Siren/Tone/Tone.cs
index 46d5196..32f5d5b 100644
--- a/src/Siren/Tone/Tone.cs
+++ b/src/Siren/Tone/Tone.cs
@@ -26,12 +26,14 @@ class Tone
         private readonly ToneType _type;
         internal string Type;
         internal bool _state { private set;  get; }
-        internal Tone(string file, Entity entity,ToneType type, bool state =false)
+        internal bool AllowUse { get; set; }
+        internal Tone(string file, Entity entity,ToneType type,bool allow, bool state =false)
         {
             _entity = entity;
             _file = file;
             _type = type;
             SetState(state);
+            AllowUse = allow;
             switch(type)
             {
                 case ToneType.SrnTon1:
@@ -49,18 +51,19 @@ internal Tone(string file, Entity entity,ToneType type, bool state =false)
             }
         }
 
-        internal void SetState( bool state)
+        internal void SetState(bool state)
         {
-            _state = state;
-            if (_state)
-            {
-                if (!Audio.HasSoundFinished(soundId)) return;
-                Function.Call(Hash.PLAY_SOUND_FROM_ENTITY, soundId, (InputArgument)_file, (InputArgument)_entity.Handle, (InputArgument)0, (InputArgument)0, (InputArgument)0);
-            }
-            else
-            {
-                Audio.StopSound(soundId);
-            }
+            
+                _state = state;
+                if (_state && AllowUse)
+                {
+                    if (!Audio.HasSoundFinished(soundId)) return;
+                    Function.Call(Hash.PLAY_SOUND_FROM_ENTITY, soundId, (InputArgument)_file, (InputArgument)_entity.Handle, (InputArgument)0, (InputArgument)0, (InputArgument)0);
+                }
+                else
+                {
+                    Audio.StopSound(soundId);
+                }
         }
         
         internal void CleanUp()
diff --git a/src/TrafficControl/Vehicles.cs b/src/TrafficControl/Vehicles.cs
index 1bab8c0..bc40995 100644
--- a/src/TrafficControl/Vehicles.cs
+++ b/src/TrafficControl/Vehicles.cs
@@ -14,15 +14,10 @@ internal partial class Vehicles
         
         internal static async Task MoveTraffic()
         {
-            List<Ped> peds = GetNearestPeds(1f);
-            foreach (Ped ped in peds)
-            {
-                if (ped.Handle != Game.PlayerPed.Handle)
-                {
-                    API.TaskVehicleTempAction(ped.Handle,ped.CurrentVehicle.Handle,32, 0x64);
-                    Screen.ShowNotification("Move Bitch Get out the way");
-                }
-            }
+            int veh = API.GetClosestVehicle(Game.PlayerPed.CurrentVehicle.Position.X, Game.PlayerPed.CurrentVehicle.Position.Y, Game.PlayerPed.CurrentVehicle.Position.Z, 50f, 0, 70);
+            API.TaskVehicleTempAction(Ped.FromHandle(API.GetPedInVehicleSeat(veh,-1)).Handle,veh,32, 1000);
+            Screen.ShowNotification("Move Bitch Get out the way");
+
         }
 
         static bool doesEntityExistsAndIsNotNull(Entity entity)
@@ -37,13 +32,12 @@ static float getDistanceBetweenEntities(Entity entity1, Entity entity2)
             return API.GetDistanceBetweenCoords(entity1Coords.X, entity1Coords.Y, entity1Coords.Z, entity2Coords.X, entity2Coords.Y, entity2Coords.Z, true);
         }
 
-        static List<Ped> GetNearestPeds(float range)
+        static List<Ped> GetNearestVehicles(float range)
         {
-            //API.GetClosestVehicle()
+            
             int handle = 0;
             List<Ped> peds = new List<Ped>();
-            do
-            {
+            //API.isentityin
                 ELS.Delay(10);
                 if (handle == 0)
                 {
@@ -57,7 +51,6 @@ static List<Ped> GetNearestPeds(float range)
                 {
                     peds.Add(ped);
                 }
-            } while (peds.Count < 6);
             return peds;
         }
     }
diff --git a/src/Vehicle/ELSVehicle.cs b/src/Vehicle/ELSVehicle.cs
index 620fc34..78ab39a 100644
--- a/src/Vehicle/ELSVehicle.cs
+++ b/src/Vehicle/ELSVehicle.cs
@@ -16,11 +16,13 @@ public class ELSVehicle : PoolObject, FullSync.IFullSyncComponent
         private Light.Lights _light;
         private Vehicle _vehicle;
         private Vcfroot _vcf;
+        int lastdrivetime;
 
         public ELSVehicle(int handle, [Optional]IDictionary<string, object> data) : base(handle)
         {
             _vehicle = new Vehicle(handle);
             ModelLoaded();
+            lastdrivetime = Game.GameTime;
             API.SetVehRadioStation(_vehicle.Handle, "OFF");
             API.SetVehicleRadioEnabled(_vehicle.Handle, false);
             if (_vehicle.DisplayName == "CARNOTFOUND")
@@ -31,9 +33,9 @@ public ELSVehicle(int handle, [Optional]IDictionary<string, object> data) : base
             {
                 throw new Exception("ELSVehicle.cs:NetworkId is 0");
             }
-            else if (VCF.ELSVehicle.Exists(item => item.modelHash == _vehicle.Model))
+            else if (VCF.ELSVehicle.ContainsKey(_vehicle.Model))
             {
-                _vcf = VCF.ELSVehicle.Find(item => item.modelHash == _vehicle.Model).root;
+                _vcf = VCF.ELSVehicle[_vehicle.Model].root;
             }
             try
             {
@@ -44,8 +46,9 @@ public ELSVehicle(int handle, [Optional]IDictionary<string, object> data) : base
                 Utils.ReleaseWriteLine("ELSVehicle.cs:Repair Fix is not enabled on this client");
             }
             
-            _siren = new Siren.Siren(_vehicle, _vcf, (IDictionary<string, object>)data?["siren"]);
+            
             _light = new Light.Lights(_vehicle, _vcf, (IDictionary<string, object>)data?["light"]);
+            _siren = new Siren.Siren(_vehicle, _vcf, (IDictionary<string, object>)data?["siren"],_light);
 
             //_vehicle.SetExistOnAllMachines(true);
 #if DEBUG
@@ -75,13 +78,40 @@ internal void CleanUP()
 
         internal void RunTick()
         {
-            _siren.Ticker();
-            _light.Ticker();
+            if (_vehicle.IsDead || !_vehicle.Exists())
+            {
+                Delete();
+            }
+            else
+            {
+                _siren.Ticker();
+                _light.Ticker();
+                if (_siren._mainSiren._enable && _light._stage.CurrentStage != 3)
+                {
+                    _siren._mainSiren.SetEnable(false);
+                    RemoteEventManager.SendEvent(RemoteEventManager.Commands.MainSiren, _vehicle, true, Game.Player.ServerId);
+                }
+            }
+            if (_vehicle.GetPedOnSeat(VehicleSeat.Any).IsPlayer)
+            {
+                lastdrivetime = Game.GameTime;
+            }
+            if (Game.GameTime - lastdrivetime >= Global.DeleteInterval)
+            {
+                //Delete();
+            }
         }
         internal void RunExternalTick()
         {
-            _siren.ExternalTicker();
-            _light.ExternalTicker();
+            if (_vehicle.IsDead || !_vehicle.Exists())
+            {
+                Delete();
+            }
+            else
+            {
+                _siren.ExternalTicker();
+                _light.ExternalTicker();
+            }
         }
 
         internal Vector3 GetBonePosistion()
@@ -95,6 +125,8 @@ internal void SyncUi()
             _siren.SyncUi();
         }
 
+        internal int GetStage() => _light._stage.CurrentStage;
+
         public override bool Exists()
         {
             return CitizenFX.Core.Native.Function.Call<bool>(CitizenFX.Core.Native.Hash.DOES_ENTITY_EXIST, _vehicle);
@@ -104,12 +136,12 @@ public override void Delete()
         {
             try
             {
-                VehicleManager.vehicleList.RemoveAt(VehicleManager.vehicleList.IndexOf(VehicleManager.vehicleList.Find(v => v.GetNetworkId() == _vehicle.GetNetworkId())));
+                VehicleManager.vehicleList.Remove(_vehicle.GetNetworkId());
                 _light.CleanUP();
                 _siren.CleanUP();
                 _vehicle.SetExistOnAllMachines(false);
-                API.SetEntityAsMissionEntity(_vehicle.Handle, false, false);
-                _vehicle.MarkAsNoLongerNeeded();
+                //_vehicle.MarkAsNoLongerNeeded();
+                API.SetEntityAsMissionEntity(_vehicle.Handle, true, true);
                 _vehicle.Delete();
             }
             catch (Exception e)
@@ -140,7 +172,6 @@ public void SetData(IDictionary<string, object> data)
         {
             _siren.SetData((IDictionary<string, object>)data["siren"]);
             _light.SetData((IDictionary<string, object>)data["light"]);
-
         }
 
         public Dictionary<string, object> GetData()
diff --git a/src/__resource.lua b/src/__resource.lua
index 293de43..eedbdba 100644
--- a/src/__resource.lua
+++ b/src/__resource.lua
@@ -1,4 +1,4 @@
---[[
+ --[[
     ELS FiveM - A ELS implementation for FiveM
     Copyright (C) 2017  E.J. Bevenour
 
@@ -18,8 +18,6 @@
 resource_manifest_version '05cfa83c-a124-4cfa-a768-c24a5811d8f9'
 local NUIEnabled = true
 
--- XML Processing Requirements
-client_script 'System.Xml.net.dll'
 
 -- ELS-FiveM Requirements
 client_script 'SharpConfig.net.dll'
@@ -33,8 +31,6 @@ files({
 -- NUI Stuff
 if NUIEnabled then
 
-	--client_script 'NUI/api.lua'
-
 	ui_page('NUI/app/index.html')
 
 	files({
@@ -57,8 +53,3 @@ server_script 'els-server.net.dll'
 files({
 'ELS.ini',
 })
-
-
-server_exports {
-	'SpawnCar'
-}
\ No newline at end of file
diff --git a/src/configuration/ElsConfiguration.cs b/src/configuration/ElsConfiguration.cs
index 3760d81..ff43fb9 100644
--- a/src/configuration/ElsConfiguration.cs
+++ b/src/configuration/ElsConfiguration.cs
@@ -98,6 +98,15 @@ private void FileLoader_OnSettingsLoaded(SettingsType.Type type, string Data)
                 t = u["CONTROL"]["Toggle_BRD"].IntValue;
                 KeyBindings.ToggleBoard = (Control)t;
 
+                t = u["CONTROL"]["Toggle_LIND"].IntValue;
+                KeyBindings.ToggleLIND = (Control)t;
+
+                t = u["CONTROL"]["Toggle_RIND"].IntValue;
+                KeyBindings.ToggleRIND = (Control)t;
+
+                t = u["CONTROL"]["Toggle_HAZ"].IntValue;
+                KeyBindings.ToggleHAZ = (Control)t;
+
 
                 ControlsUpdated?.Invoke(KeyBindings);
                 Global.EnabeTrafficControl = u["GENERAL"]["ElsTrafCtrlOn"].BoolValue;
@@ -132,6 +141,9 @@ internal class ELSControls
             internal Control ChgPattSecL { get; set; }
             internal Control ChgPattWrnL { get; set; }
             internal Control ToggleLstg { get; set; }
+            internal Control ToggleLIND { get; set; }
+            internal Control ToggleRIND { get; set; }
+            internal Control ToggleHAZ { get; set; }
         }
 
         internal static bool isValidData(string data)
diff --git a/src/configuration/NanoXMLParser.cs b/src/configuration/NanoXMLParser.cs
new file mode 100644
index 0000000..3374afe
--- /dev/null
+++ b/src/configuration/NanoXMLParser.cs
@@ -0,0 +1,314 @@
+using System;
+using System.Collections.Generic;
+
+namespace ELS.configuration
+{
+  /// <summary>
+  /// Base class containing usefull features for all XML classes
+  /// </summary>
+  class NanoXMLBase
+  {
+    protected static bool IsSpace(char c)
+    {
+      return c == ' ' || c == '\t' || c == '\n' || c == '\r';
+    }
+
+    protected static void SkipSpaces(string str, ref int i)
+    {
+      while (i < str.Length)
+      {
+        if (!IsSpace(str[i]))
+        {
+          if (str[i] == '<' && i + 4 < str.Length && str[i + 1] == '!' && str[i + 2] == '-' && str[i + 3] == '-')
+          {
+            i += 4; // skip <!--
+
+            while (i + 2 < str.Length && !(str[i] == '-' && str[i + 1] == '-'))
+              i++;
+
+            i += 2; // skip --
+          }
+          else
+            break;
+        }
+
+        i++;
+      }
+    }
+
+    protected static string GetValue(string str, ref int i, char endChar, char endChar2, bool stopOnSpace)
+    {
+      int start = i;
+      while ((!stopOnSpace || !IsSpace(str[i])) && str[i] != endChar && str[i] != endChar2) i++;
+
+      return str.Substring(start, i - start);
+    }
+
+    protected static bool IsQuote(char c)
+    {
+      return c == '"' || c == '\'';
+    }
+
+    // returns name
+    protected static string ParseAttributes(string str, ref int i, List<NanoXMLAttribute> attributes, char endChar, char endChar2)
+    {
+      SkipSpaces(str, ref i);
+      string name = GetValue(str, ref i, endChar, endChar2, true);
+
+      SkipSpaces(str, ref i);
+
+      while (str[i] != endChar && str[i] != endChar2)
+      {
+        string attrName = GetValue(str, ref i, '=', '\0', true);
+
+        SkipSpaces(str, ref i);
+        i++; // skip '='
+        SkipSpaces(str, ref i);
+
+        char quote = str[i];
+        if (!IsQuote(quote))
+          throw new XMLParsingException("Unexpected token after " + attrName);
+
+        i++; // skip quote
+        string attrValue = GetValue(str, ref i, quote, '\0', false);
+        i++; // skip quote
+
+        attributes.Add(new NanoXMLAttribute(attrName, attrValue));
+
+        SkipSpaces(str, ref i);
+      }
+
+      return name;
+    }
+  }
+
+  /// <summary>
+  /// Class representing whole DOM XML document
+  /// </summary>
+  class NanoXMLDocument: NanoXMLBase
+  {
+    private NanoXMLNode rootNode;
+    private List<NanoXMLAttribute> declarations = new List<NanoXMLAttribute>();
+    /// <summary>
+    /// Public constructor. Loads xml document from raw string
+    /// </summary>
+    /// <param name="xmlString">String with xml</param>
+    public NanoXMLDocument(string xmlString)
+    {
+      int i = 0;
+
+      while (true)
+      {
+        SkipSpaces(xmlString, ref i);
+
+        if (xmlString[i] != '<')
+          throw new XMLParsingException("Unexpected token");
+
+        i++; // skip <
+
+        if (xmlString[i] == '?') // declaration
+        {
+          i++; // skip ?
+          ParseAttributes(xmlString, ref i, declarations, '?', '>');
+          i++; // skip ending ?
+          i++; // skip ending >
+
+          continue;
+        }
+
+        if (xmlString[i] == '!') // doctype
+        {
+          while (xmlString[i] != '>') // skip doctype
+            i++;
+
+          i++; // skip >
+
+          continue;
+        }
+
+        rootNode = new NanoXMLNode(xmlString, ref i);
+        break;
+      }
+    }
+    /// <summary>
+    /// Root document element
+    /// </summary>
+    public NanoXMLNode RootNode
+    {
+      get { return rootNode; }
+    }
+    /// <summary>
+    /// List of XML Declarations as <see cref="NanoXMLAttribute"/>
+    /// </summary>
+    public IEnumerable<NanoXMLAttribute> Declarations
+    {
+      get { return declarations; }
+    }
+  }
+
+  /// <summary>
+  /// Element node of document
+  /// </summary>
+  class NanoXMLNode: NanoXMLBase
+  {
+    private string value;
+    private string name;
+
+    private List<NanoXMLNode> subNodes = new List<NanoXMLNode>();
+    private List<NanoXMLAttribute> attributes = new List<NanoXMLAttribute>();
+
+    internal NanoXMLNode(string str, ref int i)
+    {
+      name = ParseAttributes(str, ref i, attributes, '>', '/');
+
+      if (str[i] == '/') // if this node has nothing inside
+      {
+        i++; // skip /
+        i++; // skip >
+        return; 
+      }
+
+      i++; // skip >
+
+      // temporary. to include all whitespaces into value, if any
+      int tempI = i;
+
+      SkipSpaces(str, ref tempI);
+
+      if (str[tempI] == '<')
+      {
+        i = tempI;
+
+        while (str[i + 1] != '/') // parse subnodes
+        {
+          i++; // skip <
+          subNodes.Add(new NanoXMLNode(str, ref i));
+
+          SkipSpaces(str, ref i);
+
+          if (i >= str.Length)
+            return; // EOF
+
+          if (str[i] != '<')
+            throw new XMLParsingException("Unexpected token");
+        }
+
+        i++; // skip <
+      }
+      else // parse value
+      {
+        value = GetValue(str, ref i, '<', '\0', false);
+        i++; // skip <
+
+        if (str[i] != '/')
+          throw new XMLParsingException("Invalid ending on tag " + name);
+      }
+
+      i++; // skip /
+      SkipSpaces(str, ref i);
+
+      string endName = GetValue(str, ref i, '>', '\0', true);
+      if (endName != name)
+        throw new XMLParsingException("Start/end tag name mismatch: " + name + " and " + endName);
+      SkipSpaces(str, ref i);
+
+      if (str[i] != '>')
+        throw new XMLParsingException("Invalid ending on tag " + name);
+
+      i++; // skip >
+    }
+    /// <summary>
+    /// Element value
+    /// </summary>
+    public string Value
+    {
+      get { return value; }
+    }
+    /// <summary>
+    /// Element name
+    /// </summary>
+    public string Name
+    {
+      get { return name; }
+    }
+    /// <summary>
+    /// List of subelements
+    /// </summary>
+    public IEnumerable<NanoXMLNode> SubNodes
+    {
+      get { return subNodes; }
+    }
+    /// <summary>
+    /// List of attributes
+    /// </summary>
+    public IEnumerable<NanoXMLAttribute> Attributes
+    {
+      get { return attributes; }
+    }
+    /// <summary>
+    /// Returns subelement by given name
+    /// </summary>
+    /// <param name="nodeName">Name of subelement to get</param>
+    /// <returns>First subelement with given name or NULL if no such element</returns>
+    public NanoXMLNode this[string nodeName]
+    {
+      get
+      {
+        foreach (NanoXMLNode nanoXmlNode in subNodes)
+          if (nanoXmlNode.name == nodeName)
+            return nanoXmlNode;
+
+        return null;
+      }
+    }
+    /// <summary>
+    /// Returns attribute by given name
+    /// </summary>
+    /// <param name="attributeName">Attribute name to get</param>
+    /// <returns><see cref="NanoXMLAttribute"/> with given name or null if no such attribute</returns>
+    public NanoXMLAttribute GetAttribute(string attributeName)
+    {
+      foreach (NanoXMLAttribute nanoXmlAttribute in attributes)
+        if (nanoXmlAttribute.Name == attributeName)
+          return nanoXmlAttribute;
+
+      return null;
+    }
+  }
+
+  /// <summary>
+  /// XML element attribute
+  /// </summary>
+  class NanoXMLAttribute
+  {
+    private string name;
+    private string value;
+    /// <summary>
+    /// Attribute name
+    /// </summary>
+    public string Name
+    {
+      get { return name; }
+    }
+    /// <summary>
+    /// Attribtue value
+    /// </summary>
+    public string Value
+    {
+      get { return value; }
+    }
+
+    internal NanoXMLAttribute(string name, string value)
+    {
+      this.name = name;
+      this.value = value;
+    }
+  }
+
+  class XMLParsingException: Exception
+  {
+    public XMLParsingException(string message) : base(message)
+    {
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/configuration/VCF.cs b/src/configuration/VCF.cs
index 7943c91..33460c3 100644
--- a/src/configuration/VCF.cs
+++ b/src/configuration/VCF.cs
@@ -19,7 +19,7 @@ You should have received a copy of the GNU Lesser General Public License
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using System.Xml.Serialization;
+//using System.Xml.Serialization;
 using CitizenFX.Core;
 
 namespace ELS.configuration
@@ -42,11 +42,21 @@ public VCFEntry(string fn, string res, Model hash, Vcfroot vcfroot)
 
     public class VCF
     {
-        internal static List<VCFEntry> ELSVehicle = new List<VCFEntry>();
+        internal static Dictionary<int, VCFEntry> ELSVehicle = new Dictionary<int, VCFEntry>();
         public VCF()
         {
         }
-        internal static void load(SettingsType.Type type, string name, string Data, string ResourceName)
+
+        internal static void ParseVcfs(List<dynamic> VcfData)
+        {
+            foreach(dynamic vcf in VcfData)
+            {
+                Utils.DebugWriteLine($"Currently adding {vcf.Item2} from {vcf.Item1}");
+                load(SettingsType.Type.VCF, vcf.Item2, vcf.Item3, vcf.Item1);
+            }
+        }
+
+        static void load(SettingsType.Type type, string name, string Data, string ResourceName)
         {
             var bytes = Encoding.UTF8.GetBytes(Data);
             if (bytes[0] == 0xEF && bytes[1] == 0xBB && bytes[2] == 0xBF)
@@ -60,8 +70,9 @@ internal static void load(SettingsType.Type type, string name, string Data, stri
             var data = new VCFEntry(Path.GetFileNameWithoutExtension(name), ResourceName, hash, new Vcfroot());
             if (type == SettingsType.Type.VCF)
             {
-                System.Xml.XmlDocument doc = new System.Xml.XmlDocument();
-                doc.LoadXml(Data);
+                //System.Xml.XmlDocument doc = new System.Xml.XmlDocument();
+                NanoXMLDocument doc = new NanoXMLDocument(Data);
+                // doc.LoadXml(Data);
                 bool res;
                 //data.filename = Path.GetFileNameWithoutExtension(name);
                 if (data.root == null)
@@ -69,18 +80,23 @@ internal static void load(SettingsType.Type type, string name, string Data, stri
                     CitizenFX.Core.Debug.WriteLine("Null issue");
                     return;
                 }
+                Dictionary<string, NanoXMLNode> subNodes = new Dictionary<string, NanoXMLNode>();
+                foreach (NanoXMLNode node in doc.RootNode.SubNodes)
+                {
+                    subNodes.Add(node.Name, node);
+                }
                 #region VCF Info
                 CitizenFX.Core.Debug.WriteLine($"Parsing VCF Info for vehicle {name}");
                 //VCF Description
-                if (doc["vcfroot"].Attributes["Description"] != null)
+                if (doc.RootNode.GetAttribute("Description") != null)
                 {
-                    data.root.Description = doc["vcfroot"].Attributes["Description"].Value;
+                    data.root.Description = doc.RootNode.GetAttribute("Description").Value;
                 }
 
                 //VCF Author
-                if (doc["vcfroot"].Attributes["Author"] != null)
+                if (doc.RootNode.GetAttribute("Author") != null)
                 {
-                    data.root.Author = doc["vcfroot"].Attributes["Author"].Value;
+                    data.root.Author = doc.RootNode.GetAttribute("Author").Value;
                 }
                 #endregion
                 #region Interface
@@ -89,10 +105,24 @@ internal static void load(SettingsType.Type type, string name, string Data, stri
 #endif
                 try
                 {
-                    data.root.INTERFACE.LstgActivationType = doc["vcfroot"]["INTERFACE"]["LstgActivationType"].InnerText;
-                    data.root.INTERFACE.DefaultSirenMode = doc["vcfroot"]["INTERFACE"]["DefaultSirenMode"].InnerText;
-                    data.root.INTERFACE.InfoPanelHeaderColor = doc["vcfroot"]["INTERFACE"]["InfoPanelHeaderColor"].InnerText;
-                    data.root.INTERFACE.InfoPanelButtonLightColor = doc["vcfroot"]["INTERFACE"]["InfoPanelButtonLightColor"].InnerText;
+                    foreach (NanoXMLNode n in subNodes["INTERFACE"].SubNodes)
+                    {
+                        switch (n.Name)
+                        {
+                            case "LstgActivationType":
+                                data.root.INTERFACE.LstgActivationType = n.Value;
+                                break;
+                            case "DefaultSirenMode":
+                                data.root.INTERFACE.DefaultSirenMode = n.Value;
+                                break;
+                            case "InfoPanelHeaderColor":
+                                data.root.INTERFACE.InfoPanelHeaderColor = n.Value;
+                                break;
+                            case "InfoPanelButtonLightColor":
+                                data.root.INTERFACE.InfoPanelButtonLightColor = n.Value;
+                                break;
+                        }
+                    }
                 }
                 catch (Exception e)
                 {
@@ -106,79 +136,112 @@ internal static void load(SettingsType.Type type, string name, string Data, stri
 #endif
                 try
                 {
-                    //Extra 01
-                    data.root.EOVERRIDE.Extra01.IsElsControlled = bool.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra01"].Attributes["IsElsControlled"].Value);
-                    data.root.EOVERRIDE.Extra01.AllowEnvLight = bool.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra01"].Attributes["AllowEnvLight"].Value);
-                    data.root.EOVERRIDE.Extra01.Color = doc["vcfroot"]["EOVERRIDE"]["Extra01"].Attributes["Color"].Value;
-                    data.root.EOVERRIDE.Extra01.OffsetX = float.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra01"].Attributes["OffsetX"].Value);
-                    data.root.EOVERRIDE.Extra01.OffsetY = float.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra01"].Attributes["OffsetY"].Value);
-                    data.root.EOVERRIDE.Extra01.OffsetZ = float.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra01"].Attributes["OffsetZ"].Value);
-                    //Extra 02
-                    data.root.EOVERRIDE.Extra02.IsElsControlled = bool.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra02"].Attributes["IsElsControlled"].Value);
-                    data.root.EOVERRIDE.Extra02.AllowEnvLight = bool.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra02"].Attributes["AllowEnvLight"].Value);
-                    data.root.EOVERRIDE.Extra02.Color = doc["vcfroot"]["EOVERRIDE"]["Extra02"].Attributes["Color"].Value;
-                    data.root.EOVERRIDE.Extra02.OffsetX = float.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra02"].Attributes["OffsetX"].Value);
-                    data.root.EOVERRIDE.Extra02.OffsetY = float.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra02"].Attributes["OffsetY"].Value);
-                    data.root.EOVERRIDE.Extra02.OffsetZ = float.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra02"].Attributes["OffsetZ"].Value);
-                    //Extra 03
-                    data.root.EOVERRIDE.Extra03.IsElsControlled = bool.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra03"].Attributes["IsElsControlled"].Value);
-                    data.root.EOVERRIDE.Extra03.AllowEnvLight = bool.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra03"].Attributes["AllowEnvLight"].Value);
-                    data.root.EOVERRIDE.Extra03.Color = doc["vcfroot"]["EOVERRIDE"]["Extra03"].Attributes["Color"].Value;
-                    data.root.EOVERRIDE.Extra03.OffsetX = float.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra03"].Attributes["OffsetX"].Value);
-                    data.root.EOVERRIDE.Extra03.OffsetY = float.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra03"].Attributes["OffsetY"].Value);
-                    data.root.EOVERRIDE.Extra03.OffsetZ = float.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra03"].Attributes["OffsetZ"].Value);
-                    //Extra 04
-                    data.root.EOVERRIDE.Extra04.IsElsControlled = bool.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra04"].Attributes["IsElsControlled"].Value);
-                    data.root.EOVERRIDE.Extra04.AllowEnvLight = bool.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra04"].Attributes["AllowEnvLight"].Value);
-                    data.root.EOVERRIDE.Extra04.Color = doc["vcfroot"]["EOVERRIDE"]["Extra04"].Attributes["Color"].Value;
-                    data.root.EOVERRIDE.Extra04.OffsetX = float.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra04"].Attributes["OffsetX"].Value);
-                    data.root.EOVERRIDE.Extra04.OffsetY = float.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra04"].Attributes["OffsetY"].Value);
-                    data.root.EOVERRIDE.Extra04.OffsetZ = float.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra04"].Attributes["OffsetZ"].Value);
-                    //Extra 05
-                    data.root.EOVERRIDE.Extra05.IsElsControlled = bool.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra05"].Attributes["IsElsControlled"].Value);
-                    data.root.EOVERRIDE.Extra05.AllowEnvLight = bool.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra05"].Attributes["AllowEnvLight"].Value);
-                    data.root.EOVERRIDE.Extra05.Color = doc["vcfroot"]["EOVERRIDE"]["Extra05"].Attributes["Color"].Value;
-                    data.root.EOVERRIDE.Extra05.OffsetX = float.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra05"].Attributes["OffsetX"].Value);
-                    data.root.EOVERRIDE.Extra05.OffsetY = float.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra05"].Attributes["OffsetY"].Value);
-                    data.root.EOVERRIDE.Extra05.OffsetZ = float.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra05"].Attributes["OffsetZ"].Value);
-                    //Extra 06
-                    data.root.EOVERRIDE.Extra06.IsElsControlled = bool.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra06"].Attributes["IsElsControlled"].Value);
-                    data.root.EOVERRIDE.Extra06.AllowEnvLight = bool.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra06"].Attributes["AllowEnvLight"].Value);
-                    data.root.EOVERRIDE.Extra06.Color = doc["vcfroot"]["EOVERRIDE"]["Extra06"].Attributes["Color"].Value;
-                    data.root.EOVERRIDE.Extra06.OffsetX = float.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra06"].Attributes["OffsetX"].Value);
-                    data.root.EOVERRIDE.Extra06.OffsetY = float.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra06"].Attributes["OffsetY"].Value);
-                    data.root.EOVERRIDE.Extra06.OffsetZ = float.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra06"].Attributes["OffsetZ"].Value);
-                    //Extra 07
-                    data.root.EOVERRIDE.Extra07.IsElsControlled = bool.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra07"].Attributes["IsElsControlled"].Value);
-                    data.root.EOVERRIDE.Extra07.AllowEnvLight = bool.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra07"].Attributes["AllowEnvLight"].Value);
-                    data.root.EOVERRIDE.Extra07.Color = doc["vcfroot"]["EOVERRIDE"]["Extra07"].Attributes["Color"].Value;
-                    data.root.EOVERRIDE.Extra07.OffsetX = float.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra07"].Attributes["OffsetX"].Value);
-                    data.root.EOVERRIDE.Extra07.OffsetY = float.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra07"].Attributes["OffsetY"].Value);
-                    data.root.EOVERRIDE.Extra07.OffsetZ = float.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra07"].Attributes["OffsetZ"].Value);
-                    //Extra 08
-                    data.root.EOVERRIDE.Extra08.IsElsControlled = bool.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra08"].Attributes["IsElsControlled"].Value);
-                    data.root.EOVERRIDE.Extra08.AllowEnvLight = bool.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra08"].Attributes["AllowEnvLight"].Value);
-                    data.root.EOVERRIDE.Extra08.Color = doc["vcfroot"]["EOVERRIDE"]["Extra08"].Attributes["Color"].Value;
-                    data.root.EOVERRIDE.Extra08.OffsetX = float.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra08"].Attributes["OffsetX"].Value);
-                    data.root.EOVERRIDE.Extra08.OffsetY = float.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra08"].Attributes["OffsetY"].Value);
-                    data.root.EOVERRIDE.Extra08.OffsetZ = float.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra08"].Attributes["OffsetZ"].Value);
-                    //Extra 09
-                    data.root.EOVERRIDE.Extra09.IsElsControlled = bool.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra09"].Attributes["IsElsControlled"].Value);
-                    data.root.EOVERRIDE.Extra09.AllowEnvLight = bool.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra09"].Attributes["AllowEnvLight"].Value);
-                    data.root.EOVERRIDE.Extra09.Color = doc["vcfroot"]["EOVERRIDE"]["Extra09"].Attributes["Color"].Value;
-                    data.root.EOVERRIDE.Extra09.OffsetX = float.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra09"].Attributes["OffsetX"].Value);
-                    data.root.EOVERRIDE.Extra09.OffsetY = float.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra09"].Attributes["OffsetY"].Value);
-                    data.root.EOVERRIDE.Extra09.OffsetZ = float.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra09"].Attributes["OffsetZ"].Value);
-                    //Extra 10
-                    data.root.EOVERRIDE.Extra10.IsElsControlled = bool.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra10"].Attributes["IsElsControlled"].Value);
-                    //Extra 11
-                    data.root.EOVERRIDE.Extra11.IsElsControlled = bool.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra11"].Attributes["IsElsControlled"].Value);
-                    //Extra 12
-                    data.root.EOVERRIDE.Extra12.IsElsControlled = bool.Parse(doc["vcfroot"]["EOVERRIDE"]["Extra12"].Attributes["IsElsControlled"].Value);
+                    foreach (NanoXMLNode n in subNodes["EOVERRIDE"].SubNodes)
+                    {
+                        switch (n.Name)
+                        {
+                            case "Extra01":
+                                data.root.EOVERRIDE.Extra01.IsElsControlled = bool.Parse(n.GetAttribute("IsElsControlled").Value);
+                                data.root.EOVERRIDE.Extra01.AllowEnvLight = bool.Parse(n.GetAttribute("AllowEnvLight").Value);
+                                data.root.EOVERRIDE.Extra01.Color = n.GetAttribute("Color").Value;
+                                data.root.EOVERRIDE.Extra01.OffsetX = float.Parse(n.GetAttribute("OffsetX").Value);
+                                data.root.EOVERRIDE.Extra01.OffsetY = float.Parse(n.GetAttribute("OffsetY").Value);
+                                data.root.EOVERRIDE.Extra01.OffsetZ = float.Parse(n.GetAttribute("OffsetZ").Value);
+                                break;
+                            case "Extra02":
+                                data.root.EOVERRIDE.Extra02.IsElsControlled = bool.Parse(n.GetAttribute("IsElsControlled").Value);
+                                data.root.EOVERRIDE.Extra02.AllowEnvLight = bool.Parse(n.GetAttribute("AllowEnvLight").Value);
+                                data.root.EOVERRIDE.Extra02.Color = n.GetAttribute("Color").Value;
+                                data.root.EOVERRIDE.Extra02.OffsetX = float.Parse(n.GetAttribute("OffsetX").Value);
+                                data.root.EOVERRIDE.Extra02.OffsetY = float.Parse(n.GetAttribute("OffsetY").Value);
+                                data.root.EOVERRIDE.Extra02.OffsetZ = float.Parse(n.GetAttribute("OffsetZ").Value);
+                                break;
+                            case "Extra03":
+                                data.root.EOVERRIDE.Extra03.IsElsControlled = bool.Parse(n.GetAttribute("IsElsControlled").Value);
+                                data.root.EOVERRIDE.Extra03.AllowEnvLight = bool.Parse(n.GetAttribute("AllowEnvLight").Value);
+                                data.root.EOVERRIDE.Extra03.Color = n.GetAttribute("Color").Value;
+                                data.root.EOVERRIDE.Extra03.OffsetX = float.Parse(n.GetAttribute("OffsetX").Value);
+                                data.root.EOVERRIDE.Extra03.OffsetY = float.Parse(n.GetAttribute("OffsetY").Value);
+                                data.root.EOVERRIDE.Extra03.OffsetZ = float.Parse(n.GetAttribute("OffsetZ").Value);
+                                break;
+                            case "Extra04":
+                                data.root.EOVERRIDE.Extra04.IsElsControlled = bool.Parse(n.GetAttribute("IsElsControlled").Value);
+                                data.root.EOVERRIDE.Extra04.AllowEnvLight = bool.Parse(n.GetAttribute("AllowEnvLight").Value);
+                                data.root.EOVERRIDE.Extra04.Color = n.GetAttribute("Color").Value;
+                                data.root.EOVERRIDE.Extra04.OffsetX = float.Parse(n.GetAttribute("OffsetX").Value);
+                                data.root.EOVERRIDE.Extra04.OffsetY = float.Parse(n.GetAttribute("OffsetY").Value);
+                                data.root.EOVERRIDE.Extra04.OffsetZ = float.Parse(n.GetAttribute("OffsetZ").Value);
+                                break;
+                            case "Extra05":
+                                data.root.EOVERRIDE.Extra05.IsElsControlled = bool.Parse(n.GetAttribute("IsElsControlled").Value);
+                                data.root.EOVERRIDE.Extra05.AllowEnvLight = bool.Parse(n.GetAttribute("AllowEnvLight").Value);
+                                data.root.EOVERRIDE.Extra05.Color = n.GetAttribute("Color").Value;
+                                data.root.EOVERRIDE.Extra05.OffsetX = float.Parse(n.GetAttribute("OffsetX").Value);
+                                data.root.EOVERRIDE.Extra05.OffsetY = float.Parse(n.GetAttribute("OffsetY").Value);
+                                data.root.EOVERRIDE.Extra05.OffsetZ = float.Parse(n.GetAttribute("OffsetZ").Value);
+                                break;
+                            case "Extra06":
+                                data.root.EOVERRIDE.Extra06.IsElsControlled = bool.Parse(n.GetAttribute("IsElsControlled").Value);
+                                data.root.EOVERRIDE.Extra06.AllowEnvLight = bool.Parse(n.GetAttribute("AllowEnvLight").Value);
+                                data.root.EOVERRIDE.Extra06.Color = n.GetAttribute("Color").Value;
+                                data.root.EOVERRIDE.Extra06.OffsetX = float.Parse(n.GetAttribute("OffsetX").Value);
+                                data.root.EOVERRIDE.Extra06.OffsetY = float.Parse(n.GetAttribute("OffsetY").Value);
+                                data.root.EOVERRIDE.Extra06.OffsetZ = float.Parse(n.GetAttribute("OffsetZ").Value);
+                                break;
+                            case "Extra07":
+                                data.root.EOVERRIDE.Extra07.IsElsControlled = bool.Parse(n.GetAttribute("IsElsControlled").Value);
+                                data.root.EOVERRIDE.Extra07.AllowEnvLight = bool.Parse(n.GetAttribute("AllowEnvLight").Value);
+                                data.root.EOVERRIDE.Extra07.Color = n.GetAttribute("Color").Value;
+                                data.root.EOVERRIDE.Extra07.OffsetX = float.Parse(n.GetAttribute("OffsetX").Value);
+                                data.root.EOVERRIDE.Extra07.OffsetY = float.Parse(n.GetAttribute("OffsetY").Value);
+                                data.root.EOVERRIDE.Extra07.OffsetZ = float.Parse(n.GetAttribute("OffsetZ").Value);
+                                break;
+                            case "Extra08":
+                                data.root.EOVERRIDE.Extra08.IsElsControlled = bool.Parse(n.GetAttribute("IsElsControlled").Value);
+                                data.root.EOVERRIDE.Extra08.AllowEnvLight = bool.Parse(n.GetAttribute("AllowEnvLight").Value);
+                                data.root.EOVERRIDE.Extra08.Color = n.GetAttribute("Color").Value;
+                                data.root.EOVERRIDE.Extra08.OffsetX = float.Parse(n.GetAttribute("OffsetX").Value);
+                                data.root.EOVERRIDE.Extra08.OffsetY = float.Parse(n.GetAttribute("OffsetY").Value);
+                                data.root.EOVERRIDE.Extra08.OffsetZ = float.Parse(n.GetAttribute("OffsetZ").Value);
+                                break;
+                            case "Extra09":
+                                data.root.EOVERRIDE.Extra09.IsElsControlled = bool.Parse(n.GetAttribute("IsElsControlled").Value);
+                                data.root.EOVERRIDE.Extra09.AllowEnvLight = bool.Parse(n.GetAttribute("AllowEnvLight").Value);
+                                data.root.EOVERRIDE.Extra09.Color = n.GetAttribute("Color").Value;
+                                data.root.EOVERRIDE.Extra09.OffsetX = float.Parse(n.GetAttribute("OffsetX").Value);
+                                data.root.EOVERRIDE.Extra09.OffsetY = float.Parse(n.GetAttribute("OffsetY").Value);
+                                data.root.EOVERRIDE.Extra09.OffsetZ = float.Parse(n.GetAttribute("OffsetZ").Value);
+                                break;
+                            case "Extra10":
+                                data.root.EOVERRIDE.Extra10.IsElsControlled = bool.Parse(n.GetAttribute("IsElsControlled").Value);
+                                //data.root.EOVERRIDE.Extra10.AllowEnvLight = bool.Parse(n.GetAttribute("AllowEnvLight").Value);
+                                //data.root.EOVERRIDE.Extra10.Color = n.GetAttribute("Color").Value;
+                                //data.root.EOVERRIDE.Extra10.OffsetX = float.Parse(n.GetAttribute("OffsetX").Value);
+                                //data.root.EOVERRIDE.Extra10.OffsetY = float.Parse(n.GetAttribute("OffsetY").Value);
+                                //data.root.EOVERRIDE.Extra10.OffsetZ = float.Parse(n.GetAttribute("OffsetZ").Value);
+                                break;
+                            case "Extra11":
+                                data.root.EOVERRIDE.Extra11.IsElsControlled = bool.Parse(n.GetAttribute("IsElsControlled").Value);
+                                //data.root.EOVERRIDE.Extra11.AllowEnvLight = bool.Parse(n.GetAttribute("AllowEnvLight").Value);
+                                //data.root.EOVERRIDE.Extra11.Color = n.GetAttribute("Color").Value; 
+                                //data.root.EOVERRIDE.Extra11.OffsetX = float.Parse(n.GetAttribute("OffsetX").Value);
+                                //data.root.EOVERRIDE.Extra11.OffsetY = float.Parse(n.GetAttribute("OffsetY").Value);
+                                //data.root.EOVERRIDE.Extra11.OffsetZ = float.Parse(n.GetAttribute("OffsetZ").Value);
+                                break;
+                            case "Extra12":
+                                data.root.EOVERRIDE.Extra12.IsElsControlled = bool.Parse(n.GetAttribute("IsElsControlled").Value);
+                                //data.root.EOVERRIDE.Extra12.AllowEnvLight = bool.Parse(n.GetAttribute("AllowEnvLight").Value);
+                                //data.root.EOVERRIDE.Extra12.Color = n.GetAttribute("Color").Value;
+                                //data.root.EOVERRIDE.Extra12.OffsetX = float.Parse(n.GetAttribute("OffsetX").Value);
+                                //data.root.EOVERRIDE.Extra12.OffsetY = float.Parse(n.GetAttribute("OffsetY").Value);
+                                //data.root.EOVERRIDE.Extra12.OffsetZ = float.Parse(n.GetAttribute("OffsetZ").Value);
+                                break;
+                        }
+                    }
                 }
                 catch (Exception e)
                 {
-                    Utils.ReleaseWriteLine($"EOveride for {name} failed to parse due to {e.Message} with inner of {e.InnerException}");
+                    Utils.ReleaseWriteLine($"EOverride for {name} failed to parse due to {e.Message} with inner of {e.InnerException}");
                 }
                 #endregion
 
@@ -188,14 +251,33 @@ internal static void load(SettingsType.Type type, string name, string Data, stri
 #endif
                 try
                 {
-                    data.root.MISC.VehicleIsSlicktop = bool.Parse(doc["vcfroot"]["MISC"]["VehicleIsSlicktop"].InnerText);
-                    data.root.MISC.ArrowboardType = doc["vcfroot"]["MISC"]["ArrowboardType"].InnerText;
-                    data.root.MISC.UseSteadyBurnLights = bool.Parse(doc["vcfroot"]["MISC"]["UseSteadyBurnLights"].InnerText);
-                    data.root.MISC.DfltSirenLtsActivateAtLstg = int.Parse(doc["vcfroot"]["MISC"]["DfltSirenLtsActivateAtLstg"].InnerText);
-                    data.root.MISC.Takedowns.AllowUse = bool.Parse(doc["vcfroot"]["MISC"]["Takedowns"].Attributes["AllowUse"].Value);
-                    data.root.MISC.Takedowns.Mirrored = bool.Parse(doc["vcfroot"]["MISC"]["Takedowns"].Attributes["Mirrored"].Value);
-                    data.root.MISC.SceneLights.AllowUse = bool.Parse(doc["vcfroot"]["MISC"]["SceneLights"].Attributes["AllowUse"].Value);
-                    data.root.MISC.SceneLights.IlluminateSidesOnly = bool.Parse(doc["vcfroot"]["MISC"]["SceneLights"].Attributes["IlluminateSidesOnly"].Value);
+                    foreach (NanoXMLNode n in subNodes["MISC"].SubNodes)
+                    {
+                        switch (n.Name)
+                        {
+                            case "VehicleIsSlicktop":
+                                data.root.MISC.VehicleIsSlicktop = bool.Parse(n.Value);
+                                break;
+                            case "ArrowboardType":
+                                data.root.MISC.ArrowboardType = n.Value;
+                                break;
+                            case "UseSteadyBurnLights":
+                                data.root.MISC.UseSteadyBurnLights = bool.Parse(n.Value);
+                                break;
+                            case "DfltSirenLtsActivateAtLstg":
+                                data.root.MISC.DfltSirenLtsActivateAtLstg = int.Parse(n.Value);
+                                break;
+                            case "Takedowns":
+                                data.root.MISC.Takedowns.AllowUse = bool.Parse(n.GetAttribute("AllowUse").Value);
+                                data.root.MISC.Takedowns.Mirrored = bool.Parse(n.GetAttribute("Mirrored").Value);
+                                break;
+                            case "SceneLights":
+                                data.root.MISC.SceneLights.AllowUse = bool.Parse(n.GetAttribute("AllowUse").Value);
+                                data.root.MISC.SceneLights.IlluminateSidesOnly = bool.Parse(n.GetAttribute("IlluminateSidesOnly").Value);
+                                break;
+
+                        }
+                    }
                 }
                 catch (Exception e)
                 {
@@ -204,16 +286,25 @@ internal static void load(SettingsType.Type type, string name, string Data, stri
                 #endregion
 
                 #region Cruise
-#if DEBUG
-                CitizenFX.Core.Debug.WriteLine("Parsing Cruise");
-#endif
+                Utils.DebugWriteLine("Parsing Cruise");
                 try
                 {
-                    data.root.CRUISE.DisableAtLstg3 = bool.Parse(doc["vcfroot"]["CRUISE"]["DisableAtLstg3"].InnerText);
-                    data.root.CRUISE.UseExtras.Extra1 = bool.Parse(doc["vcfroot"]["CRUISE"]["UseExtras"].Attributes["Extra1"].Value);
-                    data.root.CRUISE.UseExtras.Extra2 = bool.Parse(doc["vcfroot"]["CRUISE"]["UseExtras"].Attributes["Extra2"].Value);
-                    data.root.CRUISE.UseExtras.Extra3 = bool.Parse(doc["vcfroot"]["CRUISE"]["UseExtras"].Attributes["Extra3"].Value);
-                    data.root.CRUISE.UseExtras.Extra4 = bool.Parse(doc["vcfroot"]["CRUISE"]["UseExtras"].Attributes["Extra4"].Value);
+                    foreach (NanoXMLNode n in subNodes["CRUISE"].SubNodes)
+                    {
+                        switch (n.Name)
+                        {
+                            case "DisableAtLstg3":
+                                data.root.CRUISE.DisableAtLstg3 = bool.Parse(n.Value);
+                                break;
+                            case "UseExtras":
+                                data.root.CRUISE.UseExtras.Extra1 = bool.Parse(n.GetAttribute("Extra1").Value);
+                                data.root.CRUISE.UseExtras.Extra2 = bool.Parse(n.GetAttribute("Extra2").Value);
+                                data.root.CRUISE.UseExtras.Extra3 = bool.Parse(n.GetAttribute("Extra3").Value);
+                                data.root.CRUISE.UseExtras.Extra4 = bool.Parse(n.GetAttribute("Extra4").Value);
+                                break;
+
+                        }
+                    }
                 }
                 catch (Exception e)
                 {
@@ -222,31 +313,40 @@ internal static void load(SettingsType.Type type, string name, string Data, stri
                 #endregion
 
                 #region Aux Coronas
-#if DEBUG
-                CitizenFX.Core.Debug.WriteLine("Parsing Aux Coronas");
-#endif
+                Utils.DebugWriteLine("Parsing Aux Coronas");
                 try
                 {
-                    //Headlights
-                    data.root.ACORONAS.Headlights.DfltPattern = int.Parse(doc["vcfroot"]["ACORONAS"]["Headlights"].Attributes["DfltPattern"].Value);
-                    data.root.ACORONAS.Headlights.ColorL = doc["vcfroot"]["ACORONAS"]["Headlights"].Attributes["ColorL"].Value;
-                    data.root.ACORONAS.Headlights.ColorR = doc["vcfroot"]["ACORONAS"]["Headlights"].Attributes["ColorR"].Value;
-                    //TailLights
-                    data.root.ACORONAS.TailLights.DfltPattern = int.Parse(doc["vcfroot"]["ACORONAS"]["TailLights"].Attributes["DfltPattern"].Value);
-                    data.root.ACORONAS.TailLights.ColorL = doc["vcfroot"]["ACORONAS"]["TailLights"].Attributes["ColorL"].Value;
-                    data.root.ACORONAS.TailLights.ColorR = doc["vcfroot"]["ACORONAS"]["TailLights"].Attributes["ColorR"].Value;
-                    //IndicatorsF
-                    data.root.ACORONAS.IndicatorsF.DfltPattern = int.Parse(doc["vcfroot"]["ACORONAS"]["IndicatorsF"].Attributes["DfltPattern"].Value);
-                    data.root.ACORONAS.IndicatorsF.ColorL = doc["vcfroot"]["ACORONAS"]["IndicatorsF"].Attributes["ColorL"].Value;
-                    data.root.ACORONAS.IndicatorsF.ColorR = doc["vcfroot"]["ACORONAS"]["IndicatorsF"].Attributes["ColorR"].Value;
-                    //IndicatorsB
-                    data.root.ACORONAS.IndicatorsB.DfltPattern = int.Parse(doc["vcfroot"]["ACORONAS"]["IndicatorsB"].Attributes["DfltPattern"].Value);
-                    data.root.ACORONAS.IndicatorsB.ColorL = doc["vcfroot"]["ACORONAS"]["IndicatorsB"].Attributes["ColorL"].Value;
-                    data.root.ACORONAS.IndicatorsB.ColorR = doc["vcfroot"]["ACORONAS"]["IndicatorsB"].Attributes["ColorR"].Value;
-                    //ReverseLights
-                    data.root.ACORONAS.ReverseLights.DfltPattern = int.Parse(doc["vcfroot"]["ACORONAS"]["ReverseLights"].Attributes["DfltPattern"].Value);
-                    data.root.ACORONAS.ReverseLights.ColorL = doc["vcfroot"]["ACORONAS"]["ReverseLights"].Attributes["ColorL"].Value;
-                    data.root.ACORONAS.ReverseLights.ColorR = doc["vcfroot"]["ACORONAS"]["ReverseLights"].Attributes["ColorR"].Value;
+                    foreach (NanoXMLNode n in subNodes["ACORONAS"].SubNodes)
+                    {
+                        switch (n.Name)
+                        {
+                            case "Headlights":
+                                data.root.ACORONAS.Headlights.DfltPattern = int.Parse(n.GetAttribute("DfltPattern").Value);
+                                data.root.ACORONAS.Headlights.ColorL = n.GetAttribute("ColorL").Value;
+                                data.root.ACORONAS.Headlights.ColorR = n.GetAttribute("ColorR").Value;
+                                break;
+                            case "TailLights":
+                                data.root.ACORONAS.TailLights.DfltPattern = int.Parse(n.GetAttribute("DfltPattern").Value);
+                                data.root.ACORONAS.TailLights.ColorL = n.GetAttribute("ColorL").Value;
+                                data.root.ACORONAS.TailLights.ColorR = n.GetAttribute("ColorR").Value;
+                                break;
+                            case "IndicatorsF":
+                                data.root.ACORONAS.IndicatorsF.DfltPattern = int.Parse(n.GetAttribute("DfltPattern").Value);
+                                data.root.ACORONAS.IndicatorsF.ColorL = n.GetAttribute("ColorL").Value;
+                                data.root.ACORONAS.IndicatorsF.ColorR = n.GetAttribute("ColorR").Value;
+                                break;
+                            case "IndicatorsB":
+                                data.root.ACORONAS.IndicatorsB.DfltPattern = int.Parse(n.GetAttribute("DfltPattern").Value);
+                                data.root.ACORONAS.IndicatorsB.ColorL = n.GetAttribute("ColorL").Value;
+                                data.root.ACORONAS.IndicatorsB.ColorR = n.GetAttribute("ColorR").Value;
+                                break;
+                            case "ReverseLights":
+                                data.root.ACORONAS.ReverseLights.DfltPattern = int.Parse(n.GetAttribute("DfltPattern").Value);
+                                data.root.ACORONAS.ReverseLights.ColorL = n.GetAttribute("ColorL").Value;
+                                data.root.ACORONAS.ReverseLights.ColorR = n.GetAttribute("ColorR").Value;
+                                break;
+                        }
+                    }
                 }
                 catch (Exception e)
                 {
@@ -255,38 +355,52 @@ internal static void load(SettingsType.Type type, string name, string Data, stri
                 #endregion
 
                 #region Sounds
-#if DEBUG
-                CitizenFX.Core.Debug.WriteLine("Parsing Sounds");
-#endif
+                Utils.DebugWriteLine("Parsing Sounds");
                 try
                 {
-                    //Manual Tone 1
-                    data.root.SOUNDS.ManTone1.AudioString = doc?["vcfroot"]["SOUNDS"]["ManTone1"].Attributes["AudioString"].Value;
-                    data.root.SOUNDS.ManTone1.AllowUse = bool.Parse(doc["vcfroot"]["SOUNDS"]["ManTone1"].Attributes["AllowUse"].Value);
-                    //Manual Tone 2
-                    data.root.SOUNDS.ManTone2.AudioString = doc["vcfroot"]["SOUNDS"]["ManTone2"].Attributes["AudioString"].Value;
-                    data.root.SOUNDS.ManTone2.AllowUse = bool.Parse(doc["vcfroot"]["SOUNDS"]["ManTone2"].Attributes["AllowUse"].Value);
-                    //Main Horn
-                    data.root.SOUNDS.MainHorn.AudioString = doc["vcfroot"]["SOUNDS"]["MainHorn"].Attributes["AudioString"].Value;
-                    data.root.SOUNDS.MainHorn.InterruptsSiren = bool.Parse(doc["vcfroot"]["SOUNDS"]["MainHorn"].Attributes["InterruptsSiren"].Value);
-                    //Siren Tone 1
-                    data.root.SOUNDS.SrnTone1.AudioString = doc["vcfroot"]["SOUNDS"]["SrnTone1"].Attributes["AudioString"].Value;
-                    data.root.SOUNDS.SrnTone1.AllowUse = bool.Parse(doc["vcfroot"]["SOUNDS"]["SrnTone1"].Attributes["AllowUse"].Value);
-                    //Siren Tone 2
-                    data.root.SOUNDS.SrnTone2.AudioString = doc["vcfroot"]["SOUNDS"]["SrnTone2"].Attributes["AudioString"].Value;
-                    data.root.SOUNDS.SrnTone2.AllowUse = bool.Parse(doc["vcfroot"]["SOUNDS"]["SrnTone2"].Attributes["AllowUse"].Value);
-                    //Siren Tone 3
-                    data.root.SOUNDS.SrnTone3.AudioString = doc["vcfroot"]["SOUNDS"]["SrnTone3"].Attributes["AudioString"].Value;
-                    data.root.SOUNDS.SrnTone3.AllowUse = bool.Parse(doc["vcfroot"]["SOUNDS"]["SrnTone3"].Attributes["AllowUse"].Value);
-                    //Siren Tone 4
-                    data.root.SOUNDS.SrnTone4.AudioString = doc["vcfroot"]["SOUNDS"]["SrnTone4"].Attributes["AudioString"].Value;
-                    data.root.SOUNDS.SrnTone4.AllowUse = bool.Parse(doc["vcfroot"]["SOUNDS"]["SrnTone4"].Attributes["AllowUse"].Value);
-                    //Aux Siren Tone
-                    data.root.SOUNDS.AuxSiren.AllowUse = bool.Parse(doc["vcfroot"]["SOUNDS"]["AuxSiren"].Attributes["AllowUse"].Value);
-                    data.root.SOUNDS.AuxSiren.AudioString = doc["vcfroot"]["SOUNDS"]["AuxSiren"].Attributes["AudioString"].Value;
-                    //Panic Mode Tone
-                    data.root.SOUNDS.PanicMde.AllowUse = bool.Parse(doc["vcfroot"]["SOUNDS"]["PanicMde"].Attributes["AllowUse"].Value);
-                    data.root.SOUNDS.PanicMde.AudioString = doc["vcfroot"]["SOUNDS"]["PanicMde"].Attributes["AudioString"].Value;
+                    foreach (NanoXMLNode n in subNodes["SOUNDS"].SubNodes)
+                    {
+                        switch (n.Name)
+                        {
+                            case "ManTone1":
+                                data.root.SOUNDS.ManTone1.AudioString = n.GetAttribute("AudioString").Value;
+                                data.root.SOUNDS.ManTone1.AllowUse = bool.Parse(n.GetAttribute("AllowUse").Value);
+                                break;
+                            case "ManTone2":
+                                data.root.SOUNDS.ManTone2.AudioString = n.GetAttribute("AudioString").Value;
+                                data.root.SOUNDS.ManTone2.AllowUse = bool.Parse(n.GetAttribute("AllowUse").Value);
+                                break;
+                            case "MainHorn":
+                                data.root.SOUNDS.MainHorn.AudioString = n.GetAttribute("AudioString").Value;
+                                data.root.SOUNDS.MainHorn.InterruptsSiren = bool.Parse(n.GetAttribute("InterruptsSiren").Value);
+                                break;
+                            case "SrnTone1":
+                                data.root.SOUNDS.SrnTone1.AudioString = n.GetAttribute("AudioString").Value;
+                                data.root.SOUNDS.SrnTone1.AllowUse = bool.Parse(n.GetAttribute("AllowUse").Value);
+                                break;
+                            case "SrnTone2":
+                                data.root.SOUNDS.SrnTone2.AudioString = n.GetAttribute("AudioString").Value;
+                                data.root.SOUNDS.SrnTone2.AllowUse = bool.Parse(n.GetAttribute("AllowUse").Value);
+                                break;
+                            case "SrnTone3":
+                                data.root.SOUNDS.SrnTone3.AudioString = n.GetAttribute("AudioString").Value;
+                                data.root.SOUNDS.SrnTone3.AllowUse = bool.Parse(n.GetAttribute("AllowUse").Value);
+                                break;
+                            case "SrnTone4":
+                                data.root.SOUNDS.SrnTone4.AudioString = n.GetAttribute("AudioString").Value;
+                                data.root.SOUNDS.SrnTone4.AllowUse = bool.Parse(n.GetAttribute("AllowUse").Value);
+                                break;
+                            case "AuxSiren":
+                                data.root.SOUNDS.AuxSiren.AllowUse = bool.Parse(n.GetAttribute("AllowUse").Value);
+                                data.root.SOUNDS.AuxSiren.AudioString = n.GetAttribute("AudioString").Value;
+                                break;
+                            case "PanicMde":
+                                data.root.SOUNDS.PanicMde.AllowUse = bool.Parse(n.GetAttribute("AllowUse").Value);
+                                data.root.SOUNDS.PanicMde.AudioString = n.GetAttribute("AudioString").Value;
+                                break;
+
+                        }
+                    }
                 }
                 catch (Exception e)
                 {
@@ -295,60 +409,138 @@ internal static void load(SettingsType.Type type, string name, string Data, stri
                 #endregion
 
                 #region Warning Lights
-#if DEBUG
-                CitizenFX.Core.Debug.WriteLine("Parsing Warning Lights");
-#endif
+
+                Utils.DebugWriteLine("Parsing Warning Lights");
                 try
                 {
-                    data.root.WRNL.LightingFormat = doc["vcfroot"]["WRNL"].Attributes["LightingFormat"].Value;
-                    if (doc["vcfroot"]["WRNL"].Attributes["DisableAtLstg3"] != null)
-                    {
-                        data.root.WRNL.DisableAtLstg3 = bool.Parse(doc["vcfroot"]["WRNL"].Attributes["DisableAtLstg3"]?.Value);
-                    }
-                    data.root.WRNL.ExtrasActiveAtLstg1 = doc["vcfroot"]["WRNL"].Attributes["ExtrasActiveAtLstg1"]?.Value;
-                    data.root.WRNL.ExtrasActiveAtLstg2 = doc["vcfroot"]["WRNL"].Attributes["ExtrasActiveAtLstg2"]?.Value;
-                    data.root.WRNL.ExtrasActiveAtLstg3 = doc["vcfroot"]["WRNL"].Attributes["ExtrasActiveAtLstg3"]?.Value;
-                    //Preset Patterns
-                    bool preset = false;
-                    if (doc["vcfroot"]["WRNL"]["PresetPatterns"]["Lstg1"]?.Attributes["Enabled"].Value != null)
-                    {
-                        data.root.WRNL.PresetPatterns.Lstg1.Enabled = bool.Parse(doc["vcfroot"]["WRNL"]["PresetPatterns"]["Lstg1"]?.Attributes["Enabled"].Value);
-                    }
-                    data.root.WRNL.PresetPatterns.Lstg1.Pattern = doc["vcfroot"]["WRNL"]["PresetPatterns"]["Lstg1"]?.Attributes["Pattern"].Value;
-                    if (doc["vcfroot"]["WRNL"]["PresetPatterns"]["Lstg2"]?.Attributes["Enabled"].Value != null)
+                    data.root.WRNL.LightingFormat = subNodes["WRNL"].GetAttribute("LightingFormat").Value;
+                    if (subNodes["WRNL"].GetAttribute("DisableAtLstg3") != null)
                     {
-                        data.root.WRNL.PresetPatterns.Lstg2.Enabled = bool.Parse(doc["vcfroot"]["WRNL"]["PresetPatterns"]["Lstg2"]?.Attributes["Enabled"].Value);
+                        data.root.WRNL.DisableAtLstg3 = bool.Parse(subNodes["WRNL"].GetAttribute("DisableAtLstg3").Value);
                     }
-                    data.root.WRNL.PresetPatterns.Lstg2.Pattern = doc["vcfroot"]["WRNL"]["PresetPatterns"]["Lstg2"]?.Attributes["Pattern"].Value;
-                    if (doc["vcfroot"]["WRNL"]["PresetPatterns"]["Lstg3"]?.Attributes["Enabled"].Value != null)
-                    {
-                        data.root.WRNL.PresetPatterns.Lstg3.Enabled = bool.Parse(doc["vcfroot"]["WRNL"]["PresetPatterns"]["Lstg3"]?.Attributes["Enabled"].Value);
-                    }
-                    data.root.WRNL.PresetPatterns.Lstg3.Pattern = doc["vcfroot"]["WRNL"]["PresetPatterns"]["Lstg3"]?.Attributes["Pattern"].Value;
-                    //Forced Patterns
-
-                    data.root.WRNL.ForcedPatterns.MainHorn.Enabled = bool.Parse(doc["vcfroot"]["WRNL"]["ForcedPatterns"]["MainHorn"].Attributes["Enabled"].Value);
-                    data.root.WRNL.ForcedPatterns.MainHorn.Pattern = int.Parse(doc["vcfroot"]["WRNL"]["ForcedPatterns"]["MainHorn"].Attributes["Pattern"].Value);
-                    data.root.WRNL.ForcedPatterns.SrnTone1.Enabled = bool.Parse(doc["vcfroot"]["WRNL"]["ForcedPatterns"]["SrnTone1"].Attributes["Enabled"].Value);
-                    data.root.WRNL.ForcedPatterns.SrnTone1.Pattern = int.Parse(doc["vcfroot"]["WRNL"]["ForcedPatterns"]["SrnTone1"].Attributes["Pattern"].Value);
-                    data.root.WRNL.ForcedPatterns.SrnTone2.Enabled = bool.Parse(doc["vcfroot"]["WRNL"]["ForcedPatterns"]["SrnTone2"].Attributes["Enabled"].Value);
-                    data.root.WRNL.ForcedPatterns.SrnTone2.Pattern = int.Parse(doc["vcfroot"]["WRNL"]["ForcedPatterns"]["SrnTone2"].Attributes["Pattern"].Value);
-                    data.root.WRNL.ForcedPatterns.SrnTone3.Enabled = bool.Parse(doc["vcfroot"]["WRNL"]["ForcedPatterns"]["SrnTone3"].Attributes["Enabled"].Value);
-                    data.root.WRNL.ForcedPatterns.SrnTone3.Pattern = int.Parse(doc["vcfroot"]["WRNL"]["ForcedPatterns"]["SrnTone3"].Attributes["Pattern"].Value);
-                    data.root.WRNL.ForcedPatterns.SrnTone4.Enabled = bool.Parse(doc["vcfroot"]["WRNL"]["ForcedPatterns"]["SrnTone4"].Attributes["Enabled"].Value);
-                    data.root.WRNL.ForcedPatterns.SrnTone4.Pattern = int.Parse(doc["vcfroot"]["WRNL"]["ForcedPatterns"]["SrnTone4"].Attributes["Pattern"].Value);
-                    data.root.WRNL.ForcedPatterns.PanicMde.Enabled = bool.Parse(doc["vcfroot"]["WRNL"]["ForcedPatterns"]["PanicMde"].Attributes["Enabled"].Value);
-                    data.root.WRNL.ForcedPatterns.PanicMde.Pattern = int.Parse(doc["vcfroot"]["WRNL"]["ForcedPatterns"]["PanicMde"].Attributes["Pattern"].Value);
-                    data.root.WRNL.ForcedPatterns.OutOfVeh.Enabled = bool.Parse(doc["vcfroot"]["WRNL"]["ForcedPatterns"]["OutOfVeh"].Attributes["Enabled"].Value);
-                    data.root.WRNL.ForcedPatterns.OutOfVeh.Pattern = int.Parse(doc["vcfroot"]["WRNL"]["ForcedPatterns"]["OutOfVeh"].Attributes["Pattern"].Value);
-                    //Scan Patterns Custom Pool
-                    CitizenFX.Core.Debug.WriteLine("Parsing Warning Lights scan");
-                    data.root.WRNL.ScanPatternCustomPool.Enabled = bool.Parse(doc["vcfroot"]["WRNL"]["ScanPatternCustomPool"].Attributes["Enabled"].Value);
-                    data.root.WRNL.ScanPatternCustomPool.Sequential = bool.Parse(doc["vcfroot"]["WRNL"]["ScanPatternCustomPool"].Attributes["Sequential"].Value);
-
-                    for (int i = 0; i < doc["vcfroot"]["WRNL"]["ScanPatternCustomPool"].ChildNodes.Count; i++)
+                    
+                    data.root.WRNL.ExtrasActiveAtLstg1 = subNodes["WRNL"].GetAttribute("ExtrasActiveAtLstg1")?.Value;
+                    data.root.WRNL.ExtrasActiveAtLstg2 = subNodes["WRNL"].GetAttribute("ExtrasActiveAtLstg2")?.Value;
+                    data.root.WRNL.ExtrasActiveAtLstg3 = subNodes["WRNL"].GetAttribute("ExtrasActiveAtLstg3")?.Value;
+
+                    foreach (NanoXMLNode n in subNodes["WRNL"].SubNodes)
                     {
-                        data.root.WRNL.ScanPatternCustomPool.Pattern.Add(int.Parse(doc["vcfroot"]["WRNL"]["ScanPatternCustomPool"].ChildNodes[i].InnerText));
+                        switch (n.Name)
+                        {
+
+                            case "PresetPatterns":
+                                foreach (NanoXMLNode sn in n.SubNodes)
+                                {
+                                    switch (sn.Name)
+                                    {
+                                        case "Lstg1":
+                                            data.root.WRNL.PresetPatterns.Lstg1.Enabled = bool.Parse(sn.GetAttribute("Enabled").Value);
+                                            data.root.WRNL.PresetPatterns.Lstg1.Pattern = sn.GetAttribute("Pattern").Value;
+                                            if (!data.root.WRNL.PresetPatterns.Lstg1.Pattern.ToLower().Equals("scan"))
+                                            {
+                                                data.root.WRNL.PresetPatterns.Lstg1.IntPattern = int.Parse(data.root.WRNL.PresetPatterns.Lstg1.Pattern);
+                                            }
+                                            break;
+                                        case "Lstg2":
+                                            data.root.WRNL.PresetPatterns.Lstg2.Enabled = bool.Parse(sn.GetAttribute("Enabled").Value);
+                                            data.root.WRNL.PresetPatterns.Lstg2.Pattern = sn.GetAttribute("Pattern").Value;
+                                            if (!data.root.WRNL.PresetPatterns.Lstg2.Pattern.ToLower().Equals("scan"))
+                                            {
+                                                data.root.WRNL.PresetPatterns.Lstg2.IntPattern = int.Parse(data.root.WRNL.PresetPatterns.Lstg2.Pattern);
+                                            }
+                                            break;
+                                        case "Lstg3":
+                                            data.root.WRNL.PresetPatterns.Lstg3.Enabled = bool.Parse(sn.GetAttribute("Enabled").Value);
+                                            data.root.WRNL.PresetPatterns.Lstg3.Pattern = sn.GetAttribute("Pattern").Value;
+                                            if (!data.root.WRNL.PresetPatterns.Lstg3.Pattern.ToLower().Equals("scan"))
+                                            {
+                                                data.root.WRNL.PresetPatterns.Lstg3.IntPattern = int.Parse(data.root.WRNL.PresetPatterns.Lstg3.Pattern);
+                                            }
+                                            break;
+                                    }
+                                }
+                                break;
+                            case "ForcedPatterns":
+                                foreach (NanoXMLNode sn in n.SubNodes)
+                                {
+                                    switch (sn.Name)
+                                    {
+                                        case "MainHorn":
+                                            data.root.WRNL.ForcedPatterns.MainHorn.Enabled = bool.Parse(sn.GetAttribute("Enabled").Value);
+                                            data.root.WRNL.ForcedPatterns.MainHorn.Pattern = sn.GetAttribute("Pattern").Value;
+                                            if (!data.root.WRNL.ForcedPatterns.MainHorn.Pattern.ToLower().Equals("scan"))
+                                            {
+                                                data.root.WRNL.ForcedPatterns.MainHorn.IntPattern = int.Parse(data.root.WRNL.ForcedPatterns.MainHorn.Pattern);
+                                            }
+                                            break;
+                                        case "SrnTone1":
+                                            data.root.WRNL.ForcedPatterns.SrnTone1.Enabled = bool.Parse(sn.GetAttribute("Enabled").Value);
+                                            data.root.WRNL.ForcedPatterns.SrnTone1.Pattern = sn.GetAttribute("Pattern").Value;
+                                            if (!data.root.WRNL.ForcedPatterns.SrnTone1.Pattern.ToLower().Equals("scan"))
+                                            {
+                                                data.root.WRNL.ForcedPatterns.SrnTone1.IntPattern = int.Parse(data.root.WRNL.ForcedPatterns.SrnTone1.Pattern);
+                                            }
+                                            break;
+                                        case "SrnTone2":
+                                            data.root.WRNL.ForcedPatterns.SrnTone2.Enabled = bool.Parse(sn.GetAttribute("Enabled").Value);
+                                            data.root.WRNL.ForcedPatterns.SrnTone2.Pattern = sn.GetAttribute("Pattern").Value;
+                                            if (!data.root.WRNL.ForcedPatterns.SrnTone2.Pattern.ToLower().Equals("scan"))
+                                            {
+                                                data.root.WRNL.ForcedPatterns.SrnTone2.IntPattern = int.Parse(data.root.WRNL.ForcedPatterns.SrnTone2.Pattern);
+                                            }
+                                            break;
+                                        case "SrnTone3":
+                                            data.root.WRNL.ForcedPatterns.SrnTone3.Enabled = bool.Parse(sn.GetAttribute("Enabled").Value);
+                                            data.root.WRNL.ForcedPatterns.SrnTone3.Pattern = sn.GetAttribute("Pattern").Value;
+                                            if (!data.root.WRNL.ForcedPatterns.SrnTone3.Pattern.ToLower().Equals("scan"))
+                                            {
+                                                data.root.WRNL.ForcedPatterns.SrnTone3.IntPattern = int.Parse(data.root.WRNL.ForcedPatterns.SrnTone3.Pattern);
+                                            }
+                                            break;
+                                        case "SrnTone4":
+                                            data.root.WRNL.ForcedPatterns.SrnTone4.Enabled = bool.Parse(sn.GetAttribute("Enabled").Value);
+                                            data.root.WRNL.ForcedPatterns.SrnTone4.Pattern = sn.GetAttribute("Pattern").Value;
+                                            if (!data.root.WRNL.ForcedPatterns.SrnTone4.Pattern.ToLower().Equals("scan"))
+                                            {
+                                                data.root.WRNL.ForcedPatterns.SrnTone4.IntPattern = int.Parse(data.root.WRNL.ForcedPatterns.SrnTone4.Pattern);
+                                            }
+                                            break;
+                                        case "AuxSiren":
+                                            data.root.WRNL.ForcedPatterns.AuxSiren.Enabled = bool.Parse(sn.GetAttribute("Enabled").Value);
+                                            data.root.WRNL.ForcedPatterns.AuxSiren.Pattern = sn.GetAttribute("Pattern").Value;
+                                            if (!data.root.WRNL.ForcedPatterns.AuxSiren.Pattern.ToLower().Equals("scan"))
+                                            {
+                                                data.root.WRNL.ForcedPatterns.AuxSiren.IntPattern = int.Parse(data.root.WRNL.ForcedPatterns.AuxSiren.Pattern);
+                                            }
+                                            break;
+                                        case "PanicMde":
+                                            data.root.WRNL.ForcedPatterns.PanicMde.Enabled = bool.Parse(sn.GetAttribute("Enabled").Value);
+                                            data.root.WRNL.ForcedPatterns.PanicMde.Pattern = sn.GetAttribute("Pattern").Value;
+                                            if (!data.root.WRNL.ForcedPatterns.PanicMde.Pattern.ToLower().Equals("scan"))
+                                            {
+                                                data.root.WRNL.ForcedPatterns.PanicMde.IntPattern = int.Parse(data.root.WRNL.ForcedPatterns.PanicMde.Pattern);
+                                            }
+                                            break;
+                                        case "OutOfVeh":
+                                            data.root.WRNL.ForcedPatterns.OutOfVeh.Enabled = bool.Parse(sn.GetAttribute("Enabled").Value);
+                                            data.root.WRNL.ForcedPatterns.OutOfVeh.Pattern = sn.GetAttribute("Pattern").Value;
+                                            if (!data.root.WRNL.ForcedPatterns.OutOfVeh.Pattern.ToLower().Equals("scan"))
+                                            {
+                                                data.root.WRNL.ForcedPatterns.OutOfVeh.IntPattern = int.Parse(data.root.WRNL.ForcedPatterns.OutOfVeh.Pattern);
+                                            }
+                                            break;
+                                    }
+                                }
+                                break;
+                            case "ScanPatternCustomPool":
+                                data.root.WRNL.ScanPatternCustomPool.Enabled = bool.Parse(n.GetAttribute("Enabled").Value);
+                                data.root.WRNL.ScanPatternCustomPool.Sequential = bool.Parse(n.GetAttribute("Sequential").Value);
+                                foreach (NanoXMLNode sn in n.SubNodes)
+                                {
+                                    data.root.WRNL.ScanPatternCustomPool.Pattern.Add(int.Parse(sn.Value));
+                                }
+                                break;
+                        }
                     }
                 }
                 catch (Exception e)
@@ -359,59 +551,135 @@ internal static void load(SettingsType.Type type, string name, string Data, stri
                 #endregion
 
                 #region Primary Lights
-#if DEBUG
-                CitizenFX.Core.Debug.WriteLine("Parsing Primary Lights");
-#endif
+
+                Utils.DebugWriteLine("Parsing Primary Lights");
                 try
                 {
-                    data.root.PRML.LightingFormat = doc["vcfroot"]["PRML"].Attributes["LightingFormat"].Value;
-                    if (doc["vcfroot"]["PRML"].Attributes["DisableAtLstg3"] != null)
-                    {
-                        data.root.PRML.DisableAtLstg3 = bool.Parse(doc["vcfroot"]["PRML"].Attributes["DisableAtLstg3"]?.Value);
-                    }
-                    data.root.PRML.ExtrasActiveAtLstg1 = doc["vcfroot"]["PRML"].Attributes["ExtrasActiveAtLstg1"]?.Value;
-                    data.root.PRML.ExtrasActiveAtLstg2 = doc["vcfroot"]["PRML"].Attributes["ExtrasActiveAtLstg2"]?.Value;
-                    data.root.PRML.ExtrasActiveAtLstg3 = doc["vcfroot"]["PRML"].Attributes["ExtrasActiveAtLstg3"]?.Value;
-                    //Preset Patterns
-                    if (doc["vcfroot"]["PRML"]["PresetPatterns"]["Lstg1"]?.Attributes["Enabled"].Value != null)
+                    data.root.PRML.LightingFormat = subNodes["PRML"].GetAttribute("LightingFormat").Value;
+                    if (subNodes["PRML"].GetAttribute("DisableAtLstg3") != null)
                     {
-                        data.root.PRML.PresetPatterns.Lstg1.Enabled = bool.Parse(doc["vcfroot"]["PRML"]["PresetPatterns"]["Lstg1"]?.Attributes["Enabled"].Value);
+                        data.root.PRML.DisableAtLstg3 = bool.Parse(subNodes["PRML"].GetAttribute("DisableAtLstg3").Value);
                     }
-
-                    data.root.PRML.PresetPatterns.Lstg1.Pattern = doc["vcfroot"]["PRML"]["PresetPatterns"]["Lstg1"]?.Attributes["Pattern"].Value;
-
-                    if (doc["vcfroot"]["PRML"]["PresetPatterns"]["Lstg2"]?.Attributes["Enabled"].Value != null)
+                    data.root.PRML.ExtrasActiveAtLstg1 = subNodes["PRML"].GetAttribute("ExtrasActiveAtLstg1")?.Value;
+                    data.root.PRML.ExtrasActiveAtLstg2 = subNodes["PRML"].GetAttribute("ExtrasActiveAtLstg2")?.Value;
+                    data.root.PRML.ExtrasActiveAtLstg3 = subNodes["PRML"].GetAttribute("ExtrasActiveAtLstg3")?.Value;
+                    foreach (NanoXMLNode n in subNodes["PRML"].SubNodes)
                     {
-                        data.root.PRML.PresetPatterns.Lstg2.Enabled = bool.Parse(doc["vcfroot"]["PRML"]["PresetPatterns"]["Lstg2"]?.Attributes["Enabled"].Value);
-                    }
-                    data.root.PRML.PresetPatterns.Lstg2.Pattern = doc["vcfroot"]["PRML"]["PresetPatterns"]["Lstg2"]?.Attributes["Pattern"].Value;
-                    if (doc["vcfroot"]["PRML"]["PresetPatterns"]["Lstg3"]?.Attributes["Enabled"].Value != null)
-                    {
-                        data.root.PRML.PresetPatterns.Lstg3.Enabled = bool.Parse(doc["vcfroot"]["PRML"]["PresetPatterns"]["Lstg3"]?.Attributes["Enabled"].Value);
-                    }
-                    data.root.PRML.PresetPatterns.Lstg3.Pattern = doc["vcfroot"]["PRML"]["PresetPatterns"]["Lstg3"]?.Attributes["Pattern"].Value;
-                    //Forced Patterns
-                    data.root.PRML.ForcedPatterns.MainHorn.Enabled = bool.Parse(doc["vcfroot"]["PRML"]["ForcedPatterns"]["MainHorn"].Attributes["Enabled"].Value);
-                    data.root.PRML.ForcedPatterns.MainHorn.Pattern = int.Parse(doc["vcfroot"]["PRML"]["ForcedPatterns"]["MainHorn"].Attributes["Pattern"].Value);
-                    data.root.PRML.ForcedPatterns.SrnTone1.Enabled = bool.Parse(doc["vcfroot"]["PRML"]["ForcedPatterns"]["SrnTone1"].Attributes["Enabled"].Value);
-                    data.root.PRML.ForcedPatterns.SrnTone1.Pattern = int.Parse(doc["vcfroot"]["PRML"]["ForcedPatterns"]["SrnTone1"].Attributes["Pattern"].Value);
-                    data.root.PRML.ForcedPatterns.SrnTone2.Enabled = bool.Parse(doc["vcfroot"]["PRML"]["ForcedPatterns"]["SrnTone2"].Attributes["Enabled"].Value);
-                    data.root.PRML.ForcedPatterns.SrnTone2.Pattern = int.Parse(doc["vcfroot"]["PRML"]["ForcedPatterns"]["SrnTone2"].Attributes["Pattern"].Value);
-                    data.root.PRML.ForcedPatterns.SrnTone3.Enabled = bool.Parse(doc["vcfroot"]["PRML"]["ForcedPatterns"]["SrnTone3"].Attributes["Enabled"].Value);
-                    data.root.PRML.ForcedPatterns.SrnTone3.Pattern = int.Parse(doc["vcfroot"]["PRML"]["ForcedPatterns"]["SrnTone3"].Attributes["Pattern"].Value);
-                    data.root.PRML.ForcedPatterns.SrnTone4.Enabled = bool.Parse(doc["vcfroot"]["PRML"]["ForcedPatterns"]["SrnTone4"].Attributes["Enabled"].Value);
-                    data.root.PRML.ForcedPatterns.SrnTone4.Pattern = int.Parse(doc["vcfroot"]["PRML"]["ForcedPatterns"]["SrnTone4"].Attributes["Pattern"].Value);
-                    data.root.PRML.ForcedPatterns.PanicMde.Enabled = bool.Parse(doc["vcfroot"]["PRML"]["ForcedPatterns"]["PanicMde"].Attributes["Enabled"].Value);
-                    data.root.PRML.ForcedPatterns.PanicMde.Pattern = int.Parse(doc["vcfroot"]["PRML"]["ForcedPatterns"]["PanicMde"].Attributes["Pattern"].Value);
-                    //data.root.PRML.ForcedPatterns.OutOfVeh.Enabled = bool.Parse(doc["vcfroot"]["PRML"]["ForcedPatterns"]["OutOfVeh"].Attributes["Enabled"].Value);
-                    //data.root.PRML.ForcedPatterns.OutOfVeh.Pattern = int.Parse(doc["vcfroot"]["PRML"]["ForcedPatterns"]["OutOfVeh"].Attributes["Pattern"].Value);
-                    //Scan Patterns Custom Pool
-                    data.root.PRML.ScanPatternCustomPool.Enabled = bool.Parse(doc["vcfroot"]["PRML"]["ScanPatternCustomPool"].Attributes["Enabled"].Value);
-                    data.root.PRML.ScanPatternCustomPool.Sequential = bool.Parse(doc["vcfroot"]["PRML"]["ScanPatternCustomPool"].Attributes["Sequential"].Value);
-
-                    for (int i = 0; i < doc["vcfroot"]["PRML"]["ScanPatternCustomPool"].ChildNodes.Count; i++)
-                    {
-                        data.root.PRML.ScanPatternCustomPool.Pattern.Add(int.Parse(doc["vcfroot"]["PRML"]["ScanPatternCustomPool"].ChildNodes[i].InnerText));
+                        switch (n.Name)
+                        {
+                            case "PresetPatterns":
+                                foreach (NanoXMLNode sn in n.SubNodes)
+                                {
+                                    switch (sn.Name)
+                                    {
+                                        case "Lstg1":
+                                            data.root.PRML.PresetPatterns.Lstg1.Enabled = bool.Parse(sn.GetAttribute("Enabled").Value);
+                                            data.root.PRML.PresetPatterns.Lstg1.Pattern = sn.GetAttribute("Pattern").Value;
+                                            if (!data.root.PRML.PresetPatterns.Lstg1.Pattern.ToLower().Equals("scan"))
+                                            {
+                                                data.root.PRML.PresetPatterns.Lstg1.IntPattern = int.Parse(data.root.PRML.PresetPatterns.Lstg1.Pattern);
+                                            }
+                                            break;
+                                        case "Lstg2":
+                                            data.root.PRML.PresetPatterns.Lstg2.Enabled = bool.Parse(sn.GetAttribute("Enabled").Value);
+                                            data.root.PRML.PresetPatterns.Lstg2.Pattern = sn.GetAttribute("Pattern").Value;
+                                            if (!data.root.PRML.PresetPatterns.Lstg2.Pattern.ToLower().Equals("scan"))
+                                            {
+                                                data.root.PRML.PresetPatterns.Lstg2.IntPattern = int.Parse(data.root.PRML.PresetPatterns.Lstg2.Pattern);
+                                            }
+                                            break;
+                                        case "Lstg3":
+                                            data.root.PRML.PresetPatterns.Lstg3.Enabled = bool.Parse(sn.GetAttribute("Enabled").Value);
+                                            data.root.PRML.PresetPatterns.Lstg3.Pattern = sn.GetAttribute("Pattern").Value;
+                                            if (!data.root.PRML.PresetPatterns.Lstg3.Pattern.ToLower().Equals("scan"))
+                                            {
+                                                data.root.PRML.PresetPatterns.Lstg3.IntPattern = int.Parse(data.root.PRML.PresetPatterns.Lstg3.Pattern);
+                                            }
+                                            break;
+                                    }
+                                }
+                                break;
+                            case "ForcedPatterns":
+                                foreach (NanoXMLNode sn in n.SubNodes)
+                                {
+                                    switch (sn.Name)
+                                    {
+                                        case "MainHorn":
+                                            data.root.PRML.ForcedPatterns.MainHorn.Enabled = bool.Parse(sn.GetAttribute("Enabled").Value);
+                                            data.root.PRML.ForcedPatterns.MainHorn.Pattern = sn.GetAttribute("Pattern").Value;
+                                            if (!data.root.PRML.ForcedPatterns.MainHorn.Pattern.ToLower().Equals("scan"))
+                                            {
+                                                data.root.PRML.ForcedPatterns.MainHorn.IntPattern = int.Parse(data.root.WRNL.ForcedPatterns.MainHorn.Pattern);
+                                            }
+                                            break;
+                                        case "SrnTone1":
+                                            data.root.PRML.ForcedPatterns.SrnTone1.Enabled = bool.Parse(sn.GetAttribute("Enabled").Value);
+                                            data.root.PRML.ForcedPatterns.SrnTone1.Pattern = sn.GetAttribute("Pattern").Value;
+                                            if (!data.root.PRML.ForcedPatterns.SrnTone1.Pattern.ToLower().Equals("scan"))
+                                            {
+                                                data.root.PRML.ForcedPatterns.SrnTone1.IntPattern = int.Parse(data.root.PRML.ForcedPatterns.SrnTone1.Pattern);
+                                            }
+                                            break;
+                                        case "SrnTone2":
+                                            data.root.PRML.ForcedPatterns.SrnTone2.Enabled = bool.Parse(sn.GetAttribute("Enabled").Value);
+                                            data.root.PRML.ForcedPatterns.SrnTone2.Pattern = sn.GetAttribute("Pattern").Value;
+                                            if (!data.root.PRML.ForcedPatterns.SrnTone2.Pattern.ToLower().Equals("scan"))
+                                            {
+                                                data.root.PRML.ForcedPatterns.SrnTone2.IntPattern = int.Parse(data.root.PRML.ForcedPatterns.SrnTone2.Pattern);
+                                            }
+                                            break;
+                                        case "SrnTone3":
+                                            data.root.PRML.ForcedPatterns.SrnTone3.Enabled = bool.Parse(sn.GetAttribute("Enabled").Value);
+                                            data.root.PRML.ForcedPatterns.SrnTone3.Pattern = sn.GetAttribute("Pattern").Value;
+                                            if (!data.root.PRML.ForcedPatterns.SrnTone3.Pattern.ToLower().Equals("scan"))
+                                            {
+                                                data.root.PRML.ForcedPatterns.SrnTone3.IntPattern = int.Parse(data.root.PRML.ForcedPatterns.SrnTone3.Pattern);
+                                            }
+                                            break;
+                                        case "SrnTone4":
+                                            data.root.PRML.ForcedPatterns.SrnTone4.Enabled = bool.Parse(sn.GetAttribute("Enabled").Value);
+                                            data.root.PRML.ForcedPatterns.SrnTone4.Pattern = sn.GetAttribute("Pattern").Value;
+                                            if (!data.root.PRML.ForcedPatterns.SrnTone4.Pattern.ToLower().Equals("scan"))
+                                            {
+                                                data.root.PRML.ForcedPatterns.SrnTone4.IntPattern = int.Parse(data.root.PRML.ForcedPatterns.SrnTone4.Pattern);
+                                            }
+                                            break;
+                                        case "AuxSiren":
+                                            data.root.PRML.ForcedPatterns.AuxSiren.Enabled = bool.Parse(sn.GetAttribute("Enabled").Value);
+                                            data.root.PRML.ForcedPatterns.AuxSiren.Pattern = sn.GetAttribute("Pattern").Value;
+                                            if (!data.root.PRML.ForcedPatterns.AuxSiren.Pattern.ToLower().Equals("scan"))
+                                            {
+                                                data.root.PRML.ForcedPatterns.AuxSiren.IntPattern = int.Parse(data.root.PRML.ForcedPatterns.MainHorn.Pattern);
+                                            }
+                                            break;
+                                        case "PanicMde":
+                                            data.root.PRML.ForcedPatterns.PanicMde.Enabled = bool.Parse(sn.GetAttribute("Enabled").Value);
+                                            data.root.PRML.ForcedPatterns.PanicMde.Pattern = sn.GetAttribute("Pattern").Value;
+                                            if (!data.root.PRML.ForcedPatterns.PanicMde.Pattern.ToLower().Equals("scan"))
+                                            {
+                                                data.root.PRML.ForcedPatterns.PanicMde.IntPattern = int.Parse(data.root.PRML.ForcedPatterns.PanicMde.Pattern);
+                                            }
+                                            break;
+                                        case "OutOfVeh":
+                                            data.root.PRML.ForcedPatterns.OutOfVeh.Enabled = bool.Parse(sn.GetAttribute("Enabled").Value);
+                                            data.root.PRML.ForcedPatterns.OutOfVeh.Pattern = sn.GetAttribute("Pattern").Value;
+                                            if (!data.root.PRML.ForcedPatterns.OutOfVeh.Pattern.ToLower().Equals("scan"))
+                                            {
+                                                data.root.PRML.ForcedPatterns.OutOfVeh.IntPattern = int.Parse(data.root.PRML.ForcedPatterns.OutOfVeh.Pattern);
+                                            }
+                                            break;
+                                    }
+                                }
+                                break;
+                            case "ScanPatternCustomPool":
+                                data.root.PRML.ScanPatternCustomPool.Enabled = bool.Parse(n.GetAttribute("Enabled").Value);
+                                data.root.PRML.ScanPatternCustomPool.Sequential = bool.Parse(n.GetAttribute("Sequential").Value);
+                                foreach (NanoXMLNode sn in n.SubNodes)
+                                {
+                                    data.root.PRML.ScanPatternCustomPool.Pattern.Add(int.Parse(sn.Value));
+                                }
+                                break;
+                        }
                     }
                 }
                 catch (Exception e)
@@ -422,57 +690,134 @@ internal static void load(SettingsType.Type type, string name, string Data, stri
                 #endregion
 
                 #region Secondary Lights
-#if DEBUG
-                CitizenFX.Core.Debug.WriteLine("Parsing Secondary Lights");
-#endif
+                Utils.DebugWriteLine("Parsing Secondary Lights");
                 try
                 {
-                    data.root.SECL.LightingFormat = doc["vcfroot"]["SECL"].Attributes["LightingFormat"].Value;
-                    if (doc["vcfroot"]["SECL"].Attributes["DisableAtLstg3"] != null)
-                    {
-                        data.root.SECL.DisableAtLstg3 = bool.Parse(doc["vcfroot"]["SECL"].Attributes["DisableAtLstg3"]?.Value);
-                    }
-                    data.root.SECL.ExtrasActiveAtLstg1 = doc["vcfroot"]["SECL"].Attributes["ExtrasActiveAtLstg1"]?.Value;
-                    data.root.SECL.ExtrasActiveAtLstg2 = doc["vcfroot"]["SECL"].Attributes["ExtrasActiveAtLstg2"]?.Value;
-                    data.root.SECL.ExtrasActiveAtLstg3 = doc["vcfroot"]["SECL"].Attributes["ExtrasActiveAtLstg3"]?.Value;
-                    //Preset Patterns
-                    if (doc["vcfroot"]["SECL"]["PresetPatterns"]["Lstg1"]?.Attributes["Enabled"].Value != null)
-                    {
-                        data.root.SECL.PresetPatterns.Lstg1.Enabled = bool.Parse(doc["vcfroot"]["SECL"]["PresetPatterns"]["Lstg1"]?.Attributes["Enabled"].Value);
-                    }
-                    data.root.SECL.PresetPatterns.Lstg1.Pattern = doc["vcfroot"]["SECL"]["PresetPatterns"]["Lstg1"]?.Attributes["Pattern"].Value;
-                    if (doc["vcfroot"]["SECL"]["PresetPatterns"]["Lstg2"]?.Attributes["Enabled"].Value != null)
-                    {
-                        data.root.SECL.PresetPatterns.Lstg2.Enabled = bool.Parse(doc["vcfroot"]["SECL"]["PresetPatterns"]["Lstg2"]?.Attributes["Enabled"].Value);
-                    }
-                    data.root.SECL.PresetPatterns.Lstg2.Pattern = doc["vcfroot"]["SECL"]["PresetPatterns"]["Lstg2"]?.Attributes["Pattern"].Value;
-                    if (doc["vcfroot"]["SECL"]["PresetPatterns"]["Lstg3"]?.Attributes["Enabled"].Value != null)
+                    data.root.SECL.LightingFormat = subNodes["SECL"].GetAttribute("LightingFormat").Value;
+                    if (subNodes["SECL"].GetAttribute("DisableAtLstg3") != null)
                     {
-                        data.root.SECL.PresetPatterns.Lstg3.Enabled = bool.Parse(doc["vcfroot"]["SECL"]["PresetPatterns"]["Lstg3"]?.Attributes["Enabled"].Value);
+                        data.root.SECL.DisableAtLstg3 = bool.Parse(subNodes["SECL"].GetAttribute("DisableAtLstg3").Value);
                     }
-                    data.root.SECL.PresetPatterns.Lstg3.Pattern = doc["vcfroot"]["SECL"]["PresetPatterns"]["Lstg3"]?.Attributes["Pattern"].Value;
-                    //Forced Patterns
-                    data.root.SECL.ForcedPatterns.MainHorn.Enabled = bool.Parse(doc["vcfroot"]["SECL"]["ForcedPatterns"]["MainHorn"].Attributes["Enabled"].Value);
-                    data.root.SECL.ForcedPatterns.MainHorn.Pattern = int.Parse(doc["vcfroot"]["SECL"]["ForcedPatterns"]["MainHorn"].Attributes["Pattern"].Value);
-                    data.root.SECL.ForcedPatterns.SrnTone1.Enabled = bool.Parse(doc["vcfroot"]["SECL"]["ForcedPatterns"]["SrnTone1"].Attributes["Enabled"].Value);
-                    data.root.SECL.ForcedPatterns.SrnTone1.Pattern = int.Parse(doc["vcfroot"]["SECL"]["ForcedPatterns"]["SrnTone1"].Attributes["Pattern"].Value);
-                    data.root.SECL.ForcedPatterns.SrnTone2.Enabled = bool.Parse(doc["vcfroot"]["SECL"]["ForcedPatterns"]["SrnTone2"].Attributes["Enabled"].Value);
-                    data.root.SECL.ForcedPatterns.SrnTone2.Pattern = int.Parse(doc["vcfroot"]["SECL"]["ForcedPatterns"]["SrnTone2"].Attributes["Pattern"].Value);
-                    data.root.SECL.ForcedPatterns.SrnTone3.Enabled = bool.Parse(doc["vcfroot"]["SECL"]["ForcedPatterns"]["SrnTone3"].Attributes["Enabled"].Value);
-                    data.root.SECL.ForcedPatterns.SrnTone3.Pattern = int.Parse(doc["vcfroot"]["SECL"]["ForcedPatterns"]["SrnTone3"].Attributes["Pattern"].Value);
-                    data.root.SECL.ForcedPatterns.SrnTone4.Enabled = bool.Parse(doc["vcfroot"]["SECL"]["ForcedPatterns"]["SrnTone4"].Attributes["Enabled"].Value);
-                    data.root.SECL.ForcedPatterns.SrnTone4.Pattern = int.Parse(doc["vcfroot"]["SECL"]["ForcedPatterns"]["SrnTone4"].Attributes["Pattern"].Value);
-                    data.root.SECL.ForcedPatterns.PanicMde.Enabled = bool.Parse(doc["vcfroot"]["SECL"]["ForcedPatterns"]["PanicMde"].Attributes["Enabled"].Value);
-                    data.root.SECL.ForcedPatterns.PanicMde.Pattern = int.Parse(doc["vcfroot"]["SECL"]["ForcedPatterns"]["PanicMde"].Attributes["Pattern"].Value);
-                    //data.root.SECL.ForcedPatterns.OutOfVeh.Enabled = bool.Parse(doc["vcfroot"]["SECL"]["ForcedPatterns"]["OutOfVeh"].Attributes["Enabled"].Value);
-                    //data.root.SECL.ForcedPatterns.OutOfVeh.Pattern = int.Parse(doc["vcfroot"]["SECL"]["ForcedPatterns"]["OutOfVeh"].Attributes["Pattern"].Value);
-                    //Scan Patterns Custom Pool
-                    data.root.SECL.ScanPatternCustomPool.Enabled = bool.Parse(doc["vcfroot"]["SECL"]["ScanPatternCustomPool"].Attributes["Enabled"].Value);
-                    data.root.SECL.ScanPatternCustomPool.Sequential = bool.Parse(doc["vcfroot"]["SECL"]["ScanPatternCustomPool"].Attributes["Sequential"].Value);
-
-                    for (int i = 0; i < doc["vcfroot"]["SECL"]["ScanPatternCustomPool"].ChildNodes.Count; i++)
+                    data.root.SECL.ExtrasActiveAtLstg1 = subNodes["SECL"].GetAttribute("ExtrasActiveAtLstg1")?.Value;
+                    data.root.SECL.ExtrasActiveAtLstg2 = subNodes["SECL"].GetAttribute("ExtrasActiveAtLstg2")?.Value;
+                    data.root.SECL.ExtrasActiveAtLstg3 = subNodes["SECL"].GetAttribute("ExtrasActiveAtLstg3")?.Value;
+                    foreach (NanoXMLNode n in subNodes["SECL"].SubNodes)
                     {
-                        data.root.SECL.ScanPatternCustomPool.Pattern.Add(int.Parse(doc["vcfroot"]["SECL"]["ScanPatternCustomPool"].ChildNodes[i].InnerText));
+                        switch (n.Name)
+                        {
+                            case "PresetPatterns":
+                                foreach (NanoXMLNode sn in n.SubNodes)
+                                {
+                                    switch (sn.Name)
+                                    {
+                                        case "Lstg1":
+                                            data.root.SECL.PresetPatterns.Lstg1.Enabled = bool.Parse(sn.GetAttribute("Enabled").Value);
+                                            data.root.SECL.PresetPatterns.Lstg1.Pattern = sn.GetAttribute("Pattern").Value;
+                                            if (!data.root.SECL.PresetPatterns.Lstg1.Pattern.ToLower().Equals("scan"))
+                                            {
+                                                data.root.SECL.PresetPatterns.Lstg1.IntPattern = int.Parse(data.root.SECL.PresetPatterns.Lstg1.Pattern);
+                                            }
+                                            break;
+                                        case "Lstg2":
+                                            data.root.SECL.PresetPatterns.Lstg2.Enabled = bool.Parse(sn.GetAttribute("Enabled").Value);
+                                            data.root.SECL.PresetPatterns.Lstg2.Pattern = sn.GetAttribute("Pattern").Value;
+                                            if (!data.root.SECL.PresetPatterns.Lstg2.Pattern.ToLower().Equals("scan"))
+                                            {
+                                                data.root.SECL.PresetPatterns.Lstg2.IntPattern = int.Parse(data.root.SECL.PresetPatterns.Lstg2.Pattern);
+                                            }
+                                            break;
+                                        case "Lstg3":
+                                            data.root.SECL.PresetPatterns.Lstg3.Enabled = bool.Parse(sn.GetAttribute("Enabled").Value);
+                                            data.root.SECL.PresetPatterns.Lstg3.Pattern = sn.GetAttribute("Pattern").Value;
+                                            if (!data.root.SECL.PresetPatterns.Lstg3.Pattern.ToLower().Equals("scan"))
+                                            {
+                                                data.root.SECL.PresetPatterns.Lstg3.IntPattern = int.Parse(data.root.SECL.PresetPatterns.Lstg3.Pattern);
+                                            }
+                                            break;
+                                    }
+                                }
+                                break;
+                            case "ForcedPatterns":
+                                foreach (NanoXMLNode sn in n.SubNodes)
+                                {
+                                    switch (sn.Name)
+                                    {
+                                        case "MainHorn":
+                                            data.root.SECL.ForcedPatterns.MainHorn.Enabled = bool.Parse(sn.GetAttribute("Enabled").Value);
+                                            data.root.SECL.ForcedPatterns.MainHorn.Pattern = sn.GetAttribute("Pattern").Value;
+                                            if (!data.root.SECL.ForcedPatterns.MainHorn.Pattern.ToLower().Equals("scan"))
+                                            {
+                                                data.root.SECL.ForcedPatterns.MainHorn.IntPattern = int.Parse(data.root.SECL.ForcedPatterns.MainHorn.Pattern);
+                                            }
+                                            break;
+                                        case "SrnTone1":
+                                            data.root.SECL.ForcedPatterns.SrnTone1.Enabled = bool.Parse(sn.GetAttribute("Enabled").Value);
+                                            data.root.SECL.ForcedPatterns.SrnTone1.Pattern = sn.GetAttribute("Pattern").Value;
+                                            if (!data.root.SECL.ForcedPatterns.SrnTone1.Pattern.ToLower().Equals("scan"))
+                                            {
+                                                data.root.SECL.ForcedPatterns.SrnTone1.IntPattern = int.Parse(data.root.SECL.ForcedPatterns.SrnTone1.Pattern);
+                                            }
+                                            break;
+                                        case "SrnTone2":
+                                            data.root.SECL.ForcedPatterns.SrnTone2.Enabled = bool.Parse(sn.GetAttribute("Enabled").Value);
+                                            data.root.SECL.ForcedPatterns.SrnTone2.Pattern = sn.GetAttribute("Pattern").Value;
+                                            if (!data.root.SECL.ForcedPatterns.SrnTone2.Pattern.ToLower().Equals("scan"))
+                                            {
+                                                data.root.SECL.ForcedPatterns.SrnTone2.IntPattern = int.Parse(data.root.SECL.ForcedPatterns.SrnTone2.Pattern);
+                                            }
+                                            break;
+                                        case "SrnTone3":
+                                            data.root.SECL.ForcedPatterns.SrnTone3.Enabled = bool.Parse(sn.GetAttribute("Enabled").Value);
+                                            data.root.SECL.ForcedPatterns.SrnTone3.Pattern = sn.GetAttribute("Pattern").Value;
+                                            if (!data.root.SECL.ForcedPatterns.SrnTone3.Pattern.ToLower().Equals("scan"))
+                                            {
+                                                data.root.SECL.ForcedPatterns.SrnTone3.IntPattern = int.Parse(data.root.SECL.ForcedPatterns.SrnTone3.Pattern);
+                                            }
+                                            break;
+                                        case "SrnTone4":
+                                            data.root.SECL.ForcedPatterns.SrnTone4.Enabled = bool.Parse(sn.GetAttribute("Enabled").Value);
+                                            data.root.SECL.ForcedPatterns.SrnTone4.Pattern = sn.GetAttribute("Pattern").Value;
+                                            if (!data.root.SECL.ForcedPatterns.SrnTone4.Pattern.ToLower().Equals("scan"))
+                                            {
+                                                data.root.SECL.ForcedPatterns.SrnTone4.IntPattern = int.Parse(data.root.SECL.ForcedPatterns.SrnTone4.Pattern);
+                                            }
+                                            break;
+                                        case "AuxSiren":
+                                            data.root.SECL.ForcedPatterns.AuxSiren.Enabled = bool.Parse(sn.GetAttribute("Enabled").Value);
+                                            data.root.SECL.ForcedPatterns.AuxSiren.Pattern = sn.GetAttribute("Pattern").Value;
+                                            if (!data.root.SECL.ForcedPatterns.AuxSiren.Pattern.ToLower().Equals("scan"))
+                                            {
+                                                data.root.SECL.ForcedPatterns.AuxSiren.IntPattern = int.Parse(data.root.SECL.ForcedPatterns.AuxSiren.Pattern);
+                                            }
+                                            break;
+                                        case "PanicMde":
+                                            data.root.SECL.ForcedPatterns.PanicMde.Enabled = bool.Parse(sn.GetAttribute("Enabled").Value);
+                                            data.root.SECL.ForcedPatterns.PanicMde.Pattern = sn.GetAttribute("Pattern").Value;
+                                            if (!data.root.SECL.ForcedPatterns.PanicMde.Pattern.ToLower().Equals("scan"))
+                                            {
+                                                data.root.SECL.ForcedPatterns.PanicMde.IntPattern = int.Parse(data.root.SECL.ForcedPatterns.PanicMde.Pattern);
+                                            }
+                                            break;
+                                        case "OutOfVeh":
+                                            data.root.SECL.ForcedPatterns.OutOfVeh.Enabled = bool.Parse(sn.GetAttribute("Enabled").Value);
+                                            data.root.SECL.ForcedPatterns.OutOfVeh.Pattern = sn.GetAttribute("Pattern").Value;
+                                            if (!data.root.SECL.ForcedPatterns.OutOfVeh.Pattern.ToLower().Equals("scan"))
+                                            {
+                                                data.root.SECL.ForcedPatterns.OutOfVeh.IntPattern = int.Parse(data.root.SECL.ForcedPatterns.OutOfVeh.Pattern);
+                                            }
+                                            break;
+                                    }
+                                }
+                                break;
+                            case "ScanPatternCustomPool":
+                                data.root.SECL.ScanPatternCustomPool.Enabled = bool.Parse(n.GetAttribute("Enabled").Value);
+                                data.root.SECL.ScanPatternCustomPool.Sequential = bool.Parse(n.GetAttribute("Sequential").Value);
+                                foreach (NanoXMLNode sn in n.SubNodes)
+                                {
+                                    data.root.SECL.ScanPatternCustomPool.Pattern.Add(int.Parse(sn.Value));
+                                }
+                                break;
+                        }
                     }
                 }
                 catch (Exception e)
@@ -481,66 +826,168 @@ internal static void load(SettingsType.Type type, string name, string Data, stri
                 }
                 #endregion
 
-
                 //TODO: add method to remove old file or a file from ELSVehicle
-                if (ELSVehicle.Exists(veh => veh.modelHash == hash))
+                if (ELSVehicle.ContainsKey(hash))
                 {
-#if DEBUG
-                    CitizenFX.Core.Debug.WriteLine($"Removeing preexisting VCF for resource ${ResourceName}");
-#endif
-                    ELSVehicle.RemoveAll(veh => veh.modelHash == hash);
+                    Utils.DebugWriteLine($"Removeing preexisting VCF for resource {ResourceName} for {name}");
+                    ELSVehicle.Remove(hash);
                 }
-                ELSVehicle.Add(data);
+                ELSVehicle.Add(hash, data);
                 Utils.ReleaseWriteLine($"Added vehicle {data.filename}");
             }
         }
+
         internal static void unload(string hash)
         {
-            var count = ELSVehicle.RemoveAll(veh => veh.modelHash.Equals(hash));
-#if DEBUG
-            CitizenFX.Core.Debug.WriteLine($"Unloaded {count} VCF for {hash}");
-#endif
+            var count = ELSVehicle.Count;
+            ELSVehicle.Clear();
+            Utils.DebugWriteLine($"Unloaded {count} VCF for {hash}");
+        }
+
+        internal static void ParsePatterns(List<dynamic> patterns)
+        {
+            foreach(dynamic patt in patterns)
+            {
+                LoadCustomPattern(patt);
+            }
+        }
+
+        static void LoadCustomPattern(dynamic pattData)
+        {
+            Light.Patterns.CustomPattern pattern = new Light.Patterns.CustomPattern(150,200,200,new Dictionary<int, string>());
+            NanoXMLDocument doc = new NanoXMLDocument(pattData.Item3);
+            List<StringBuilder> builders = new List<StringBuilder>();
+            for(int i = 0; i < 10; i++)
+            {
+                builders.Add(new StringBuilder());
+            }
+            foreach (NanoXMLNode n in doc.RootNode.SubNodes)
+            {
+                switch (n.Name)
+                {
+                    case "PRIMARY":
+                        pattern.PrmDelay = int.Parse(n.GetAttribute("speed").Value);
+                        foreach (NanoXMLNode state in n.SubNodes)
+                        {
+                            for (int i = 0; i < 4; i++)
+                            {
+                                if (state.GetAttribute($"Extra{i + 1}") != null)
+                                {
+                                    builders[i].Append(bool.Parse(state.GetAttribute($"Extra{i + 1}").Value) ? "1" : "0");
+                                }
+                            }
+                        }
+                        break;
+                    case "SECONDARY":
+                        pattern.SecDelay = int.Parse(n.GetAttribute("speed").Value);
+                        foreach (NanoXMLNode state in n.SubNodes)
+                        {
+                            for (int i = 5; i < 9; i++)
+                            {
+                                if (state.GetAttribute($"Extra{i + 1}") != null)
+                                {
+                                    builders[i].Append(bool.Parse(state.GetAttribute($"Extra{i + 1}").Value) ? "1" : "0");
+                                }
+                            }
+                        }
+                        break;
+                    case "ADVISOR":
+                        pattern.TADelay = int.Parse(n.GetAttribute("speed").Value);
+                        foreach (NanoXMLNode state in n.SubNodes)
+                        {
+                            for (int i = 7; i < 9; i++)
+                            {
+                                if (state.GetAttribute($"Extra{i + 1}") != null)
+                                {
+                                    builders[i].Append(bool.Parse(state.GetAttribute($"Extra{i + 1}").Value) ? "1" : "0");
+                                }
+                            }
+                        }
+                        break;
+                }
+            }
+            if (builders[0].Length > 0)
+            {
+                pattern.PatternData.Add(1, builders[0].ToString());
+            }
+            if (builders[1].Length > 0)
+            {
+                pattern.PatternData.Add(2, builders[1].ToString());
+            }
+            if (builders[2].Length > 0)
+            {
+                pattern.PatternData.Add(3, builders[2].ToString());
+            }
+            if (builders[3].Length > 0)
+            {
+                pattern.PatternData.Add(4, builders[3].ToString());
+            }
+            if (builders[4].Length > 0)
+            {
+                pattern.PatternData.Add(5, builders[4].ToString());
+            }
+            if (builders[5].Length > 0)
+            {
+                pattern.PatternData.Add(6, builders[5].ToString());
+            }
+            if (builders[6].Length > 0)
+            {
+                pattern.PatternData.Add(7, builders[6].ToString());
+            }
+            if (builders[7].Length > 0)
+            {
+                pattern.PatternData.Add(8, builders[7].ToString());
+            }
+            if (builders[8].Length > 0)
+            {
+                pattern.PatternData.Add(9, builders[8].ToString());
+            }
+            foreach (int hash in ELSVehicle.Keys)
+            {
+                if (ELSVehicle[hash].root.CustomPatterns == null)
+                {
+                    ELSVehicle[hash].root.CustomPatterns = new Dictionary<string, Light.Patterns.CustomPattern>();
+                }
+                if (ELSVehicle[hash].root.CustomPatterns.ContainsKey(Path.GetFileNameWithoutExtension(pattData.Item2).ToLower()))
+                {
+                    ELSVehicle[hash].root.CustomPatterns[Path.GetFileNameWithoutExtension(pattData.Item2).ToLower()] = pattern;
+                }
+                else
+                {
+                    ELSVehicle[hash].root.CustomPatterns.Add(Path.GetFileNameWithoutExtension(pattData.Item2).ToLower(), pattern);
+                }
+                
+            }
+
         }
 
         internal static bool isValidData(string data)
         {
             if (String.IsNullOrEmpty(data)) return false;
-            System.Xml.XmlDocument doc = new System.Xml.XmlDocument();
-            doc.LoadXml(data);
-            //TODO change how below is detected to account for xml meta tag being before it.
-            return doc.DocumentElement.Name == "vcfroot";
+            NanoXMLDocument doc = new NanoXMLDocument(data);
+            return doc.RootNode.Name == "vcfroot";
         }
     }
 }
 namespace ELS.configuration
 {
-    [XmlRoot(ElementName = "INTERFACE")]
+
     public class INTERFACE
     {
-        [XmlElement(ElementName = "LstgActivationType")]
         public string LstgActivationType { get; set; }
-        [XmlElement(ElementName = "DefaultSirenMode")]
         public string DefaultSirenMode { get; set; }
-        [XmlElement(ElementName = "InfoPanelHeaderColor")]
         public string InfoPanelHeaderColor { get; set; }
-        [XmlElement(ElementName = "InfoPanelButtonLightColor")]
         public string InfoPanelButtonLightColor { get; set; }
     }
 
-    [XmlRoot(ElementName = "Extra01")]
     public class Extra
     {
-        [XmlAttribute(AttributeName = "IsElsControlled")]
+
         public bool IsElsControlled { get; set; }
-        [XmlAttribute(AttributeName = "AllowEnvLight")]
         public bool AllowEnvLight { get; set; }
-        [XmlAttribute(AttributeName = "Color")]
         public string Color { get; set; }
-        [XmlAttribute(AttributeName = "OffsetX")]
         public float OffsetX { get; set; }
-        [XmlAttribute(AttributeName = "OffsetY")]
         public float OffsetY { get; set; }
-        [XmlAttribute(AttributeName = "OffsetZ")]
         public float OffsetZ { get; set; }
 
         public Extra()
@@ -549,33 +996,22 @@ public Extra()
             AllowEnvLight = false;
         }
     }
-
-    [XmlRoot(ElementName = "EOVERRIDE")]
     public class EOVERRIDE
     {
-        [XmlElement(ElementName = "Extra01")]
+
         public Extra Extra01 { get; set; }
-        [XmlElement(ElementName = "Extra02")]
+
         public Extra Extra02 { get; set; }
-        [XmlElement(ElementName = "Extra03")]
+
         public Extra Extra03 { get; set; }
-        [XmlElement(ElementName = "Extra04")]
         public Extra Extra04 { get; set; }
-        [XmlElement(ElementName = "Extra05")]
         public Extra Extra05 { get; set; }
-        [XmlElement(ElementName = "Extra06")]
         public Extra Extra06 { get; set; }
-        [XmlElement(ElementName = "Extra07")]
         public Extra Extra07 { get; set; }
-        [XmlElement(ElementName = "Extra08")]
         public Extra Extra08 { get; set; }
-        [XmlElement(ElementName = "Extra09")]
         public Extra Extra09 { get; set; }
-        [XmlElement(ElementName = "Extra10")]
         public Extra Extra10 { get; set; }
-        [XmlElement(ElementName = "Extra11")]
         public Extra Extra11 { get; set; }
-        [XmlElement(ElementName = "Extra12")]
         public Extra Extra12 { get; set; }
 
         public EOVERRIDE()
@@ -595,38 +1031,27 @@ public EOVERRIDE()
         }
     }
 
-    [XmlRoot(ElementName = "Takedowns")]
     public class Takedowns
     {
-        [XmlAttribute(AttributeName = "AllowUse")]
         public bool AllowUse { get; set; }
-        [XmlAttribute(AttributeName = "Mirrored")]
         public bool Mirrored { get; set; }
     }
 
-    [XmlRoot(ElementName = "SceneLights")]
     public class SceneLights
     {
-        [XmlAttribute(AttributeName = "AllowUse")]
         public bool AllowUse { get; set; }
-        [XmlAttribute(AttributeName = "IlluminateSidesOnly")]
         public bool IlluminateSidesOnly { get; set; }
     }
 
-    [XmlRoot(ElementName = "MISC")]
     public class MISC
     {
-        [XmlElement(ElementName = "VehicleIsSlicktop")]
         public bool VehicleIsSlicktop { get; set; }
-        [XmlElement(ElementName = "ArrowboardType")]
         public string ArrowboardType { get; set; }
-        [XmlElement(ElementName = "UseSteadyBurnLights")]
         public bool UseSteadyBurnLights { get; set; }
-        [XmlElement(ElementName = "DfltSirenLtsActivateAtLstg")]
         public int DfltSirenLtsActivateAtLstg { get; set; }
-        [XmlElement(ElementName = "Takedowns")]
+
         public Takedowns Takedowns { get; set; }
-        [XmlElement(ElementName = "SceneLights")]
+
         public SceneLights SceneLights { get; set; }
 
         public MISC()
@@ -636,16 +1061,16 @@ public MISC()
         }
     }
 
-    [XmlRoot(ElementName = "UseExtras")]
+
     public class UseExtras
     {
-        [XmlAttribute(AttributeName = "Extra1")]
+
         public bool Extra1 { get; set; }
-        [XmlAttribute(AttributeName = "Extra2")]
+
         public bool Extra2 { get; set; }
-        [XmlAttribute(AttributeName = "Extra3")]
+
         public bool Extra3 { get; set; }
-        [XmlAttribute(AttributeName = "Extra4")]
+
         public bool Extra4 { get; set; }
 
         public UseExtras()
@@ -657,12 +1082,12 @@ public UseExtras()
         }
     }
 
-    [XmlRoot(ElementName = "CRUISE")]
+
     public class CRUISE
     {
-        [XmlElement(ElementName = "DisableAtLstg3")]
+
         public bool DisableAtLstg3 { get; set; }
-        [XmlElement(ElementName = "UseExtras")]
+
         public UseExtras UseExtras { get; set; }
 
         public CRUISE()
@@ -672,30 +1097,30 @@ public CRUISE()
         }
     }
 
-    [XmlRoot(ElementName = "Headlights")]
+
     public class AcoronaLights
     {
-        [XmlAttribute(AttributeName = "DfltPattern")]
+
         public int DfltPattern { get; set; }
-        [XmlAttribute(AttributeName = "ColorL")]
+
         public string ColorL { get; set; }
-        [XmlAttribute(AttributeName = "ColorR")]
+
         public string ColorR { get; set; }
     }
 
 
-    [XmlRoot(ElementName = "ACORONAS")]
+
     public class ACORONAS
     {
-        [XmlElement(ElementName = "Headlights")]
+
         public AcoronaLights Headlights { get; set; }
-        [XmlElement(ElementName = "TailLights")]
+
         public AcoronaLights TailLights { get; set; }
-        [XmlElement(ElementName = "IndicatorsF")]
+
         public AcoronaLights IndicatorsF { get; set; }
-        [XmlElement(ElementName = "IndicatorsB")]
+
         public AcoronaLights IndicatorsB { get; set; }
-        [XmlElement(ElementName = "ReverseLights")]
+
         public AcoronaLights ReverseLights { get; set; }
 
         public ACORONAS()
@@ -708,54 +1133,56 @@ public ACORONAS()
         }
     }
 
-    [XmlRoot(ElementName = "MainHorn")]
+
     public class MainHorn
     {
-        [XmlAttribute(AttributeName = "InterruptsSiren")]
+
         public bool InterruptsSiren { get; set; }
-        [XmlAttribute(AttributeName = "AudioString")]
+
         public string AudioString { get; set; }
     }
 
     public class SrnTone
     {
-        [XmlAttribute(AttributeName = "AllowUse")]
+
         public bool AllowUse { get; set; }
-        [XmlAttribute(AttributeName = "AudioString")]
+
         public string AudioString { get; set; }
     }
 
-    public class PatternTone
+    public class TonePattern
     {
         public bool Enabled { get; set; }
-        public int Pattern { get; set; }
+        public string Pattern { get; set; }
+        public int IntPattern { get; set; }
 
-        public PatternTone()
+        public TonePattern()
         {
             Enabled = false;
+            IntPattern = -1;
         }
     }
 
-    [XmlRoot(ElementName = "SOUNDS")]
+
     public class SOUNDS
     {
-        [XmlElement(ElementName = "MainHorn")]
+
         public MainHorn MainHorn { get; set; }
-        [XmlElement(ElementName = "ManTone1")]
+
         public SrnTone ManTone1 { get; set; }
-        [XmlElement(ElementName = "ManTone2")]
+
         public SrnTone ManTone2 { get; set; }
-        [XmlElement(ElementName = "SrnTone1")]
+
         public SrnTone SrnTone1 { get; set; }
-        [XmlElement(ElementName = "SrnTone2")]
+
         public SrnTone SrnTone2 { get; set; }
-        [XmlElement(ElementName = "SrnTone3")]
+
         public SrnTone SrnTone3 { get; set; }
-        [XmlElement(ElementName = "SrnTone4")]
+
         public SrnTone SrnTone4 { get; set; }
-        [XmlElement(ElementName = "AuxSiren")]
+
         public SrnTone AuxSiren { get; set; }
-        [XmlElement(ElementName = "PanicMde")]
+
         public SrnTone PanicMde { get; set; }
 
         public SOUNDS()
@@ -772,14 +1199,14 @@ public SOUNDS()
         }
     }
 
-    [XmlRoot(ElementName = "PresetPatterns")]
+
     public class PresetPatterns
     {
-        [XmlElement(ElementName = "Lstg3")]
+
         public Lstg Lstg3 { get; set; }
-        [XmlElement(ElementName = "Lstg2")]
+
         public Lstg Lstg2 { get; set; }
-        [XmlElement(ElementName = "Lstg1")]
+
         public Lstg Lstg1 { get; set; }
 
         public PresetPatterns()
@@ -790,44 +1217,48 @@ public PresetPatterns()
         }
     }
 
-    [XmlRoot(ElementName = "ForcedPatterns")]
+
     public class ForcedPatterns
     {
-        [XmlElement(ElementName = "MainHorn")]
-        public PatternTone MainHorn { get; set; }
-        [XmlElement(ElementName = "SrnTone1")]
-        public PatternTone SrnTone1 { get; set; }
-        [XmlElement(ElementName = "SrnTone2")]
-        public PatternTone SrnTone2 { get; set; }
-        [XmlElement(ElementName = "SrnTone3")]
-        public PatternTone SrnTone3 { get; set; }
-        [XmlElement(ElementName = "SrnTone4")]
-        public PatternTone SrnTone4 { get; set; }
-        [XmlElement(ElementName = "PanicMde")]
-        public PatternTone PanicMde { get; set; }
-        [XmlElement(ElementName = "OutOfVeh")]
-        public PatternTone OutOfVeh { get; set; }
+
+        public TonePattern MainHorn { get; set; }
+
+        public TonePattern SrnTone1 { get; set; }
+
+        public TonePattern SrnTone2 { get; set; }
+
+        public TonePattern SrnTone3 { get; set; }
+
+        public TonePattern SrnTone4 { get; set; }
+
+        public TonePattern PanicMde { get; set; }
+
+        public TonePattern AuxSiren { get; set; }
+
+
+        public TonePattern OutOfVeh { get; set; }
 
         public ForcedPatterns()
         {
-            MainHorn = new PatternTone();
-            SrnTone1 = new PatternTone();
-            SrnTone2 = new PatternTone();
-            SrnTone3 = new PatternTone();
-            SrnTone4 = new PatternTone();
-            PanicMde = new PatternTone();
-            OutOfVeh = new PatternTone();
+            MainHorn = new TonePattern();
+            SrnTone1 = new TonePattern();
+            SrnTone2 = new TonePattern();
+            SrnTone3 = new TonePattern();
+            SrnTone4 = new TonePattern();
+            AuxSiren = new TonePattern();
+            PanicMde = new TonePattern();
+            OutOfVeh = new TonePattern();
         }
     }
 
-    [XmlRoot(ElementName = "ScanPatternCustomPool")]
+
     public class ScanPatternCustomPool
     {
-        [XmlElement(ElementName = "Pattern")]
+
         public List<int> Pattern { get; set; }
-        [XmlAttribute(AttributeName = "Enabled")]
+
         public bool Enabled { get; set; }
-        [XmlAttribute(AttributeName = "Sequential")]
+
         public bool Sequential { get; set; }
 
         public ScanPatternCustomPool()
@@ -838,24 +1269,24 @@ public ScanPatternCustomPool()
 
     public class Lstg
     {
-        [XmlAttribute(AttributeName = "Enabled")]
+
         public bool Enabled { get; set; }
-        [XmlAttribute(AttributeName = "Pattern")]
-        public int IntPattern { get { return int.Parse(Pattern); } }
+
+        public int IntPattern { get; set; }
         public string Pattern { get; set; }
     }
 
     public class Lights
     {
-        [XmlElement(ElementName = "PresetPatterns")]
+
         public PresetPatterns PresetPatterns { get; set; }
-        [XmlElement(ElementName = "ForcedPatterns")]
+
         public ForcedPatterns ForcedPatterns { get; set; }
-        [XmlElement(ElementName = "ScanPatternCustomPool")]
+
         public ScanPatternCustomPool ScanPatternCustomPool { get; set; }
-        [XmlAttribute(AttributeName = "LightingFormat")]
+
         public string LightingFormat { get; set; }
-        [XmlAttribute(AttributeName = "ExtrasActiveAtLstg2")]
+
         public string ExtrasActiveAtLstg1 { get; set; }
         public string ExtrasActiveAtLstg2 { get; set; }
         public string ExtrasActiveAtLstg3 { get; set; }
@@ -870,32 +1301,34 @@ public Lights()
         }
     }
 
-    [XmlRoot(ElementName = "vcfroot")]
+
     public class Vcfroot
     {
-        [XmlElement(ElementName = "INTERFACE")]
+
         public INTERFACE INTERFACE { get; set; }
-        [XmlElement(ElementName = "EOVERRIDE")]
+
         public EOVERRIDE EOVERRIDE { get; set; }
-        [XmlElement(ElementName = "MISC")]
+
         public MISC MISC { get; set; }
-        [XmlElement(ElementName = "CRUISE")]
+
         public CRUISE CRUISE { get; set; }
-        [XmlElement(ElementName = "ACORONAS")]
+
         public ACORONAS ACORONAS { get; set; }
-        [XmlElement(ElementName = "SOUNDS")]
+
         public SOUNDS SOUNDS { get; set; }
-        [XmlElement(ElementName = "WRNL")]
+
         public Lights WRNL { get; set; }
-        [XmlElement(ElementName = "PRML")]
+
         public Lights PRML { get; set; }
-        [XmlElement(ElementName = "SECL")]
+
         public Lights SECL { get; set; }
-        [XmlAttribute(AttributeName = "Description")]
+
         public string Description { get; set; }
-        [XmlAttribute(AttributeName = "Author")]
+
         public string Author { get; set; }
 
+        public Dictionary<string, Light.Patterns.CustomPattern> CustomPatterns { get; set; }
+
         public Vcfroot()
         {
             INTERFACE = new INTERFACE();
diff --git a/src/ELS-FiveM.sln b/src/elsplus.sln
similarity index 100%
rename from src/ELS-FiveM.sln
rename to src/elsplus.sln
diff --git a/src/extentions.cs b/src/extentions.cs
index 5d722cf..7b75d57 100644
--- a/src/extentions.cs
+++ b/src/extentions.cs
@@ -9,7 +9,7 @@ public static class Extentions
     {
         public static bool IsEls(this Vehicle vehicle)
         {
-            return configuration.VCF.ELSVehicle.Exists(obj => obj.modelHash == vehicle.Model);
+            return configuration.VCF.ELSVehicle.ContainsKey(vehicle.Model);
         }
         
         public static bool IsSittingInELSVehicle(this Ped ped)
diff --git a/src/panel/test.cs b/src/panel/test.cs
deleted file mode 100644
index ac6a561..0000000
--- a/src/panel/test.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
-    ELS FiveM - A ELS implementation for FiveM
-    Copyright (C) 2017  E.J. Bevenour
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using CitizenFX.Core;
-using CitizenFX.Core.Native;
-
-namespace ELS.panel
-{
-    class test
-    {
-        uint[] somestruct = new uint[]
-       {
-            204,
-            204,
-            204,
-            0,
-            0,
-            0,
-            11,
-            11,
-            11,
-            7,
-            7,
-            7,
-            16,
-            16,
-            16,
-            10,
-            10,
-            10,
-            156,
-            161,
-            164,
-            165,
-            23,
-            21,
-            32,
-            33,
-            33,
-            165,
-            23,
-            21,
-            179,
-            150,
-            42,
-            13,
-            84,
-            134,
-            215,
-            135,
-            110,
-            170,
-            75,
-            50,
-            150,
-            218,
-            126,
-            50,
-            170,
-            55,
-            115,
-            180,
-            220,
-            50,
-            130,
-            175,
-            214,
-            115,
-            109,
-            140,
-            30,
-            30,
-            205,
-            205,
-            120,
-            169,
-            122,
-            52
-        };
-
-        private int infoPanelButtonColor = 19;
-
-        public test()
-        {
-
-        }
-
-        public void draw()
-        {
-            drawScaledRect(160.0f, 1722.5f, 1000.0f, 395.0f, 1, 255);
-            // v3 = 2;        
-            drawScaledRect(158.0f, 1722.5f, 1000.0f, 393.0f, 2, 255);
-            drawScaledRect(150.0f, 1722.5f, 1000.0f, 385.0f, 3, 255);
-            drawScaledRect(146.0f, 1722.5f, 1000.0f, 381.0f, 4, 255);
-            drawScaledRect(25.0f, 1722.5f, 941.5f, 377.0f, 5, 255);
-            //v16 = map_entity_data_index(&g_entityDataMap, &a2a);
-            //v155 = 255;
-            drawScaledRect(21.0f, 1722.5f, 941.5f, 373.0f, 11, 255);
-            drawScaledRect(115.0f, 1722.5f, 1013.5f, 377.0f, 5, 255);
-            drawScaledRect(111.0f, 1722.5f, 1013.5f, 373.0f, 4, 255);
-            drawScaledRect(42.0f, 1560.0f, 982.0f, 42.0f, 1, 255);
-            drawScaledRect(42.0f, 1606.0f, 982.0f, 42.0f, 1, 255);
-            drawScaledRect(42.0f, 1652.0f, 982.0f, 42.0f, 1, 255);
-            drawScaledRect(42.0f, 1560.0f, 1028.0f, 42.0f, 1, 255);
-            drawScaledRect(42.0f, 1606.0f, 1028.0f, 42.0f, 1, 255);
-            drawScaledRect(42.0f, 1652.0f, 1028.0f, 42.0f, 1, 255);
-            drawScaledRect(74.0f, 1722.5f, 1005.0f, 77.0f, 1, 255);
-            drawScaledRect(42.0f, 1793.0f, 982.0f, 42.0f, 1, 255);
-            drawScaledRect(42.0f, 1793.0f, 1028.0f, 42.0f, 1, 255);
-            drawScaledRect(42.0f, 1839.0f, 1028.0f, 42.0f, 1, 255);
-            drawScaledRect(42.0f, 1885.0f, 1028.0f, 42.0f, 1, 255);
-            var v154 = 6;
-            if (false) //if ltgstage is 3
-            {
-                drawScaledRect(42.0f, 1862.0f, 982.0f, 88.0f, 1, 255);
-                drawScaledRect(38.0f, 1862.0f, 982.0f, 84.0f, 17, 255);
-                v154 = 16; //or 16
-                drawScaledRect(36.0f, 1862.0f, 982.0f, 82.0f, v154, 255);
-            }
-            else
-            {//try 15 192
-                drawScaledRect(36.0f, 1862.0f, 982.0f, 82.0f, v154, 255);
-                drawScaledRect(13.0f, 1609.0f, 941.5f, 46.0f, infoPanelButtonColor, 255);
-                drawScaledRect(13.0f, 1657.0f, 941.5f, 46.0f, infoPanelButtonColor, 255);
-                drawScaledRect(13.0f, 1705.0f, 941.5f, 46.0f, infoPanelButtonColor, 255);
-                drawScaledRect(11.0f, 1609.0f, 941.5f, 44.0f, 6, 255);
-                drawScaledRect(13.0f, 1657.0f, 941.5f, 46.0f, 15, 255);
-                drawScaledRect(13.0f, 1705.0f, 941.5f, 46.0f, infoPanelButtonColor, 255);
-                drawScaledRect(11.0f, 1609.0f, 941.5f, 44.0f, 15, 255);
-                drawScaledRect(11.0f, 1657.0f, 941.5f, 44.0f, 17, 255);//inner top of labels
-                drawScaledRect(11.0f, 1705.0f, 941.5f, 44.0f, 15, 255);
-            }
-        }
-
-        private void drawScaledRect(float height, float xposf, float yposf, float width, int a5,
-            uint alphaChannel)
-        {
-            var resolution = CitizenFX.Core.UI.Screen.Resolution;
-            DRAW_RECT(
-                3 * (int)width,
-                (xposf * 0.66666669f) * (1.0f / resolution.Width),
-                (yposf * 0.66666669f) * (1.0f / resolution.Height),
-                (width * 0.66666669f) * (1.0f / resolution.Width),
-                (height * 0.66666669f) * (1.0f / resolution.Height),
-                somestruct[3 * a5],
-                somestruct[3 * a5 + 1],
-                somestruct[3 * a5 + 2],
-                alphaChannel);
-            //throw new NotImplementedException();
-        }
-
-        private void DRAW_RECT(int unussed, float xpos, float ypos, float width, float height, uint r, uint g, uint b, uint a)
-        {
-            //CitizenFX.Core.Native.Function.Call(Hash.DRAW_RECT, 0.5f, 0f, 0.5f, 0.5f, 128, 128, 128, 255);
-            CitizenFX.Core.Native.Function.Call(Hash.DRAW_RECT, xpos, ypos, width, height, r, g, b, a);
-        }
-    }
-}