diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c8fa996
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/include/Logs
\ No newline at end of file
diff --git a/Client/Client.deps.json b/Client/Client.deps.json
index 8a1fc07..8dae8d8 100644
--- a/Client/Client.deps.json
+++ b/Client/Client.deps.json
@@ -9,7 +9,8 @@
       "Client/1.0.0": {
         "dependencies": {
           "NAudio": "2.2.1",
-          "Newtonsoft.Json": "13.0.3"
+          "Newtonsoft.Json": "13.0.3",
+          "NuGet.Versioning": "6.10.1"
         },
         "runtime": {
           "Client.dll": {}
@@ -111,6 +112,14 @@
           }
         }
       },
+      "NuGet.Versioning/6.10.1": {
+        "runtime": {
+          "lib/netstandard2.0/NuGet.Versioning.dll": {
+            "assemblyVersion": "6.10.1.5",
+            "fileVersion": "6.10.1.5"
+          }
+        }
+      },
       "System.Security.AccessControl/4.7.0": {
         "dependencies": {
           "Microsoft.NETCore.Platforms": "3.1.0",
@@ -196,6 +205,13 @@
       "path": "newtonsoft.json/13.0.3",
       "hashPath": "newtonsoft.json.13.0.3.nupkg.sha512"
     },
+    "NuGet.Versioning/6.10.1": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-tovHZ3OlMVmsTdhv2z5nwnnhoA1ryhfJMyVQ9/+iv6d3h78fp230XaGy3K/iVcLwB50DdfNfIsitW97KSOWDFg==",
+      "path": "nuget.versioning/6.10.1",
+      "hashPath": "nuget.versioning.6.10.1.nupkg.sha512"
+    },
     "System.Security.AccessControl/4.7.0": {
       "type": "package",
       "serviceable": true,
diff --git a/Client/Client.dll b/Client/Client.dll
index 036bca8..8dd059f 100644
Binary files a/Client/Client.dll and b/Client/Client.dll differ
diff --git a/Client/Client.pdb b/Client/Client.pdb
index a50cc41..ddaae61 100644
Binary files a/Client/Client.pdb and b/Client/Client.pdb differ
diff --git a/Client/ClientUpdater.deps.json b/Client/ClientUpdater.deps.json
new file mode 100644
index 0000000..91aca27
--- /dev/null
+++ b/Client/ClientUpdater.deps.json
@@ -0,0 +1,23 @@
+{
+  "runtimeTarget": {
+    "name": ".NETCoreApp,Version=v8.0",
+    "signature": ""
+  },
+  "compilationOptions": {},
+  "targets": {
+    ".NETCoreApp,Version=v8.0": {
+      "ClientUpdater/1.0.0": {
+        "runtime": {
+          "ClientUpdater.dll": {}
+        }
+      }
+    }
+  },
+  "libraries": {
+    "ClientUpdater/1.0.0": {
+      "type": "project",
+      "serviceable": false,
+      "sha512": ""
+    }
+  }
+}
\ No newline at end of file
diff --git a/Client/ClientUpdater.dll b/Client/ClientUpdater.dll
new file mode 100644
index 0000000..5f1a94e
Binary files /dev/null and b/Client/ClientUpdater.dll differ
diff --git a/Client/ClientUpdater.exe b/Client/ClientUpdater.exe
new file mode 100644
index 0000000..6b81032
Binary files /dev/null and b/Client/ClientUpdater.exe differ
diff --git a/Client/ClientUpdater.pdb b/Client/ClientUpdater.pdb
new file mode 100644
index 0000000..2dd9008
Binary files /dev/null and b/Client/ClientUpdater.pdb differ
diff --git a/Client/ClientUpdater.runtimeconfig.json b/Client/ClientUpdater.runtimeconfig.json
new file mode 100644
index 0000000..8fbd17c
--- /dev/null
+++ b/Client/ClientUpdater.runtimeconfig.json
@@ -0,0 +1,19 @@
+{
+  "runtimeOptions": {
+    "tfm": "net8.0",
+    "frameworks": [
+      {
+        "name": "Microsoft.NETCore.App",
+        "version": "8.0.0"
+      },
+      {
+        "name": "Microsoft.WindowsDesktop.App",
+        "version": "8.0.0"
+      }
+    ],
+    "configProperties": {
+      "System.Reflection.Metadata.MetadataUpdater.IsSupported": false,
+      "System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization": true
+    }
+  }
+}
\ No newline at end of file
diff --git a/Client/NuGet.Versioning.dll b/Client/NuGet.Versioning.dll
new file mode 100644
index 0000000..440a2ce
Binary files /dev/null and b/Client/NuGet.Versioning.dll differ
diff --git a/Client/include/airbases/Airbases.json b/Client/include/airbases/Airbases.json
new file mode 100644
index 0000000..26c9ff7
--- /dev/null
+++ b/Client/include/airbases/Airbases.json
@@ -0,0 +1,468 @@
+{
+  "Caucasus": {
+    "URKA": {
+      "lat": 45.013174733772,
+      "lon": 37.359783477556
+    },
+    "URKL": {
+      "lat": 45.087429883845,
+      "lon": 38.925202300775
+    },
+    "URKN": {
+      "lat": 44.673329604127,
+      "lon": 37.78622606048
+    },
+    "URKW": {
+      "lat": 44.961383022734,
+      "lon": 37.985886938697
+    },
+    "URKH": {
+      "lat": 44.671440257355,
+      "lon": 40.021427482236
+    },
+    "URKG": {
+      "lat": 44.567674586004,
+      "lon": 38.004146350528
+    },
+    "URSS": {
+      "lat": 43.439378434051,
+      "lon": 39.924231880466
+    },
+    "URKK": {
+      "lat": 45.046099641543,
+      "lon": 39.203066906325
+    },
+    "UGSS": {
+      "lat": 42.852741071635,
+      "lon": 41.142447588488
+    },
+    "UG23": {
+      "lat": 43.124233340197,
+      "lon": 40.564175768401
+    },
+    "UGSB": {
+      "lat": 41.603279859649,
+      "lon": 41.60927548351
+    },
+    "UGKS": {
+      "lat": 42.238728081573,
+      "lon": 42.061021312856
+    },
+    "UG5X": {
+      "lat": 41.932105353453,
+      "lon": 41.876483823101
+    },
+    "UGKO": {
+      "lat": 42.17915393769,
+      "lon": 42.4956840774
+    },
+    "URMM": {
+      "lat": 44.218646823807,
+      "lon": 43.100679733081
+    },
+    "URMN": {
+      "lat": 43.51007143853,
+      "lon": 43.625108736098
+    },
+    "XRMF": {
+      "lat": 43.791303250938,
+      "lon": 44.620327262102
+    },
+    "UGTB": {
+      "lat": 41.674720064437,
+      "lon": 44.946875226153
+    },
+    "UG24": {
+      "lat": 41.641163266787,
+      "lon": 44.947183065317
+    },
+    "UG27": {
+      "lat": 41.637735936262,
+      "lon": 45.01909093846
+    },
+    "URMO": {
+      "lat": 43.208500987381,
+      "lon": 44.588922553543
+    }
+  },
+  "Syria": {
+    "OS57": {
+      "lat": 35.731462428174,
+      "lon": 37.118801734534
+    },
+    "LTAF": {
+      "lat": 36.988281127829,
+      "lon": 35.291372307265
+    },
+    "OS70": {
+      "lat": 34.566877297302,
+      "lon": 36.5854147754
+    },
+    "OS64": {
+      "lat": 33.92656597361,
+      "lon": 36.875344527767
+    },
+    "OS60": {
+      "lat": 32.698127092337,
+      "lon": 36.402739209399
+    },
+    "OLBA": {
+      "lat": 33.836465479357,
+      "lon": 35.487416760577
+    },
+    "OSDI": {
+      "lat": 33.415340013895,
+      "lon": 36.504254828586
+    },
+    "OMAS": {
+      "lat": 33.487483451402,
+      "lon": 36.475050826595
+    },
+    "OS61": {
+      "lat": 33.604657449318,
+      "lon": 36.735832718421
+    },
+    "LLES": {
+      "lat": 32.439769207088,
+      "lon": 35.014693873498
+    },
+    "LTAJ": {
+      "lat": 36.951397233614,
+      "lon": 37.464512889798
+    },
+    "OJHR": {
+      "lat": 32.536851104207,
+      "lon": 38.206376228872
+    },
+    "LLHA": {
+      "lat": 32.80645293353,
+      "lon": 35.04502076035
+    },
+    "OS58": {
+      "lat": 35.116099484431,
+      "lon": 36.72547347191
+    },
+    "LTDA": {
+      "lat": 36.371269972814,
+      "lon": 36.298090184913
+    },
+    "LTAG": {
+      "lat": 36.994254281542,
+      "lon": 35.412713065757
+    },
+    "OS62": {
+      "lat": 36.094487121629,
+      "lon": 37.951086106528
+    },
+    "OS69": {
+      "lat": 33.06361028266,
+      "lon": 36.559784748722
+    },
+    "OJMF": {
+      "lat": 32.348793954817,
+      "lon": 36.270213489366
+    },
+    "LLKS": {
+      "lat": 33.212372031645,
+      "lon": 35.592419825247
+    },
+    "OSLK": {
+      "lat": 35.411589930353,
+      "lon": 35.95003283514
+    },
+    "OMAN": {
+      "lat": 33.500422745428,
+      "lon": 36.466321617972
+    },
+    "OS63": {
+      "lat": 33.279509844412,
+      "lon": 36.446981161337
+    },
+    "LLMG": {
+      "lat": 32.597577825283,
+      "lon": 35.220203449454
+    },
+    "OS67": {
+      "lat": 33.482713511778,
+      "lon": 36.235064059083
+    },
+    "OS71": {
+      "lat": 36.522812218953,
+      "lon": 37.033622455645
+    },
+    "OSAP": {
+      "lat": 36.182211524331,
+      "lon": 37.210383232385
+    },
+    "OSPR": {
+      "lat": 34.558235536659,
+      "lon": 38.331123062337
+    },
+    "OQAS": {
+      "lat": 33.458606617206,
+      "lon": 36.356880859456
+    },
+    "LLRD": {
+      "lat": 32.674025544788,
+      "lon": 35.178119934482
+    },
+    "OS66": {
+      "lat": 36.18937442608,
+      "lon": 37.570439309206
+    },
+    "OLRA": {
+      "lat": 33.84290182523,
+      "lon": 35.976931824797
+    },
+    "OLKA": {
+      "lat": 34.583953310218,
+      "lon": 35.9986872567
+    },
+    "LLIB": {
+      "lat": 32.97928167649,
+      "lon": 35.572651208285
+    },
+    "OS68": {
+      "lat": 33.680052164369,
+      "lon": 37.204068911005
+    },
+    "OS65": {
+      "lat": 34.494640308217,
+      "lon": 36.894468654443
+    },
+    "OS59": {
+      "lat": 35.755613770805,
+      "lon": 38.551250775516
+    },
+    "OTAF": {
+      "lat": 35.973223381816,
+      "lon": 36.785894108748
+    },
+    "OS72": {
+      "lat": 34.522531432479,
+      "lon": 37.645765105063
+    },
+    "Z19O": {
+      "lat": 34.286960508475,
+      "lon": 35.683990308563
+    },
+    "LTFG": {
+      "lat": 36.297823085147,
+      "lon": 32.286068490305
+    },
+    "OSDZ": {
+      "lat": 35.280828897833,
+      "lon": 40.190671143219
+    },
+    "LCNC": {
+      "lat": 35.150919822632,
+      "lon": 33.275002451661
+    },
+    "LCRA": {
+      "lat": 34.594065664734,
+      "lon": 32.974818319372
+    },
+    "LCRE": {
+      "lat": 35.016621196807,
+      "lon": 33.721655835024
+    },
+    "LCPH": {
+      "lat": 34.72239325815,
+      "lon": 32.471801697209
+    },
+    "LCLK": {
+      "lat": 34.865619667975,
+      "lon": 33.613584325006
+    },
+    "CY01": {
+      "lat": 35.106311731529,
+      "lon": 33.321670653775
+    },
+    "LCEN": {
+      "lat": 35.159249791336,
+      "lon": 33.49011058133
+    },
+    "LCGK": {
+      "lat": 35.236403909864,
+      "lon": 33.707277702803
+    },
+    "CY03": {
+      "lat": 35.278334798852,
+      "lon": 33.26701429987
+    },
+    "LNAQ": {
+      "lat": 33.107906290458,
+      "lon": 35.127285028127
+    },
+    "IQ18": {
+      "lat": 32.940993052246,
+      "lon": 39.732582868536
+    },
+    "IQ20": {
+      "lat": 33.070356444511,
+      "lon": 39.60662588777
+    },
+    "IQ21": {
+      "lat": 32.738030133825,
+      "lon": 39.612247285995
+    },
+    "IQ40": {
+      "lat": 32.403696420912,
+      "lon": 39.142215977076
+    },
+    "LTCS": {
+      "lat": 37.460456062347,
+      "lon": 38.912852189935
+    },
+    "OKIS": {
+      "lat": 36.546920822448,
+      "lon": 38.587524390197
+    },
+    "OTSM": {
+      "lat": 36.263473166914,
+      "lon": 38.924054611964
+    },
+    "OATA": {
+      "lat": 33.506450704749,
+      "lon": 38.614883357324
+    },
+    "OJPH": {
+      "lat": 32.152160716832,
+      "lon": 37.160581283742
+    },
+    "OJKA": {
+      "lat": 31.999536588953,
+      "lon": 36.231477740268
+    },
+    "LLHZ": {
+      "lat": 32.178557007772,
+      "lon": 34.839785350037
+    },
+    "OJAM": {
+      "lat": 31.978338599509,
+      "lon": 36.00602774882
+    },
+    "OJMS": {
+      "lat": 31.819163353569,
+      "lon": 36.790772280098
+    }
+  },
+  "PersianGulf": {
+    "OIBA": {
+      "lat": 25.875041761239,
+      "lon": 55.021382072783
+    },
+    "OIKB": {
+      "lat": 27.203638553985,
+      "lon": 56.3703560378
+    },
+    "OIBL": {
+      "lat": 26.530817420578,
+      "lon": 54.813116140778
+    },
+    "OMAM": {
+      "lat": 24.25792911231,
+      "lon": 54.534202504328
+    },
+    "OMDB": {
+      "lat": 25.248265300858,
+      "lon": 55.379295777402
+    },
+    "OMDW": {
+      "lat": 24.888624487709,
+      "lon": 55.174919966811
+    },
+    "OMFJ": {
+      "lat": 25.105735807567,
+      "lon": 56.340423943738
+    },
+    "OIGI": {
+      "lat": 26.251538702312,
+      "lon": 55.311280020098
+    },
+    "OIKP": {
+      "lat": 27.159927526116,
+      "lon": 56.183089447173
+    },
+    "OOKB": {
+      "lat": 26.179806360704,
+      "lon": 56.24317158197
+    },
+    "OISL": {
+      "lat": 27.674804842122,
+      "lon": 54.368317250382
+    },
+    "OMDM": {
+      "lat": 25.026805920475,
+      "lon": 55.383678016973
+    },
+    "OIKQ": {
+      "lat": 26.76633161238,
+      "lon": 55.918070160223
+    },
+    "OMSJ": {
+      "lat": 25.322796067752,
+      "lon": 55.531388153673
+    },
+    "OIBS": {
+      "lat": 25.903343862392,
+      "lon": 54.548214653399
+    },
+    "OITK": {
+      "lat": 26.243605485601,
+      "lon": 55.149352101732
+    },
+    "OMSN": {
+      "lat": 25.216154518016,
+      "lon": 54.23693990531
+    },
+    "OIKK": {
+      "lat": 30.257695568151,
+      "lon": 56.958269051762
+    },
+    "OISS": {
+      "lat": 29.533103964275,
+      "lon": 52.609894223947
+    },
+    "OMNK": {
+      "lat": 24.448211362508,
+      "lon": 54.514696522843
+    },
+    "OIZJ": {
+      "lat": 25.650484470488,
+      "lon": 57.792125537415
+    },
+    "OMAA": {
+      "lat": 24.464722760717,
+      "lon": 54.639226001065
+    },
+    "OMAD": {
+      "lat": 24.434059322946,
+      "lon": 54.450706215697
+    },
+    "OIBK": {
+      "lat": 26.529651099908,
+      "lon": 53.964909162786
+    },
+    "OMAL": {
+      "lat": 24.276767283196,
+      "lon": 55.611735832913
+    },
+    "OIBV": {
+      "lat": 26.815354172873,
+      "lon": 53.3416042246
+    },
+    "OIKJ": {
+      "lat": 28.731593220974,
+      "lon": 57.664118826397
+    },
+    "OMRK": {
+      "lat": 25.602262321804,
+      "lon": 55.941864730965
+    },
+    "OMLW": {
+      "lat": 23.660697450016,
+      "lon": 53.812497591899
+    }
+  }
+}
\ No newline at end of file
diff --git a/Client/include/beacons/Caucasus.json b/Client/include/beacons/Caucasus.json
new file mode 100644
index 0000000..c9b7ddb
--- /dev/null
+++ b/Client/include/beacons/Caucasus.json
@@ -0,0 +1,1478 @@
+[
+  {
+    "callsign": "AP",
+    "channel": "",
+    "name": "Anapa-Vityazevo",
+    "frequency": "443000",
+    "lat": "45.039907",
+    "lon": "37.396435",
+    "type": "ILS_FAR_HOMER"
+  },
+  {
+    "callsign": "P",
+    "channel": "",
+    "name": "Anapa-Vityazevo",
+    "frequency": "215000",
+    "lat": "45.022628",
+    "lon": "37.372401",
+    "type": "ILS_NEAR_HOMER"
+  },
+  {
+    "callsign": "AN",
+    "channel": "",
+    "name": "Anapa-Vityazevo",
+    "frequency": "443000",
+    "lat": "44.969992",
+    "lon": "37.299308",
+    "type": "ILS_FAR_HOMER"
+  },
+  {
+    "callsign": "N",
+    "channel": "",
+    "name": "Anapa-Vityazevo",
+    "frequency": "215000",
+    "lat": "44.987288",
+    "lon": "37.323297",
+    "type": "ILS_NEAR_HOMER"
+  },
+  {
+    "callsign": "ILU",
+    "channel": "",
+    "name": "Batumi",
+    "frequency": "110300000",
+    "lat": "41.601731",
+    "lon": "41.612203",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "ILU",
+    "channel": "",
+    "name": "Batumi",
+    "frequency": "110300000",
+    "lat": "41.613985",
+    "lon": "41.591406",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "BTM",
+    "channel": "16",
+    "name": "Batumi",
+    "frequency": "977000000",
+    "lat": "41.610899",
+    "lon": "41.600419",
+    "type": "TACAN"
+  },
+  {
+    "callsign": "LU",
+    "channel": "",
+    "name": "Batumi",
+    "frequency": "430000",
+    "lat": "41.602594",
+    "lon": "41.613238",
+    "type": "AIRPORT_HOMER"
+  },
+  {
+    "callsign": "CX",
+    "channel": "",
+    "name": "Beslan",
+    "frequency": "1050000",
+    "lat": "43.2155",
+    "lon": "44.539874",
+    "type": "ILS_FAR_HOMER"
+  },
+  {
+    "callsign": "C",
+    "channel": "",
+    "name": "Beslan",
+    "frequency": "250000",
+    "lat": "43.210717",
+    "lon": "44.5721",
+    "type": "ILS_NEAR_HOMER"
+  },
+  {
+    "callsign": "ICH",
+    "channel": "",
+    "name": "Beslan",
+    "frequency": "110500000",
+    "lat": "43.202754",
+    "lon": "44.62558",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "ICH",
+    "channel": "",
+    "name": "Beslan",
+    "frequency": "110500000",
+    "lat": "43.2068",
+    "lon": "44.591083",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "GN",
+    "channel": "",
+    "name": "Gelendzhik",
+    "frequency": "1000000",
+    "lat": "44.569658",
+    "lon": "38.008795",
+    "type": "AIRPORT_HOMER"
+  },
+  {
+    "callsign": "GN",
+    "channel": "90",
+    "name": "Gelendzhik",
+    "frequency": "114300000",
+    "lat": "44.572498",
+    "lon": "38.012222",
+    "type": "VOR"
+  },
+  {
+    "callsign": "XC",
+    "channel": "",
+    "name": "Gudauta",
+    "frequency": "395000",
+    "lat": "43.099003",
+    "lon": "40.578961",
+    "type": "AIRPORT_HOMER_WITH_MARKER"
+  },
+  {
+    "callsign": "KT",
+    "channel": "",
+    "name": "Kobuleti",
+    "frequency": "870000",
+    "lat": "41.918616",
+    "lon": "41.802928",
+    "type": "ILS_FAR_HOMER"
+  },
+  {
+    "callsign": "T",
+    "channel": "",
+    "name": "Kobuleti",
+    "frequency": "490000",
+    "lat": "41.924494",
+    "lon": "41.834303",
+    "type": "ILS_NEAR_HOMER"
+  },
+  {
+    "callsign": "IKB",
+    "channel": "",
+    "name": "Kobuleti",
+    "frequency": "111500000",
+    "lat": "41.932878",
+    "lon": "41.879171",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "IKB",
+    "channel": "",
+    "name": "Kobuleti",
+    "frequency": "111500000",
+    "lat": "41.927403",
+    "lon": "41.85314",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "KBL",
+    "channel": "67",
+    "name": "Kobuleti",
+    "frequency": "1154000000",
+    "lat": "41.93077",
+    "lon": "41.86197",
+    "type": "TACAN"
+  },
+  {
+    "callsign": "OC",
+    "channel": "",
+    "name": "Krasnodar-Center",
+    "frequency": "625000",
+    "lat": "45.085828",
+    "lon": "39.012047",
+    "type": "ILS_FAR_HOMER"
+  },
+  {
+    "callsign": "O",
+    "channel": "",
+    "name": "Krasnodar-Center",
+    "frequency": "303000",
+    "lat": "45.086491",
+    "lon": "38.969263",
+    "type": "ILS_NEAR_HOMER"
+  },
+  {
+    "callsign": "MB",
+    "channel": "",
+    "name": "Krasnodar-Center",
+    "frequency": "625000",
+    "lat": "45.087925",
+    "lon": "38.873594",
+    "type": "ILS_FAR_HOMER"
+  },
+  {
+    "callsign": "M",
+    "channel": "",
+    "name": "Krasnodar-Center",
+    "frequency": "303000",
+    "lat": "45.087368",
+    "lon": "38.911608",
+    "type": "ILS_NEAR_HOMER"
+  },
+  {
+    "callsign": "MB",
+    "channel": "38",
+    "name": "Krasnodar-Center",
+    "frequency": "838000000",
+    "lat": "45.08652",
+    "lon": "38.967638",
+    "type": "PRMG_LOCALIZER"
+  },
+  {
+    "callsign": "MB",
+    "channel": "38",
+    "name": "Krasnodar-Center",
+    "frequency": "838000000",
+    "lat": "45.085808",
+    "lon": "38.928677",
+    "type": "PRMG_GLIDESLOPE"
+  },
+  {
+    "callsign": "MB",
+    "channel": "40",
+    "name": "Krasnodar-Center",
+    "frequency": "840000000",
+    "lat": "45.083171",
+    "lon": "38.927839",
+    "type": "RSBN"
+  },
+  {
+    "callsign": "KR",
+    "channel": "",
+    "name": "Krasnodar-Pashkovsky",
+    "frequency": "493000",
+    "lat": "45.006796",
+    "lon": "39.133081",
+    "type": "ILS_FAR_HOMER"
+  },
+  {
+    "callsign": "K",
+    "channel": "",
+    "name": "Krasnodar-Pashkovsky",
+    "frequency": "240000",
+    "lat": "45.021929",
+    "lon": "39.159769",
+    "type": "ILS_NEAR_HOMER"
+  },
+  {
+    "callsign": "LD",
+    "channel": "",
+    "name": "Krasnodar-Pashkovsky",
+    "frequency": "493000",
+    "lat": "45.069032",
+    "lon": "39.243028",
+    "type": "ILS_FAR_HOMER"
+  },
+  {
+    "callsign": "L",
+    "channel": "",
+    "name": "Krasnodar-Pashkovsky",
+    "frequency": "240000",
+    "lat": "45.053921",
+    "lon": "39.216297",
+    "type": "ILS_NEAR_HOMER"
+  },
+  {
+    "callsign": "KN",
+    "channel": "105",
+    "name": "Krasnodar-Pashkovsky",
+    "frequency": "115800000",
+    "lat": "45.020832",
+    "lon": "39.163887",
+    "type": "VOR"
+  },
+  {
+    "callsign": "KW",
+    "channel": "",
+    "name": "Krymsk",
+    "frequency": "408000",
+    "lat": "45.004894",
+    "lon": "38.043726",
+    "type": "ILS_FAR_HOMER"
+  },
+  {
+    "callsign": "K",
+    "channel": "",
+    "name": "Krymsk",
+    "frequency": "803000",
+    "lat": "44.983041",
+    "lon": "38.014927",
+    "type": "ILS_NEAR_HOMER"
+  },
+  {
+    "callsign": "OX",
+    "channel": "",
+    "name": "Krymsk",
+    "frequency": "408000",
+    "lat": "44.933004",
+    "lon": "37.949089",
+    "type": "ILS_FAR_HOMER"
+  },
+  {
+    "callsign": "O",
+    "channel": "",
+    "name": "Krymsk",
+    "frequency": "803000",
+    "lat": "44.951723",
+    "lon": "37.973692",
+    "type": "ILS_NEAR_HOMER"
+  },
+  {
+    "callsign": "OX",
+    "channel": "",
+    "name": "Krymsk",
+    "frequency": "826000000",
+    "lat": "44.960886",
+    "lon": "37.984323",
+    "type": "PRMG_GLIDESLOPE"
+  },
+  {
+    "callsign": "KW",
+    "channel": "",
+    "name": "Krymsk",
+    "frequency": "826000000",
+    "lat": "44.975894",
+    "lon": "38.004094",
+    "type": "PRMG_GLIDESLOPE"
+  },
+  {
+    "callsign": "KW",
+    "channel": "26",
+    "name": "Krymsk",
+    "frequency": "826000000",
+    "lat": "44.952449",
+    "lon": "37.974655",
+    "type": "PRMG_LOCALIZER"
+  },
+  {
+    "callsign": "OX",
+    "channel": "26",
+    "name": "Krymsk",
+    "frequency": "826000000",
+    "lat": "44.982907",
+    "lon": "38.01474",
+    "type": "PRMG_LOCALIZER"
+  },
+  {
+    "callsign": "KW",
+    "channel": "28",
+    "name": "Krymsk",
+    "frequency": "828000000",
+    "lat": "44.966653",
+    "lon": "37.996805",
+    "type": "RSBN"
+  },
+  {
+    "callsign": "IKS",
+    "channel": "",
+    "name": "Kutaisi",
+    "frequency": "109750000",
+    "lat": "42.179695",
+    "lon": "42.49782",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "IKS",
+    "channel": "",
+    "name": "Kutaisi",
+    "frequency": "109750000",
+    "lat": "42.175142",
+    "lon": "42.470274",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "TI",
+    "channel": "",
+    "name": "Kutaisi",
+    "frequency": "477000",
+    "lat": "42.174289",
+    "lon": "42.454567",
+    "type": "AIRPORT_HOMER_WITH_MARKER"
+  },
+  {
+    "callsign": "KTS",
+    "channel": "44",
+    "name": "Kutaisi",
+    "frequency": "1005000000",
+    "lat": "42.178443",
+    "lon": "42.479213",
+    "type": "TACAN"
+  },
+  {
+    "callsign": "KT",
+    "channel": "83",
+    "name": "Kutaisi",
+    "frequency": "113600000",
+    "lat": "42.174389",
+    "lon": "42.455276",
+    "type": "VOR"
+  },
+  {
+    "callsign": "BP",
+    "channel": "",
+    "name": "Tbilisi-Lochini",
+    "frequency": "342000",
+    "lat": "41.703274",
+    "lon": "44.909623",
+    "type": "ILS_FAR_HOMER"
+  },
+  {
+    "callsign": "B",
+    "channel": "",
+    "name": "Tbilisi-Lochini",
+    "frequency": "923000",
+    "lat": "41.685992",
+    "lon": "44.931895",
+    "type": "ILS_NEAR_HOMER"
+  },
+  {
+    "callsign": "IVP",
+    "channel": "",
+    "name": "Tbilisi-Lochini",
+    "frequency": "110300000",
+    "lat": "41.657953",
+    "lon": "44.967988",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "IVP",
+    "channel": "",
+    "name": "Tbilisi-Lochini",
+    "frequency": "110300000",
+    "lat": "41.674907",
+    "lon": "44.944184",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "NA",
+    "channel": "",
+    "name": "Tbilisi-Lochini",
+    "frequency": "211000",
+    "lat": "41.633231",
+    "lon": "44.999778",
+    "type": "ILS_FAR_HOMER"
+  },
+  {
+    "callsign": "N",
+    "channel": "",
+    "name": "Tbilisi-Lochini",
+    "frequency": "435000",
+    "lat": "41.650521",
+    "lon": "44.977543",
+    "type": "ILS_NEAR_HOMER"
+  },
+  {
+    "callsign": "INA",
+    "channel": "",
+    "name": "Tbilisi-Lochini",
+    "frequency": "108900000",
+    "lat": "41.678562",
+    "lon": "44.941458",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "INA",
+    "channel": "",
+    "name": "Tbilisi-Lochini",
+    "frequency": "108900000",
+    "lat": "41.661608",
+    "lon": "44.965264",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "TB",
+    "channel": "84",
+    "name": "Tbilisi-Lochini",
+    "frequency": "113700000",
+    "lat": "41.670555",
+    "lon": "44.946945",
+    "type": "VOR"
+  },
+  {
+    "callsign": "GTB",
+    "channel": "25",
+    "name": "Tbilisi-Lochini",
+    "frequency": "986000000",
+    "lat": "41.670577",
+    "lon": "44.930298",
+    "type": "TACAN"
+  },
+  {
+    "callsign": "RK",
+    "channel": "",
+    "name": "Maykop-Khanskaya",
+    "frequency": "289000",
+    "lat": "44.717443",
+    "lon": "40.084181",
+    "type": "ILS_FAR_HOMER"
+  },
+  {
+    "callsign": "R",
+    "channel": "",
+    "name": "Maykop-Khanskaya",
+    "frequency": "591000",
+    "lat": "44.698086",
+    "lon": "40.057981",
+    "type": "ILS_NEAR_HOMER"
+  },
+  {
+    "callsign": "DG",
+    "channel": "",
+    "name": "Maykop-Khanskaya",
+    "frequency": "289000",
+    "lat": "44.645015",
+    "lon": "39.986269",
+    "type": "ILS_FAR_HOMER"
+  },
+  {
+    "callsign": "D",
+    "channel": "",
+    "name": "Maykop-Khanskaya",
+    "frequency": "591000",
+    "lat": "44.664391",
+    "lon": "40.012421",
+    "type": "ILS_NEAR_HOMER"
+  },
+  {
+    "callsign": "DG",
+    "channel": "36",
+    "name": "Maykop-Khanskaya",
+    "frequency": "836000000",
+    "lat": "44.697894",
+    "lon": "40.057712",
+    "type": "PRMG_LOCALIZER"
+  },
+  {
+    "callsign": "DG",
+    "channel": "36",
+    "name": "Maykop-Khanskaya",
+    "frequency": "836000000",
+    "lat": "44.67207",
+    "lon": "40.024984",
+    "type": "PRMG_GLIDESLOPE"
+  },
+  {
+    "callsign": "DG",
+    "channel": "34",
+    "name": "Maykop-Khanskaya",
+    "frequency": "834000000",
+    "lat": "44.679754",
+    "lon": "40.035455",
+    "type": "RSBN"
+  },
+  {
+    "callsign": "NR",
+    "channel": "",
+    "name": "MineralnyeVody",
+    "frequency": "583000",
+    "lat": "44.198946",
+    "lon": "43.14453",
+    "type": "ILS_FAR_HOMER"
+  },
+  {
+    "callsign": "N",
+    "channel": "",
+    "name": "MineralnyeVody",
+    "frequency": "283000",
+    "lat": "44.211867",
+    "lon": "43.116226",
+    "type": "ILS_NEAR_HOMER"
+  },
+  {
+    "callsign": "IMW",
+    "channel": "",
+    "name": "MineralnyeVody",
+    "frequency": "109300000",
+    "lat": "44.238297",
+    "lon": "43.058263",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "IMW",
+    "channel": "",
+    "name": "MineralnyeVody",
+    "frequency": "109300000",
+    "lat": "44.220503",
+    "lon": "43.10009",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "MD",
+    "channel": "",
+    "name": "MineralnyeVody",
+    "frequency": "583000",
+    "lat": "44.256747",
+    "lon": "43.017738",
+    "type": "ILS_FAR_HOMER"
+  },
+  {
+    "callsign": "D",
+    "channel": "",
+    "name": "MineralnyeVody",
+    "frequency": "283000",
+    "lat": "44.243846",
+    "lon": "43.046088",
+    "type": "ILS_NEAR_HOMER"
+  },
+  {
+    "callsign": "IMD",
+    "channel": "",
+    "name": "MineralnyeVody",
+    "frequency": "111700000",
+    "lat": "44.217421",
+    "lon": "43.104064",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "IMD",
+    "channel": "",
+    "name": "MineralnyeVody",
+    "frequency": "111700000",
+    "lat": "44.235217",
+    "lon": "43.06224",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "MN",
+    "channel": "118",
+    "name": "MineralnyeVody",
+    "frequency": "117100000",
+    "lat": "44.239445",
+    "lon": "43.054165",
+    "type": "VOR"
+  },
+  {
+    "callsign": "DO",
+    "channel": "",
+    "name": "Mozdok",
+    "frequency": "525000",
+    "lat": "43.79238",
+    "lon": "44.538494",
+    "type": "ILS_FAR_HOMER"
+  },
+  {
+    "callsign": "D",
+    "channel": "",
+    "name": "Mozdok",
+    "frequency": "1065000",
+    "lat": "43.792126",
+    "lon": "44.563089",
+    "type": "ILS_NEAR_HOMER"
+  },
+  {
+    "callsign": "RM",
+    "channel": "",
+    "name": "Mozdok",
+    "frequency": "525000",
+    "lat": "43.790945",
+    "lon": "44.670692",
+    "type": "ILS_FAR_HOMER"
+  },
+  {
+    "callsign": "R",
+    "channel": "",
+    "name": "Mozdok",
+    "frequency": "1065000",
+    "lat": "43.791336",
+    "lon": "44.635898",
+    "type": "ILS_NEAR_HOMER"
+  },
+  {
+    "callsign": "MZ",
+    "channel": "22",
+    "name": "Mozdok",
+    "frequency": "822000000",
+    "lat": "43.791382",
+    "lon": "44.632072",
+    "type": "PRMG_LOCALIZER"
+  },
+  {
+    "callsign": "MZ",
+    "channel": "22",
+    "name": "Mozdok",
+    "frequency": "822000000",
+    "lat": "43.791251",
+    "lon": "44.586565",
+    "type": "PRMG_GLIDESLOPE"
+  },
+  {
+    "callsign": "MK",
+    "channel": "22",
+    "name": "Mozdok",
+    "frequency": "822000000",
+    "lat": "43.792027",
+    "lon": "44.572203",
+    "type": "PRMG_LOCALIZER"
+  },
+  {
+    "callsign": "MK",
+    "channel": "22",
+    "name": "Mozdok",
+    "frequency": "822000000",
+    "lat": "43.790905",
+    "lon": "44.618731",
+    "type": "PRMG_GLIDESLOPE"
+  },
+  {
+    "callsign": "MZ",
+    "channel": "20",
+    "name": "Mozdok",
+    "frequency": "820000000",
+    "lat": "43.790367",
+    "lon": "44.602658",
+    "type": "RSBN"
+  },
+  {
+    "callsign": "NL",
+    "channel": "",
+    "name": "Nalchik",
+    "frequency": "718000",
+    "lat": "43.535011",
+    "lon": "43.692885",
+    "type": "ILS_FAR_HOMER"
+  },
+  {
+    "callsign": "N",
+    "channel": "",
+    "name": "Nalchik",
+    "frequency": "350000",
+    "lat": "43.524039",
+    "lon": "43.663409",
+    "type": "ILS_NEAR_HOMER"
+  },
+  {
+    "callsign": "INL",
+    "channel": "",
+    "name": "Nalchik",
+    "frequency": "110500000",
+    "lat": "43.508738",
+    "lon": "43.622345",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "INL",
+    "channel": "",
+    "name": "Nalchik",
+    "frequency": "110500000",
+    "lat": "43.518429",
+    "lon": "43.645107",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "BI",
+    "channel": "",
+    "name": "Senaki-Kolkhi",
+    "frequency": "335000",
+    "lat": "42.249592",
+    "lon": "41.986317",
+    "type": "ILS_FAR_HOMER"
+  },
+  {
+    "callsign": "B",
+    "channel": "",
+    "name": "Senaki-Kolkhi",
+    "frequency": "688000",
+    "lat": "42.245075",
+    "lon": "42.018251",
+    "type": "ILS_NEAR_HOMER"
+  },
+  {
+    "callsign": "ITS",
+    "channel": "",
+    "name": "Senaki-Kolkhi",
+    "frequency": "108900000",
+    "lat": "42.238667",
+    "lon": "42.0634",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "ITS",
+    "channel": "",
+    "name": "Senaki-Kolkhi",
+    "frequency": "108900000",
+    "lat": "42.241309",
+    "lon": "42.03708",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "TSK",
+    "channel": "31",
+    "name": "Senaki-Kolkhi",
+    "frequency": "992000000",
+    "lat": "42.242087",
+    "lon": "42.04702",
+    "type": "TACAN"
+  },
+  {
+    "callsign": "CO",
+    "channel": "",
+    "name": "Sochi-Adler",
+    "frequency": "761000",
+    "lat": "43.435164",
+    "lon": "39.911051",
+    "type": "AIRPORT_HOMER_WITH_MARKER"
+  },
+  {
+    "callsign": "ISO",
+    "channel": "",
+    "name": "Sochi-Adler",
+    "frequency": "111100000",
+    "lat": "43.450492",
+    "lon": "39.960744",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "ISO",
+    "channel": "",
+    "name": "Sochi-Adler",
+    "frequency": "111100000",
+    "lat": "43.439082",
+    "lon": "39.927967",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "AV",
+    "channel": "",
+    "name": "Sukhumi-Babushara",
+    "frequency": "489000",
+    "lat": "42.833582",
+    "lon": "41.184697",
+    "type": "ILS_FAR_HOMER"
+  },
+  {
+    "callsign": "A",
+    "channel": "",
+    "name": "Sukhumi-Babushara",
+    "frequency": "995000",
+    "lat": "42.846418",
+    "lon": "41.156849",
+    "type": "ILS_NEAR_HOMER"
+  },
+  {
+    "callsign": "IVZ",
+    "channel": "",
+    "name": "Vaziani",
+    "frequency": "108750000",
+    "lat": "41.619095",
+    "lon": "45.037014",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "IVZ",
+    "channel": "",
+    "name": "Vaziani",
+    "frequency": "108750000",
+    "lat": "41.635125",
+    "lon": "45.019459",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "IVI",
+    "channel": "",
+    "name": "Vaziani",
+    "frequency": "108750000",
+    "lat": "41.639015",
+    "lon": "45.017397",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "IVI",
+    "channel": "",
+    "name": "Vaziani",
+    "frequency": "108750000",
+    "lat": "41.622985",
+    "lon": "45.03495",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "VAS",
+    "channel": "22",
+    "name": "Vaziani",
+    "frequency": "983000000",
+    "lat": "41.630707",
+    "lon": "45.02734",
+    "type": "TACAN"
+  },
+  {
+    "callsign": "NZ",
+    "channel": "",
+    "name": "Ust-Labinks",
+    "frequency": "330000",
+    "lat": "45.226576",
+    "lon": "39.65415",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "AR",
+    "channel": "",
+    "name": "Chervonoglinskoye",
+    "frequency": "440000",
+    "lat": "45.949908",
+    "lon": "29.383333",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "DM",
+    "channel": "",
+    "name": "Dmitrovka",
+    "frequency": "690000",
+    "lat": "45.489353",
+    "lon": "35.058601",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "AG",
+    "channel": "",
+    "name": "Agoy",
+    "frequency": "381000",
+    "lat": "44.133242",
+    "lon": "39.034429",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "MA",
+    "channel": "",
+    "name": "Maykop",
+    "frequency": "682000",
+    "lat": "44.622965",
+    "lon": "40.146927",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "HS",
+    "channel": "",
+    "name": "Herson",
+    "frequency": "1065000",
+    "lat": "46.666575",
+    "lon": "32.499994",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "SM",
+    "channel": "",
+    "name": "Smolenkaya",
+    "frequency": "662000",
+    "lat": "44.787409",
+    "lon": "38.796373",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "KW",
+    "channel": "",
+    "name": "Kislovodsk",
+    "frequency": "995000",
+    "lat": "43.941577",
+    "lon": "42.649979",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "TC",
+    "channel": "",
+    "name": "Taganrog",
+    "frequency": "470000",
+    "lat": "47.249909",
+    "lon": "38.833317",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "IL",
+    "channel": "",
+    "name": "Feodosiya",
+    "frequency": "300500",
+    "lat": "45.014353",
+    "lon": "35.419712",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "SH",
+    "channel": "",
+    "name": "Shyriaeve",
+    "frequency": "389000",
+    "lat": "47.403241",
+    "lon": "30.279998",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "OD",
+    "channel": "",
+    "name": "Odessa",
+    "frequency": "348000",
+    "lat": "46.306297",
+    "lon": "30.661109",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "BS",
+    "channel": "",
+    "name": "Yalta",
+    "frequency": "300500",
+    "lat": "46.879909",
+    "lon": "37.33693",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "KT",
+    "channel": "",
+    "name": "Stavropol",
+    "frequency": "730000",
+    "lat": "45.121577",
+    "lon": "42.181646",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "ER",
+    "channel": "",
+    "name": "Yegorlykskaya",
+    "frequency": "435000",
+    "lat": "46.583243",
+    "lon": "40.666647",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "KM",
+    "channel": "",
+    "name": "Komisarivka",
+    "frequency": "950000",
+    "lat": "46.266575",
+    "lon": "35.016657",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "SK",
+    "channel": "",
+    "name": "Skadovsk",
+    "frequency": "680000",
+    "lat": "46.133242",
+    "lon": "32.91666",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "DA",
+    "channel": "",
+    "name": "Gali",
+    "frequency": "525000",
+    "lat": "42.59991",
+    "lon": "41.783315",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "DF",
+    "channel": "",
+    "name": "Mukhrani",
+    "frequency": "520000",
+    "lat": "41.916577",
+    "lon": "44.565533",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "RF",
+    "channel": "",
+    "name": "Ladozhskaya",
+    "frequency": "324000",
+    "lat": "45.283243",
+    "lon": "39.916649",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "FM",
+    "channel": "",
+    "name": "Teplorechensky",
+    "frequency": "1182000",
+    "lat": "44.15491",
+    "lon": "43.533311",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "BJ",
+    "channel": "",
+    "name": "Kalaus",
+    "frequency": "735000",
+    "lat": "43.466578",
+    "lon": "45.216642",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "NK",
+    "channel": "",
+    "name": "Nikolaev-Kulbakino",
+    "frequency": "1030000",
+    "lat": "46.933241",
+    "lon": "32.099995",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "MN",
+    "channel": "",
+    "name": "Manychsky",
+    "frequency": "705000",
+    "lat": "47.049909",
+    "lon": "40.366647",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "KC",
+    "channel": "",
+    "name": "Kerch",
+    "frequency": "1050000",
+    "lat": "45.366575",
+    "lon": "36.399988",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "TY",
+    "channel": "",
+    "name": "TaganrogYuzhny",
+    "frequency": "720000",
+    "lat": "47.199909",
+    "lon": "38.849984",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "AL",
+    "channel": "",
+    "name": "Ali",
+    "frequency": "353000",
+    "lat": "42.096021",
+    "lon": "43.644701",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "SA",
+    "channel": "",
+    "name": "Elista",
+    "frequency": "311000",
+    "lat": "46.373244",
+    "lon": "44.333308",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "XT",
+    "channel": "",
+    "name": "Ryazanskaya",
+    "frequency": "312000",
+    "lat": "44.966576",
+    "lon": "39.56665",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "KH",
+    "channel": "",
+    "name": "Kakhovka",
+    "frequency": "485000",
+    "lat": "46.808241",
+    "lon": "33.496659",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "WS",
+    "channel": "",
+    "name": "Vesely",
+    "frequency": "641000",
+    "lat": "47.116576",
+    "lon": "40.716647",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "WR",
+    "channel": "",
+    "name": "Odessa",
+    "frequency": "309500",
+    "lat": "46.496019",
+    "lon": "30.723886",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "VM",
+    "channel": "",
+    "name": "Armavir",
+    "frequency": "740000",
+    "lat": "44.966576",
+    "lon": "41.116648",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "WK",
+    "channel": "",
+    "name": "Grozny",
+    "frequency": "830000",
+    "lat": "43.383244",
+    "lon": "45.699975",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "TH",
+    "channel": "",
+    "name": "Tiraspol",
+    "frequency": "515000",
+    "lat": "46.866575",
+    "lon": "29.599999",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "KC",
+    "channel": "",
+    "name": "Simferopol",
+    "frequency": "580000",
+    "lat": "44.749908",
+    "lon": "33.566659",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "SN",
+    "channel": "",
+    "name": "Sultanskoye",
+    "frequency": "866000",
+    "lat": "44.591577",
+    "lon": "42.666645",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "DW",
+    "channel": "",
+    "name": "Buyalyk",
+    "frequency": "625000",
+    "lat": "46.899908",
+    "lon": "30.699997",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "SR",
+    "channel": "",
+    "name": "Sarmakovo",
+    "frequency": "907000",
+    "lat": "43.74991",
+    "lon": "43.116645",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "TD",
+    "channel": "",
+    "name": "Tendrovskiy",
+    "frequency": "309500",
+    "lat": "46.318519",
+    "lon": "31.522774",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "SH",
+    "channel": "",
+    "name": "Sukhoy",
+    "frequency": "862000",
+    "lat": "47.09991",
+    "lon": "41.349979",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "DV",
+    "channel": "",
+    "name": "Dzhubga",
+    "frequency": "420000",
+    "lat": "44.320464",
+    "lon": "38.701374",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "GE",
+    "channel": "",
+    "name": "Genichesk",
+    "frequency": "300500",
+    "lat": "46.182408",
+    "lon": "34.816102",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "GW",
+    "channel": "",
+    "name": "Primorsko-Akhtarsk",
+    "frequency": "920000",
+    "lat": "46.049909",
+    "lon": "38.233318",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "QG",
+    "channel": "",
+    "name": "Yasnaya",
+    "frequency": "435000",
+    "lat": "46.883243",
+    "lon": "40.666647",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "AL",
+    "channel": "",
+    "name": "Alushta",
+    "frequency": "384000",
+    "lat": "44.674908",
+    "lon": "34.398325",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "DO",
+    "channel": "",
+    "name": "Dobrushyn",
+    "frequency": "1175000",
+    "lat": "45.377964",
+    "lon": "33.36166",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "ND",
+    "channel": "",
+    "name": "Bolshevik",
+    "frequency": "507000",
+    "lat": "45.766576",
+    "lon": "40.233315",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "PR",
+    "channel": "",
+    "name": "Peredovay",
+    "frequency": "1210000",
+    "lat": "44.116576",
+    "lon": "41.466648",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "PA",
+    "channel": "",
+    "name": "Parutine",
+    "frequency": "905000",
+    "lat": "46.694908",
+    "lon": "31.904995",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "OE",
+    "channel": "",
+    "name": "Gori",
+    "frequency": "462000",
+    "lat": "42.016577",
+    "lon": "44.1322",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "LY",
+    "channel": "",
+    "name": "Liubymivka",
+    "frequency": "670000",
+    "lat": "45.624908",
+    "lon": "34.898324",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "MA",
+    "channel": "",
+    "name": "Mariupol",
+    "frequency": "770000",
+    "lat": "47.083242",
+    "lon": "37.449986",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "AH",
+    "channel": "",
+    "name": "Akhilleon",
+    "frequency": "300500",
+    "lat": "45.439909",
+    "lon": "36.853043",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "NK",
+    "channel": "",
+    "name": "Nikolaev-Matveyevka",
+    "frequency": "1030000",
+    "lat": "47.087408",
+    "lon": "31.973051",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "NE",
+    "channel": "",
+    "name": "Melitopol",
+    "frequency": "740000",
+    "lat": "46.866575",
+    "lon": "35.299989",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "LE",
+    "channel": "",
+    "name": "TchervonoLissya",
+    "frequency": "395000",
+    "lat": "44.833242",
+    "lon": "34.249992",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "UH",
+    "channel": "",
+    "name": "Tikhoretsk",
+    "frequency": "528000",
+    "lat": "45.833243",
+    "lon": "40.083315",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "RE",
+    "channel": "",
+    "name": "Rostov-Na-Donu",
+    "frequency": "320000",
+    "lat": "47.224909",
+    "lon": "39.769982",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "LA",
+    "channel": "",
+    "name": "Lazarevskoye",
+    "frequency": "307000",
+    "lat": "43.917131",
+    "lon": "39.337484",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "BD",
+    "channel": "",
+    "name": "Berdyansk",
+    "frequency": "342000",
+    "lat": "46.816575",
+    "lon": "36.766654",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "KP",
+    "channel": "",
+    "name": "Kropotkin",
+    "frequency": "214000",
+    "lat": "45.449909",
+    "lon": "40.566648",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "LA",
+    "channel": "",
+    "name": "Lymans-Ke",
+    "frequency": "750000",
+    "lat": "46.666575",
+    "lon": "29.999999",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "KS",
+    "channel": "",
+    "name": "Krasny",
+    "frequency": "1025000",
+    "lat": "47.199909",
+    "lon": "40.349981",
+    "type": "HOMER"
+  }
+]
\ No newline at end of file
diff --git a/Client/include/beacons/PersianGulf.json b/Client/include/beacons/PersianGulf.json
new file mode 100644
index 0000000..6c1b652
--- /dev/null
+++ b/Client/include/beacons/PersianGulf.json
@@ -0,0 +1,911 @@
+[
+  {
+    "callsign": "KIS",
+    "channel": "121",
+    "name": "Kish",
+    "frequency": "117400000",
+    "lat": "26.525121",
+    "lon": "53.962624",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "DIA",
+    "channel": "71",
+    "name": "DohaAirport",
+    "frequency": "112400000",
+    "lat": "25.241526",
+    "lon": "51.590504",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "DOH",
+    "channel": "91",
+    "name": "Hamad International Airport",
+    "frequency": "114400000",
+    "lat": "25.246739",
+    "lon": "51.609075",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "DZF",
+    "channel": "",
+    "name": "Dezful Airport",
+    "frequency": "293000",
+    "lat": "32.437688",
+    "lon": "48.382055",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "ABD",
+    "channel": "98",
+    "name": "Abadan Int Airport",
+    "frequency": "115100000",
+    "lat": "30.36944",
+    "lon": "48.225308",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "AWZ",
+    "channel": "87",
+    "name": "Ahvaz Int Airport",
+    "frequency": "114000000",
+    "lat": "31.33368",
+    "lon": "48.753383",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "AJR",
+    "channel": "96",
+    "name": "Aghajari Airport",
+    "frequency": "114900000",
+    "lat": "30.747129",
+    "lon": "49.666614",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "BJD",
+    "channel": "82",
+    "name": "Birjand Int Airport",
+    "frequency": "113500000",
+    "lat": "32.971711",
+    "lon": "59.188199",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "BUZ",
+    "channel": "121",
+    "name": "Bushehr Int Airport",
+    "frequency": "117450000",
+    "lat": "28.95439",
+    "lon": "50.822687",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "CBH",
+    "channel": "103",
+    "name": "Konarak Airport",
+    "frequency": "115600000",
+    "lat": "25.442493",
+    "lon": "60.418338",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "ISN",
+    "channel": "79",
+    "name": "Isfahan Int Airport",
+    "frequency": "113200000",
+    "lat": "32.7432",
+    "lon": "51.829935",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "KRD",
+    "channel": "84",
+    "name": "Khoramabad Airport",
+    "frequency": "113750000",
+    "lat": "33.435603",
+    "lon": "48.291565",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "PRG",
+    "channel": "58",
+    "name": "Persian Gulf Int Airport",
+    "frequency": "112100000",
+    "lat": "27.360736",
+    "lon": "52.763921",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "YSJ",
+    "channel": "112",
+    "name": "Yasouj Airport",
+    "frequency": "116550000",
+    "lat": "30.692267",
+    "lon": "51.558332",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "BAM",
+    "channel": "96",
+    "name": "Bam Airport",
+    "frequency": "114900000",
+    "lat": "29.076448",
+    "lon": "58.45711",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "MAH",
+    "channel": "105",
+    "name": "Mahshahr Airport",
+    "frequency": "115800000",
+    "lat": "30.552476",
+    "lon": "49.15377",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "ISR",
+    "channel": "117",
+    "name": "Iran Shahr Airport",
+    "frequency": "117000000",
+    "lat": "27.250878",
+    "lon": "60.743301",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "LAM",
+    "channel": "117",
+    "name": "Lamerd Airport",
+    "frequency": "117000000",
+    "lat": "27.373321",
+    "lon": "53.183399",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "SRJ",
+    "channel": "93",
+    "name": "Sir jan Airport",
+    "frequency": "114600000",
+    "lat": "29.556245",
+    "lon": "55.662874",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "YZD",
+    "channel": "124",
+    "name": "Yazd Int Airport",
+    "frequency": "117700000",
+    "lat": "31.905809",
+    "lon": "54.282602",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "ZAL",
+    "channel": "78",
+    "name": "Zabol Airport",
+    "frequency": "113100000",
+    "lat": "31.098855",
+    "lon": "61.539211",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "ZDN",
+    "channel": "107",
+    "name": "Zahedan Int Airport",
+    "frequency": "116000000",
+    "lat": "29.47862",
+    "lon": "60.897067",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "RAF",
+    "channel": "70",
+    "name": "Rafsanjan Airport",
+    "frequency": "112300000",
+    "lat": "30.301377",
+    "lon": "56.053985",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "SRN",
+    "channel": "88",
+    "name": "Saravan Airport",
+    "frequency": "114100000",
+    "lat": "27.401091",
+    "lon": "62.314887",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "BH",
+    "channel": "",
+    "name": "BuHasa",
+    "frequency": "309000000",
+    "lat": "23.610117",
+    "lon": "53.383057",
+    "type": "DME"
+  },
+  {
+    "callsign": "ADV",
+    "channel": "119",
+    "name": "Abu Dhabi Int",
+    "frequency": "114250000",
+    "lat": "24.419118",
+    "lon": "54.672854",
+    "type": "DME"
+  },
+  {
+    "callsign": "ADV",
+    "channel": "",
+    "name": "ABU DHABI",
+    "frequency": "114250000",
+    "lat": "24.441924",
+    "lon": "54.656381",
+    "type": "VOR"
+  },
+  {
+    "callsign": "ABM",
+    "channel": "101",
+    "name": "Abu musa",
+    "frequency": "285000",
+    "lat": "25.87814",
+    "lon": "55.02287",
+    "type": "DME"
+  },
+  {
+    "callsign": "ALN",
+    "channel": "119",
+    "name": "Al Ain Int",
+    "frequency": "112600000",
+    "lat": "24.259134",
+    "lon": "55.606308",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "ALB",
+    "channel": "119",
+    "name": "Al-Bateen Int",
+    "frequency": "114000000",
+    "lat": "24.438753",
+    "lon": "54.446339",
+    "type": "VOR"
+  },
+  {
+    "callsign": "BND",
+    "channel": "119",
+    "name": "Bandar Abbas",
+    "frequency": "117200000",
+    "lat": "27.196943",
+    "lon": "56.366971",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "BND",
+    "channel": "",
+    "name": "Bandar Abbas",
+    "frequency": "250000",
+    "lat": "27.215742",
+    "lon": "56.359493",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "IBND",
+    "channel": "",
+    "name": "",
+    "frequency": "109900000",
+    "lat": "27.19893",
+    "lon": "56.367921",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "IBND",
+    "channel": "",
+    "name": "",
+    "frequency": "109900000",
+    "lat": "27.228633",
+    "lon": "56.386212",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "BND",
+    "channel": "78",
+    "name": "Bandar Abbas",
+    "frequency": "",
+    "lat": "27.216956",
+    "lon": "56.381018",
+    "type": "TACAN"
+  },
+  {
+    "callsign": "KHM",
+    "channel": "",
+    "name": "Bandar-E-Jask",
+    "frequency": "116300000",
+    "lat": "25.653478",
+    "lon": "57.795989",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "JSK",
+    "channel": "",
+    "name": "JASK",
+    "frequency": "349000",
+    "lat": "25.652921",
+    "lon": "57.781546",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "JSK",
+    "channel": "110",
+    "name": "Bandar-E-Jask",
+    "frequency": "",
+    "lat": "25.646221",
+    "lon": "57.783857",
+    "type": "TACAN"
+  },
+  {
+    "callsign": "LEN",
+    "channel": "",
+    "name": "Bandar Lengeh",
+    "frequency": "408000",
+    "lat": "26.530575",
+    "lon": "54.831754",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "LEN",
+    "channel": "95",
+    "name": "Bandar Lengeh",
+    "frequency": "114800000",
+    "lat": "26.536353",
+    "lon": "54.851123",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "MMA",
+    "channel": "28",
+    "name": "",
+    "frequency": "109100000",
+    "lat": "24.24185",
+    "lon": "54.558813",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "LMA",
+    "channel": "24",
+    "name": "",
+    "frequency": "108700000",
+    "lat": "24.23982",
+    "lon": "54.539683",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "IMA",
+    "channel": "48",
+    "name": "",
+    "frequency": "111100000",
+    "lat": "24.257237",
+    "lon": "54.536522",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "RMA",
+    "channel": "24",
+    "name": "",
+    "frequency": "108700000",
+    "lat": "24.22081",
+    "lon": "54.569308",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "MMA",
+    "channel": "28",
+    "name": "",
+    "frequency": "109100000",
+    "lat": "24.26012",
+    "lon": "54.530469",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "RMA",
+    "channel": "24",
+    "name": "",
+    "frequency": "108700000",
+    "lat": "24.24266",
+    "lon": "54.534107",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "LMA",
+    "channel": "24",
+    "name": "",
+    "frequency": "108700000",
+    "lat": "24.219277",
+    "lon": "54.56807",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "IMA",
+    "channel": "48",
+    "name": "",
+    "frequency": "111100000",
+    "lat": "24.236524",
+    "lon": "54.564789",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "MA",
+    "channel": "96",
+    "name": "Al Dhafra",
+    "frequency": "114900000",
+    "lat": "24.246803",
+    "lon": "54.545386",
+    "type": "VORTAC"
+  },
+  {
+    "callsign": "IDBW",
+    "channel": "",
+    "name": "",
+    "frequency": "109500000",
+    "lat": "25.233579",
+    "lon": "55.398979",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "IDBR",
+    "channel": "",
+    "name": "",
+    "frequency": "110100000",
+    "lat": "25.24698",
+    "lon": "55.382285",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "IDBE",
+    "channel": "",
+    "name": "",
+    "frequency": "111300000",
+    "lat": "25.258581",
+    "lon": "55.353947",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "IDBL",
+    "channel": "",
+    "name": "",
+    "frequency": "110900000",
+    "lat": "25.267352",
+    "lon": "55.345444",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "IDBL",
+    "channel": "",
+    "name": "",
+    "frequency": "110900000",
+    "lat": "25.249872",
+    "lon": "55.378842",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "IDBR",
+    "channel": "",
+    "name": "",
+    "frequency": "110100000",
+    "lat": "25.264181",
+    "lon": "55.353679",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "IDBE",
+    "channel": "",
+    "name": "",
+    "frequency": "111300000",
+    "lat": "25.238494",
+    "lon": "55.392357",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "IDBW",
+    "channel": "",
+    "name": "",
+    "frequency": "109500000",
+    "lat": "25.252555",
+    "lon": "55.367372",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "IJEA",
+    "channel": "",
+    "name": "",
+    "frequency": "111750000",
+    "lat": "24.884666",
+    "lon": "55.182751",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "IJWA",
+    "channel": "",
+    "name": "",
+    "frequency": "109750000",
+    "lat": "24.888616",
+    "lon": "55.177872",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "IJEA",
+    "channel": "",
+    "name": "",
+    "frequency": "111750000",
+    "lat": "24.906703",
+    "lon": "55.145846",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "IJWA",
+    "channel": "",
+    "name": "",
+    "frequency": "109750000",
+    "lat": "24.908491",
+    "lon": "55.13947",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "FJV",
+    "channel": "85",
+    "name": "Fujairah",
+    "frequency": "113800000",
+    "lat": "25.100651",
+    "lon": "56.354556",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "IFJR",
+    "channel": "",
+    "name": "",
+    "frequency": "111500000",
+    "lat": "25.105538",
+    "lon": "56.338172",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "IFJR",
+    "channel": "",
+    "name": "",
+    "frequency": "111500000",
+    "lat": "25.11971",
+    "lon": "56.303773",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "HDR",
+    "channel": "47",
+    "name": "Havadarya",
+    "frequency": "111000000",
+    "lat": "27.160571",
+    "lon": "56.172924",
+    "type": "TACAN"
+  },
+  {
+    "callsign": "IBHD",
+    "channel": "",
+    "name": "",
+    "frequency": "108900000",
+    "lat": "27.160724",
+    "lon": "56.186029",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "IBHD",
+    "channel": "",
+    "name": "",
+    "frequency": "108900000",
+    "lat": "27.157037",
+    "lon": "56.163095",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "JIR",
+    "channel": "",
+    "name": "Jiroft",
+    "frequency": "276000",
+    "lat": "28.732118",
+    "lon": "57.67214",
+    "type": "AIRPORT_HOMER"
+  },
+  {
+    "callsign": "KER",
+    "channel": "97",
+    "name": "KERMAN",
+    "frequency": "122500000",
+    "lat": "30.264595",
+    "lon": "56.957928",
+    "type": "TACAN"
+  },
+  {
+    "callsign": "KER",
+    "channel": "57",
+    "name": "KERMAN",
+    "frequency": "112000000",
+    "lat": "30.285146",
+    "lon": "56.943809",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "KER",
+    "channel": "",
+    "name": "KERMAN",
+    "frequency": "290000000",
+    "lat": "30.265587",
+    "lon": "56.960809",
+    "type": "DME"
+  },
+  {
+    "callsign": "IBKS",
+    "channel": "",
+    "name": "",
+    "frequency": "110300000",
+    "lat": "26.158057",
+    "lon": "56.236991",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "IBKS",
+    "channel": "",
+    "name": "",
+    "frequency": "110300000",
+    "lat": "26.177903",
+    "lon": "56.242914",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "KIH",
+    "channel": "",
+    "name": "Kish Island",
+    "frequency": "201000",
+    "lat": "26.527522",
+    "lon": "53.952435",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "KIH",
+    "channel": "112",
+    "name": "Kish Island",
+    "frequency": "",
+    "lat": "26.523074",
+    "lon": "54.011059",
+    "type": "TACAN"
+  },
+  {
+    "callsign": "LAR",
+    "channel": "",
+    "name": "LAR",
+    "frequency": "117900000",
+    "lat": "27.674948",
+    "lon": "54.416221",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "OISL",
+    "channel": "",
+    "name": "LAR",
+    "frequency": "224000",
+    "lat": "27.669854",
+    "lon": "54.375895",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "LVA",
+    "channel": "115",
+    "name": "Lavan Island",
+    "frequency": "116850000",
+    "lat": "26.812091",
+    "lon": "53.355979",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "LVA",
+    "channel": "0",
+    "name": "Lavan Island",
+    "frequency": "310000",
+    "lat": "26.800016",
+    "lon": "53.386456",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "OML",
+    "channel": "121",
+    "name": "Liwa Airbase",
+    "frequency": "117400000",
+    "lat": "23.667518",
+    "lon": "53.803688",
+    "type": "VORTAC"
+  },
+  {
+    "callsign": "MIN",
+    "channel": "99",
+    "name": "Minhad",
+    "frequency": "115200000",
+    "lat": "25.02722",
+    "lon": "55.395556",
+    "type": "TACAN"
+  },
+  {
+    "callsign": "IMNW",
+    "channel": "",
+    "name": "",
+    "frequency": "110700000",
+    "lat": "25.027125",
+    "lon": "55.388944",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "IMNW",
+    "channel": "",
+    "name": "",
+    "frequency": "110700000",
+    "lat": "25.027792",
+    "lon": "55.349815",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "IMNR",
+    "channel": "",
+    "name": "",
+    "frequency": "110750000",
+    "lat": "25.026616",
+    "lon": "55.34358",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "IMNR",
+    "channel": "",
+    "name": "",
+    "frequency": "110750000",
+    "lat": "25.028136",
+    "lon": "55.38255",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "KHM",
+    "channel": "",
+    "name": "Gheshm Island",
+    "frequency": "233000",
+    "lat": "26.762802",
+    "lon": "55.907839",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "KHM",
+    "channel": "",
+    "name": "Gheshm Island",
+    "frequency": "117100000",
+    "lat": "26.762831",
+    "lon": "55.907816",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "OMR",
+    "channel": "83",
+    "name": "Ras Al Khaimah",
+    "frequency": "113600000",
+    "lat": "25.588549",
+    "lon": "55.946619",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "SAS",
+    "channel": "119",
+    "name": "Sas Al Nakheel",
+    "frequency": "128925000",
+    "lat": "24.450229",
+    "lon": "54.51429",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "ISRE",
+    "channel": "",
+    "name": "",
+    "frequency": "108550000",
+    "lat": "25.319219",
+    "lon": "55.538154",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "ISHW",
+    "channel": "",
+    "name": "",
+    "frequency": "111950000",
+    "lat": "25.341794",
+    "lon": "55.498918",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "ISHW",
+    "channel": "",
+    "name": "",
+    "frequency": "111950000",
+    "lat": "25.325",
+    "lon": "55.531791",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "ISRE",
+    "channel": "",
+    "name": "",
+    "frequency": "108550000",
+    "lat": "25.339053",
+    "lon": "55.507725",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "SY",
+    "channel": "125",
+    "name": "SHIRAZ",
+    "frequency": "117800000",
+    "lat": "29.540193",
+    "lon": "52.588744",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "SYZ",
+    "channel": "94",
+    "name": "SHIRAZ",
+    "frequency": "114700000",
+    "lat": "29.541938",
+    "lon": "52.584714",
+    "type": "TACAN"
+  },
+  {
+    "callsign": "SR",
+    "channel": "",
+    "name": "SHIRAZ",
+    "frequency": "205000",
+    "lat": "29.529239",
+    "lon": "52.599209",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "ISYZ",
+    "channel": "",
+    "name": "",
+    "frequency": "108500000",
+    "lat": "29.529372",
+    "lon": "52.60542",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "ISYZ",
+    "channel": "",
+    "name": "",
+    "frequency": "108500000",
+    "lat": "29.546777",
+    "lon": "52.564998",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "SIR",
+    "channel": "",
+    "name": "Sirri Island",
+    "frequency": "300000",
+    "lat": "25.901625",
+    "lon": "54.546971",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "SIR",
+    "channel": "",
+    "name": "Sirri Island",
+    "frequency": "113750000",
+    "lat": "25.914373",
+    "lon": "54.534604",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "KCK",
+    "channel": "89",
+    "name": "Kochak",
+    "frequency": "114200000",
+    "lat": "26.242384",
+    "lon": "55.145874",
+    "type": "TACAN"
+  }
+]
\ No newline at end of file
diff --git a/Client/include/beacons/Syria.json b/Client/include/beacons/Syria.json
new file mode 100644
index 0000000..3947216
--- /dev/null
+++ b/Client/include/beacons/Syria.json
@@ -0,0 +1,884 @@
+[
+  {
+    "callsign": "BAN",
+    "channel": "",
+    "name": "BANIAS",
+    "frequency": "304000",
+    "lat": "35.228286",
+    "lon": "35.957919",
+    "type": "AIRPORT_HOMER"
+  },
+  {
+    "callsign": "KHM",
+    "channel": "",
+    "name": "KAHRAMANMARAS",
+    "frequency": "374000",
+    "lat": "37.540196",
+    "lon": "36.952346",
+    "type": "AIRPORT_HOMER"
+  },
+  {
+    "callsign": "RA",
+    "channel": "",
+    "name": "KLEYATE",
+    "frequency": "450000",
+    "lat": "34.586111",
+    "lon": "36.002778",
+    "type": "AIRPORT_HOMER"
+  },
+  {
+    "callsign": "KTN",
+    "channel": "",
+    "name": "KARIATAIN",
+    "frequency": "372500",
+    "lat": "34.227181",
+    "lon": "37.233667",
+    "type": "AIRPORT_HOMER"
+  },
+  {
+    "callsign": "TRF",
+    "channel": "",
+    "name": "TURAIF",
+    "frequency": "116100000",
+    "lat": "31.696111",
+    "lon": "38.735583",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "BAR",
+    "channel": "",
+    "name": "BAYSUR",
+    "frequency": "113900000",
+    "lat": "33.769444",
+    "lon": "35.555556",
+    "type": "VOR"
+  },
+  {
+    "callsign": "AMN",
+    "channel": "",
+    "name": "MARKA",
+    "frequency": "116300000",
+    "lat": "32.004072",
+    "lon": "36.065986",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "TAN",
+    "channel": "",
+    "name": "TANF",
+    "frequency": "114000000",
+    "lat": "33.482383",
+    "lon": "38.654064",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "NAT",
+    "channel": "",
+    "name": "NATANIA",
+    "frequency": "112400000",
+    "lat": "32.333889",
+    "lon": "34.968889",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "KHM",
+    "channel": "",
+    "name": "KAHRAMANMARAS",
+    "frequency": "113900000",
+    "lat": "37.540371",
+    "lon": "36.953481",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "KTN",
+    "channel": "",
+    "name": "KARIATAIN",
+    "frequency": "117700000",
+    "lat": "34.213283",
+    "lon": "37.264208",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "MUT",
+    "channel": "",
+    "name": "MUT",
+    "frequency": "112300000",
+    "lat": "36.862579",
+    "lon": "33.290921",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "DKA",
+    "channel": "",
+    "name": "DHEKELIA",
+    "frequency": "343000",
+    "lat": "34.993187",
+    "lon": "33.749388",
+    "type": "AIRPORT_HOMER"
+  },
+  {
+    "callsign": "IADA",
+    "channel": "",
+    "name": "",
+    "frequency": "108700000",
+    "lat": "36.990667",
+    "lon": "35.294835",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "IADA",
+    "channel": "",
+    "name": "",
+    "frequency": "108700000",
+    "lat": "36.975663",
+    "lon": "35.27176",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "ADN",
+    "channel": "",
+    "name": "ADANA",
+    "frequency": "395000",
+    "lat": "36.970889",
+    "lon": "35.261611",
+    "type": "AIRPORT_HOMER_WITH_MARKER"
+  },
+  {
+    "callsign": "ADA",
+    "channel": "",
+    "name": "ADANA",
+    "frequency": "112700000",
+    "lat": "36.940583",
+    "lon": "35.210389",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "IAK",
+    "channel": "",
+    "name": "",
+    "frequency": "109700000",
+    "lat": "34.595184",
+    "lon": "32.96954",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "IAK",
+    "channel": "",
+    "name": "",
+    "frequency": "109700000",
+    "lat": "34.588499",
+    "lon": "32.999245",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "AKR",
+    "channel": "107",
+    "name": "Akrotiri",
+    "frequency": "116000000",
+    "lat": "34.57942",
+    "lon": "32.962829",
+    "type": "TACAN"
+  },
+  {
+    "callsign": "AK",
+    "channel": "",
+    "name": "AKROTIRI",
+    "frequency": "365000",
+    "lat": "34.584101",
+    "lon": "33.012689",
+    "type": "AIRPORT_HOMER"
+  },
+  {
+    "callsign": "KAD",
+    "channel": "",
+    "name": "KALDE",
+    "frequency": "112600000",
+    "lat": "33.80739",
+    "lon": "35.485991",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "IBB",
+    "channel": "",
+    "name": "",
+    "frequency": "110100000",
+    "lat": "33.836015",
+    "lon": "35.481357",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "IKK",
+    "channel": "",
+    "name": "",
+    "frequency": "110700000",
+    "lat": "33.828534",
+    "lon": "35.504347",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "BIL",
+    "channel": "",
+    "name": "",
+    "frequency": "109500000",
+    "lat": "33.807187",
+    "lon": "35.488977",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "IBB",
+    "channel": "",
+    "name": "",
+    "frequency": "110100000",
+    "lat": "33.808433",
+    "lon": "35.487681",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "BIL",
+    "channel": "",
+    "name": "",
+    "frequency": "109500000",
+    "lat": "33.835138",
+    "lon": "35.488728",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "IKK",
+    "channel": "",
+    "name": "",
+    "frequency": "110700000",
+    "lat": "33.805173",
+    "lon": "35.484721",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "BOD",
+    "channel": "",
+    "name": "BEIRUT",
+    "frequency": "351000",
+    "lat": "33.903416",
+    "lon": "35.481814",
+    "type": "AIRPORT_HOMER_WITH_MARKER"
+  },
+  {
+    "callsign": "IDA",
+    "channel": "",
+    "name": "",
+    "frequency": "109900000",
+    "lat": "33.434538",
+    "lon": "36.528631",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "IDA",
+    "channel": "",
+    "name": "",
+    "frequency": "109900000",
+    "lat": "33.412415",
+    "lon": "36.500792",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "DAM",
+    "channel": "",
+    "name": "Damascus",
+    "frequency": "116000000",
+    "lat": "33.365131",
+    "lon": "36.468066",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "DAML",
+    "channel": "",
+    "name": "",
+    "frequency": "111100000",
+    "lat": "33.407604",
+    "lon": "36.526916",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "DAL",
+    "channel": "",
+    "name": "DAMASCUS",
+    "frequency": "342000",
+    "lat": "33.487262",
+    "lon": "36.602245",
+    "type": "AIRPORT_HOMER"
+  },
+  {
+    "callsign": "ABD",
+    "channel": "",
+    "name": "ABYAD",
+    "frequency": "264000",
+    "lat": "33.335299",
+    "lon": "36.428295",
+    "type": "AIRPORT_HOMER"
+  },
+  {
+    "callsign": "DAML",
+    "channel": "",
+    "name": "",
+    "frequency": "111100000",
+    "lat": "33.385786",
+    "lon": "36.499259",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "DRZ",
+    "channel": "",
+    "name": "Deir ez-Zor",
+    "frequency": "295000",
+    "lat": "35.289111",
+    "lon": "40.187417",
+    "type": "AIRPORT_HOMER"
+  },
+  {
+    "callsign": "DRZ",
+    "channel": "",
+    "name": "Deir ez-Zor",
+    "frequency": "117000000",
+    "lat": "35.291944",
+    "lon": "40.153778",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "ECN",
+    "channel": "",
+    "name": "ERCAN",
+    "frequency": "117000000",
+    "lat": "35.156671",
+    "lon": "33.491449",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "IECR",
+    "channel": "",
+    "name": "",
+    "frequency": "108300000",
+    "lat": "35.160212",
+    "lon": "33.485222",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "IGNP",
+    "channel": "",
+    "name": "",
+    "frequency": "109100000",
+    "lat": "36.952192",
+    "lon": "37.459536",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "IGNP",
+    "channel": "",
+    "name": "",
+    "frequency": "109100000",
+    "lat": "36.944364",
+    "lon": "37.491193",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "GAZ",
+    "channel": "",
+    "name": "GAZIANTEP",
+    "frequency": "432000",
+    "lat": "36.953265",
+    "lon": "37.468546",
+    "type": "AIRPORT_HOMER"
+  },
+  {
+    "callsign": "GAZ",
+    "channel": "",
+    "name": "GAZIANTEP",
+    "frequency": "116700000",
+    "lat": "36.951556",
+    "lon": "37.472937",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "IGZP",
+    "channel": "",
+    "name": "",
+    "frequency": "108500000",
+    "lat": "36.300667",
+    "lon": "32.312367",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "GZP",
+    "channel": "89",
+    "name": "GAZIPASA",
+    "frequency": "114200000",
+    "lat": "36.298267",
+    "lon": "32.300245",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "GZP",
+    "channel": "",
+    "name": "GAZIPASA/ALANYA",
+    "frequency": "316000",
+    "lat": "36.300041",
+    "lon": "32.300032",
+    "type": "AIRPORT_HOMER"
+  },
+  {
+    "callsign": "GKE",
+    "channel": "",
+    "name": "FAMAGUSTA GECITKALE",
+    "frequency": "114300000",
+    "lat": "35.233502",
+    "lon": "33.727477",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "GKE",
+    "channel": "",
+    "name": "GECITKALE",
+    "frequency": "435000",
+    "lat": "35.231874",
+    "lon": "33.743176",
+    "type": "AIRPORT_HOMER"
+  },
+  {
+    "callsign": "HTY",
+    "channel": "",
+    "name": "HATAY",
+    "frequency": "112050000",
+    "lat": "36.362972",
+    "lon": "36.290113",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "IHAT",
+    "channel": "",
+    "name": "",
+    "frequency": "108900000",
+    "lat": "36.374642",
+    "lon": "36.301483",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "IHAT",
+    "channel": "",
+    "name": "",
+    "frequency": "108900000",
+    "lat": "36.355193",
+    "lon": "36.277639",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "HTY",
+    "channel": "",
+    "name": "HATAY",
+    "frequency": "336000",
+    "lat": "36.363148",
+    "lon": "36.290458",
+    "type": "AIRPORT_HOMER"
+  },
+  {
+    "callsign": "DAN",
+    "channel": "21",
+    "name": "INCIRLIC",
+    "frequency": "",
+    "lat": "37.015611",
+    "lon": "35.448194",
+    "type": "TACAN"
+  },
+  {
+    "callsign": "IDAN",
+    "channel": "",
+    "name": "",
+    "frequency": "109300000",
+    "lat": "37.012552",
+    "lon": "35.443402",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "IDAN",
+    "channel": "",
+    "name": "",
+    "frequency": "109300000",
+    "lat": "36.994247",
+    "lon": "35.415483",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "IDNA",
+    "channel": "",
+    "name": "",
+    "frequency": "111700000",
+    "lat": "37.009487",
+    "lon": "35.435774",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "IDNA",
+    "channel": "",
+    "name": "",
+    "frequency": "111700000",
+    "lat": "36.991443",
+    "lon": "35.408706",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "ILC",
+    "channel": "",
+    "name": "",
+    "frequency": "110300000",
+    "lat": "34.860647",
+    "lon": "33.608001",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "LCA",
+    "channel": "",
+    "name": "Larnaca",
+    "frequency": "112800000",
+    "lat": "34.872928",
+    "lon": "33.625131",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "ILC",
+    "channel": "",
+    "name": "",
+    "frequency": "110300000",
+    "lat": "34.881007",
+    "lon": "33.630916",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "LCA",
+    "channel": "",
+    "name": "Larnaca",
+    "frequency": "432000",
+    "lat": "34.823731",
+    "lon": "33.563132",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "IBA",
+    "channel": "",
+    "name": "",
+    "frequency": "109100000",
+    "lat": "35.411216",
+    "lon": "35.948808",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "IBA",
+    "channel": "",
+    "name": "",
+    "frequency": "109100000",
+    "lat": "35.387532",
+    "lon": "35.951361",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "LTK",
+    "channel": "",
+    "name": "LATAKIA",
+    "frequency": "114800000",
+    "lat": "35.396758",
+    "lon": "35.952041",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "LTK",
+    "channel": "",
+    "name": "LATAKIA",
+    "frequency": "414000",
+    "lat": "35.480331",
+    "lon": "35.944991",
+    "type": "HOMER"
+  },
+  {
+    "callsign": "MEZ",
+    "channel": "",
+    "name": "MEZZEH",
+    "frequency": "358000",
+    "lat": "33.485917",
+    "lon": "36.226722",
+    "type": "AIRPORT_HOMER"
+  },
+  {
+    "callsign": "ALE",
+    "channel": "",
+    "name": "ALEPPO",
+    "frequency": "396000",
+    "lat": "36.185997",
+    "lon": "37.223297",
+    "type": "AIRPORT_HOMER"
+  },
+  {
+    "callsign": "MER",
+    "channel": "",
+    "name": "ALEPPO",
+    "frequency": "365000",
+    "lat": "36.173114",
+    "lon": "37.307553",
+    "type": "AIRPORT_HOMER"
+  },
+  {
+    "callsign": "ALE",
+    "channel": "",
+    "name": "ALEPPO",
+    "frequency": "114500000",
+    "lat": "36.179683",
+    "lon": "37.209378",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "PLR",
+    "channel": "",
+    "name": "PALMYRA",
+    "frequency": "363000",
+    "lat": "34.555739",
+    "lon": "38.266916",
+    "type": "AIRPORT_HOMER"
+  },
+  {
+    "callsign": "PAL",
+    "channel": "",
+    "name": "PALMYRA",
+    "frequency": "337000",
+    "lat": "34.552847",
+    "lon": "38.298267",
+    "type": "AIRPORT_HOMER"
+  },
+  {
+    "callsign": "PHA",
+    "channel": "",
+    "name": "Pafos",
+    "frequency": "328000",
+    "lat": "34.718456",
+    "lon": "32.476168",
+    "type": "AIRPORT_HOMER"
+  },
+  {
+    "callsign": "IPA",
+    "channel": "",
+    "name": "",
+    "frequency": "108900000",
+    "lat": "34.713934",
+    "lon": "32.494877",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "IPA",
+    "channel": "",
+    "name": "",
+    "frequency": "108900000",
+    "lat": "34.723276",
+    "lon": "32.467959",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "IPA",
+    "channel": "",
+    "name": "Pafos",
+    "frequency": "108900000",
+    "lat": "34.713741",
+    "lon": "32.49449",
+    "type": "DME"
+  },
+  {
+    "callsign": "PHA",
+    "channel": "",
+    "name": "Pafos",
+    "frequency": "117900000",
+    "lat": "34.711733",
+    "lon": "32.505846",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "PHA",
+    "channel": "79",
+    "name": "Pafos",
+    "frequency": "",
+    "lat": "34.716628",
+    "lon": "32.482728",
+    "type": "TACAN"
+  },
+  {
+    "callsign": "RMD",
+    "channel": "",
+    "name": "RAMATDAVID",
+    "frequency": "368000",
+    "lat": "32.66278",
+    "lon": "35.189551",
+    "type": "AIRPORT_HOMER"
+  },
+  {
+    "callsign": "RMD",
+    "channel": "84",
+    "name": "RAMATDAVID",
+    "frequency": "113700000",
+    "lat": "32.664872",
+    "lon": "35.187751",
+    "type": "VORTAC"
+  },
+  {
+    "callsign": "RMD",
+    "channel": "",
+    "name": "",
+    "frequency": "111100000",
+    "lat": "32.677163",
+    "lon": "35.175038",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "RMD",
+    "channel": "",
+    "name": "",
+    "frequency": "111100000",
+    "lat": "32.659779",
+    "lon": "35.191273",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "ROP",
+    "channel": "",
+    "name": "ROSH-PINA",
+    "frequency": "115300000",
+    "lat": "32.982528",
+    "lon": "35.572778",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "CAK",
+    "channel": "",
+    "name": "Cheka",
+    "frequency": "116200000",
+    "lat": "34.300489",
+    "lon": "35.699946",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "GAP",
+    "channel": "79",
+    "name": "Sanliurfa",
+    "frequency": "113200000",
+    "lat": "37.458036",
+    "lon": "38.904692",
+    "type": "VOR_DME"
+  },
+  {
+    "callsign": "GAP",
+    "channel": "",
+    "name": "Sanliurfa",
+    "frequency": "391000",
+    "lat": "37.458542",
+    "lon": "38.904844",
+    "type": "AIRPORT_HOMER"
+  },
+  {
+    "callsign": "GHI",
+    "channel": "85",
+    "name": "GHI",
+    "frequency": "113800000",
+    "lat": "31.834683",
+    "lon": "36.778475",
+    "type": "VORTAC"
+  },
+  {
+    "callsign": "IAMN",
+    "channel": "",
+    "name": "",
+    "frequency": "109500000",
+    "lat": "31.964856",
+    "lon": "35.972564",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "IAMN",
+    "channel": "",
+    "name": "",
+    "frequency": "109500000",
+    "lat": "31.977009",
+    "lon": "36.004805",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "",
+    "channel": "",
+    "name": "",
+    "frequency": "109100000",
+    "lat": "32.002069",
+    "lon": "36.230275",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "",
+    "channel": "",
+    "name": "",
+    "frequency": "109100000",
+    "lat": "32.01363",
+    "lon": "36.212404",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "",
+    "channel": "",
+    "name": "",
+    "frequency": "112910000",
+    "lat": "31.815071",
+    "lon": "36.762299",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "",
+    "channel": "",
+    "name": "",
+    "frequency": "112900000",
+    "lat": "31.844284",
+    "lon": "36.76887",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "",
+    "channel": "",
+    "name": "",
+    "frequency": "112910000",
+    "lat": "31.820412",
+    "lon": "36.791448",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "",
+    "channel": "",
+    "name": "",
+    "frequency": "112900000",
+    "lat": "31.825845",
+    "lon": "36.792361",
+    "type": "ILS_GLIDESLOPE"
+  },
+  {
+    "callsign": "ABC",
+    "channel": "106",
+    "name": "Prince Hussein",
+    "frequency": "0",
+    "lat": "32.159572",
+    "lon": "37.148259",
+    "type": "TACAN"
+  },
+  {
+    "callsign": "ABC",
+    "channel": "",
+    "name": "",
+    "frequency": "111400000",
+    "lat": "32.171799",
+    "lon": "37.134339",
+    "type": "ILS_LOCALIZER"
+  },
+  {
+    "callsign": "ABC",
+    "channel": "",
+    "name": "",
+    "frequency": "111400000",
+    "lat": "32.15292",
+    "lon": "37.16097",
+    "type": "ILS_GLIDESLOPE"
+  }
+]
\ No newline at end of file
diff --git a/Client/include/icao/icao.json b/Client/include/icao/icao.json
index 4131284..6c852d5 100644
--- a/Client/include/icao/icao.json
+++ b/Client/include/icao/icao.json
@@ -1,120 +1,120 @@
 {
     "Caucasus": {
         "URKA": "Anapa-Vityazevo",
-        "URKL": "Krasnodar-Center",
-        "URKN": "Novorossiysk",
-        "URKW": "Krymsk",
-        "URKH": "Maykop-Khanskaya",
+        "UGSB": "Batumi",
+        "URMO": "Beslan",
         "URKG": "Gelendzhik",
-        "URSS": "Sochi-Adler",
-        "URKK": "Krasnodar-Pashkovsky",
-        "UGSS": "Sukhumi-Babushara",
         "UG23": "Gudauta",
-        "UGSB": "Batumi",
-        "UGKS": "Senaki-Kolkhi",
         "UG5X": "Kobuleti",
+        "URKL": "Krasnodar-Center",
+        "URKK": "Krasnodar-Pashkovsky",
+        "URKW": "Krymsk",
         "UGKO": "Kutaisi",
+        "URKH": "Maykop-Khanskaya",
         "URMM": "Mineralnye Vody",
-        "URMN": "Nalchik",
         "XRMF": "Mozdok",
-        "UGTB": "Tbilisi-Lochini",
+        "URMN": "Nalchik",
+        "URKN": "Novorossiysk",
+        "UGKS": "Senaki-Kolkhi",
+        "URSS": "Sochi-Adler",
         "UG24": "Soganlug",
-        "UG27": "Vaziani",
-        "URMO": "Beslan"
+        "UGSS": "Sukhumi-Babushara",
+        "UGTB": "Tbilisi-Lochini",
+        "UG27": "Vaziani"
     },
     "PersianGulf": {
+        "OMAA": "Abu Dhabi Intl",
         "OIBA": "Abu Musa Island",
+        "OMAL": "Al Ain Intl",
+        "OMAM": "Al Dhafra AFB",
+        "OMDW": "Al Maktoum Intl",
+        "OMDM": "Al Minhad AFB",
+        "OMAD": "Al-Bateen",
         "OIKB": "Bandar Abbas Intl",
         "OIBL": "Bandar Lengeh",
-        "OMAM": "Al Dhafra AFB",
+        "OIZJ": "Bandar-e-Jask",
         "OMDB": "Dubai Intl",
-        "OMDW": "Al Maktoum Intl",
         "OMFJ": "Fujairah Intl",
-        "OIGI": "Tunb Island AFB",
         "OIKP": "Havadarya",
+        "OIKJ": "Jiroft",
+        "OIKK": "Kerman",
         "OOKB": "Khasab",
+        "OIBK": "Kish Intl",
         "OISL": "Lar",
-        "OMDM": "Al Minhad AFB",
+        "OIBV": "Lavan Island",
+        "OMLW": "Liwa AFB",
         "OIKQ": "Qeshm Island",
+        "OMRK": "Ras Al Khaimah Intl",
+        "OMNK": "Sas Al Nakheel",
         "OMSJ": "Sharjah Intl",
-        "OIBS": "Sirri Island",
-        "OITK": "Tunb Kochak",
-        "OMSN": "Sir Abu Nuayr",
-        "OIKK": "Kerman",
         "OISS": "Shiraz Intl",
-        "OMNK": "Sas Al Nakheel",
-        "OIZJ": "Bandar-e-Jask",
-        "OMAA": "Abu Dhabi Intl",
-        "OMAD": "Al-Bateen",
-        "OIBK": "Kish Intl",
-        "OMAL": "Al Ain Intl",
-        "OIBV": "Lavan Island",
-        "OIKJ": "Jiroft",
-        "OMRK": "Ras Al Khaimah Intl",
-        "OMLW": "Liwa AFB"
+        "OMSN": "Sir Abu Nuayr",
+        "OIBS": "Sirri Island",
+        "OIGI": "Tunb Island AFB",
+        "OITK": "Tunb Kochak"
     },
     "Syria": {
         "OS57": "Abu al-Duhur",
         "LTAF": "Adana Sakirpasa",
+        "LCRA": "Akrotiri",
         "OS70": "Al Qusayr",
+        "OS61": "Al-Dumayr",
+        "OSAP": "Aleppo",
+        "OJAM": "Amman",
         "OS64": "An Nasiriyah",
-        "OS60": "Tha'lah",
+        "OSLK": "Bassel Al-Assad",
         "OLBA": "Beirut-Rafic Hariri",
         "OSDI": "Damascus",
-        "OMAS": "Marj as Sultan South",
-        "OS61": "Al-Dumayr",
+        "OSDZ": "Deir ez-Zor",
+        "LCEN": "Ercan",
         "LLES": "Eyn Shemer",
         "LTAJ": "Gaziantep",
+        "LTFG": "Gazipasa",
+        "LCGK": "Gecitkale",
+        "IQ18": "H3",
+        "IQ20": "H3 Northwest",
+        "IQ21": "H3 Southwest",
         "OJHR": "H4",
         "LLHA": "Haifa",
         "OS58": "Hama",
         "LTDA": "Hatay",
+        "LLHZ": "Herzliya",
         "LTAG": "Incirlik",
         "OS62": "Jirah",
         "OS69": "Khalkhalah",
+        "OJKA": "King Abdullah II",
         "OJMF": "King Hussein Air College",
+        "LCRE": "Kingsfield",
         "LLKS": "Kiryat Shmona",
-        "OSLK": "Bassel Al-Assad",
-        "OMAN": "Marj as Sultan North",
+        "OS66": "Kuweires",
+        "CY01": "Lakatamia",
+        "LCLK": "Larnaca",
         "OS63": "Marj Ruhayyil",
+        "OMAN": "Marj as Sultan North",
+        "OMAS": "Marj as Sultan South",
         "LLMG": "Megiddo",
         "OS67": "Mezzeh",
         "OS71": "Minakh",
-        "OSAP": "Aleppo",
+        "OJMS": "Muwaffaq Salti",
+        "LCNC": "Nicosia",
         "OSPR": "Palmyra",
+        "LCPH": "Paphos",
+        "CY03": "Pinarbashi",
+        "OJPH": "Prince Hassan",
         "OQAS": "Qabr as Sitt",
         "LLRD": "Ramat David",
-        "OS66": "Kuweires",
         "OLRA": "Rayak",
         "OLKA": "Rene Mouawad",
         "LLIB": "Rosh Pina",
+        "IQ40": "Ruwayshid",
+        "LTCS": "Sanliurfa",
         "OS68": "Sayqal",
         "OS65": "Shayrat",
         "OS59": "Tabqa",
         "OTAF": "Taftanaz",
-        "OS72": "Tiyas",
-        "Z19O": "Wujah Al Hajar",
-        "LTFG": "Gazipasa",
-        "OSDZ": "Deir ez-Zor",
-        "LCNC": "Nicosia",
-        "LCRA": "Akrotiri",
-        "LCRE": "Kingsfield",
-        "LCPH": "Paphos",
-        "LCLK": "Larnaca",
-        "CY01": "Lakatamia",
-        "LCEN": "Ercan",
-        "LCGK": "Gecitkale",
-        "CY03": "Pinarbashi",
-        "IQ18": "H3",
-        "IQ20": "H3 Northwest",
-        "IQ21": "H3 Southwest",
-        "IQ40": "Ruwayshid",
-        "LTCS": "Sanliurfa",
         "OTSM": "Tal Siman",
-        "OJPH": "Prince Hassan",
-        "OJKA": "King Abdullah II",
-        "LLHZ": "Herzliya",
-        "OJAM": "Amman",
-        "OJMS": "Muwaffaq Salti"
+        "OS60": "Tha'lah",
+        "OS72": "Tiyas",
+        "Z19O": "Wujah Al Hajar"
     }
 }
\ No newline at end of file
diff --git a/Images/Beacons.png b/Images/Beacons.png
new file mode 100644
index 0000000..ad3f83a
Binary files /dev/null and b/Images/Beacons.png differ
diff --git a/Images/BlueBullseye.png b/Images/BlueBullseye.png
new file mode 100644
index 0000000..656def5
Binary files /dev/null and b/Images/BlueBullseye.png differ
diff --git a/Images/BluePlacedBullseye.png b/Images/BluePlacedBullseye.png
new file mode 100644
index 0000000..95cafa8
Binary files /dev/null and b/Images/BluePlacedBullseye.png differ
diff --git a/Images/CharSize.png b/Images/CharSize.png
index 3397054..1c10553 100644
Binary files a/Images/CharSize.png and b/Images/CharSize.png differ
diff --git a/Images/EnemyNoCallsign.png b/Images/EnemyNoCallsign.png
new file mode 100644
index 0000000..61a7ab3
Binary files /dev/null and b/Images/EnemyNoCallsign.png differ
diff --git a/Images/EnemyWithCallsign.png b/Images/EnemyWithCallsign.png
new file mode 100644
index 0000000..1a36d92
Binary files /dev/null and b/Images/EnemyWithCallsign.png differ
diff --git a/Images/Filter.png b/Images/Filter.png
index 65284fc..bdb70ee 100644
Binary files a/Images/Filter.png and b/Images/Filter.png differ
diff --git a/Images/Find.png b/Images/Find.png
new file mode 100644
index 0000000..928f0fd
Binary files /dev/null and b/Images/Find.png differ
diff --git a/Images/FindICAO.png b/Images/FindICAO.png
new file mode 100644
index 0000000..945e5cc
Binary files /dev/null and b/Images/FindICAO.png differ
diff --git a/Images/GeoMap.png b/Images/GeoMap.png
deleted file mode 100644
index 1ec36d1..0000000
Binary files a/Images/GeoMap.png and /dev/null differ
diff --git a/Images/GeoMaps.png b/Images/GeoMaps.png
new file mode 100644
index 0000000..8422b2b
Binary files /dev/null and b/Images/GeoMaps.png differ
diff --git a/Images/GeoMapsAirbases.png b/Images/GeoMapsAirbases.png
new file mode 100644
index 0000000..c3b3995
Binary files /dev/null and b/Images/GeoMapsAirbases.png differ
diff --git a/Images/GeoMapsBeacons.png b/Images/GeoMapsBeacons.png
new file mode 100644
index 0000000..3d8c2da
Binary files /dev/null and b/Images/GeoMapsBeacons.png differ
diff --git a/Images/HelpWindow.png b/Images/HelpWindow.png
index e83d009..54d0cfe 100644
Binary files a/Images/HelpWindow.png and b/Images/HelpWindow.png differ
diff --git a/Images/MCB.png b/Images/MCB.png
index da4ca71..1109d93 100644
Binary files a/Images/MCB.png and b/Images/MCB.png differ
diff --git a/Images/MagHeadingOnly.png b/Images/MagHeadingOnly.png
new file mode 100644
index 0000000..aa5ce10
Binary files /dev/null and b/Images/MagHeadingOnly.png differ
diff --git a/Images/MagTrueHeading.png b/Images/MagTrueHeading.png
new file mode 100644
index 0000000..efe5605
Binary files /dev/null and b/Images/MagTrueHeading.png differ
diff --git a/Images/MergeFlight.png b/Images/MergeFlight.png
new file mode 100644
index 0000000..77905b4
Binary files /dev/null and b/Images/MergeFlight.png differ
diff --git a/Images/RedBullseye.png b/Images/RedBullseye.png
new file mode 100644
index 0000000..0b8b8be
Binary files /dev/null and b/Images/RedBullseye.png differ
diff --git a/Images/RedPlacedBullseye.png b/Images/RedPlacedBullseye.png
new file mode 100644
index 0000000..debfd9b
Binary files /dev/null and b/Images/RedPlacedBullseye.png differ
diff --git a/Images/Settings.png b/Images/Settings.png
index 475ec60..7e1b82d 100644
Binary files a/Images/Settings.png and b/Images/Settings.png differ
diff --git a/README.md b/README.md
index 2d3edea..dd5323c 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ Standalone Radar Control or **SRC** for short, is a completely free solution and
 #### **Connect Window**
 ![ConnectWindow](Images/ConnectWindow.png)
 ![SavedServer](Images/SavedServer.png)
-- To open the connect window, click the **CONNECT** button in the top left of the radar scope, indicated with green text. Or use the **LShft + F12** keybind.
+- To open the connect window, click the **CONNECT** button in the top left of the radar scope within the [**UCB**](#upper-control-buttons), indicated with green text. Or use the **LCtrl + F12** keybind.
 - For ease of use between different servers, it is highly recommended to save your server connection settings. To do so, all fields must be filled out and not left blank. Once filled out, you can then press **SAVE**.
 - The newly created saved server will then appear as the last in the list within the drop down menu below the **SAVED SERVERS** combo box. 
 - To **REMOVE** a server profile, select the one you wish to remove from the **SAVED SERVERS** combo box, then click **REMOVE**.
@@ -50,7 +50,7 @@ Standalone Radar Control or **SRC** for short, is a completely free solution and
 - To connect, click the **CONNECT** button once you have filled out the **SERVERIP:PORT**, **PASSWORD**, and **CALLSIGN** text boxes.
 
 #### **Messages Window**
-- To open the messages window, use the keybind **LShft + M**.
+- To open the messages window, use the keybind **LCtrl + M**.
 - The **MESSAGES** window provides a quick and easy way to chat with other controllers and players in game.
 - To open a specific chat, use the left mouse button on the button located at the top of the messages window.
 - Private message buttons can be removed with the right mouse button.
@@ -81,24 +81,39 @@ Message Type | Description
 
 #### **Controllers List Window**
 ![ControllerListWindow](Images/ControllerListWindow.png)
-- To open the controllers list use the keybind **LShft + L**
+- To open the controllers list use the keybind **LCtrl + L**
 - Shows currently connected controllers indicated by the position they've connected as, **BLUE**, **RED**, or **ADMIN** followed by their callsign used to connect.
 
 #### **Settings Window**
 ![SettingsWIndow](Images/Settings.png)
-- For now, this is minimal but in the future this will become more detailed.
+- Can be opened clicking the **SETTINGS** [**UCB**](#upper-control-buttons) or by using the keybind **LCtrl + S**
+
 ##### **Full METAR**
 ![FullMETAR](Images/FullMETAR.png)
-
-- When enabled you will get the full metar.
+- When checked you will get the full metar.
 
 ![PartialMETAR](Images/PartialMETAR.png)
-- When disabled, you will only get a partial metar that includes the ICAO, Wind/Speed, and Altimeter.
+- When unchecked, you will only get a partial metar that includes the ICAO, Wind/Speed, and Altimeter.
+
+##### **True Heading**
+![MagAndTrue](Images/MagTrueHeading.png)
+- When checked all labels that provide heading will also show a true heading.
+
+![MagOnly](Images/MagHeadingOnly.png)
+- When unchecked all labels that provide a heading will **not** provide a true heading.
+
+##### **Enemy Callsigns**
+![EnemyWithCallsign](Images/EnemyWithCallsign.png)
+- When checked enemy contacts will display the callsign.
+
+![EnemyNoCallsign](Images/EnemyNoCallsign.png)
+- When unchcked enemy contacts will **not** display the callsign.
+
 
 #### **Help Window**
 ![HelpWindow](Images/HelpWindow.png)
 - The help window is a quick reference to keybinds, commands and a brief description.
-- Can be opened by clicking the **HELP** button located above the [**MCB**](#main-control-buttons-mcb), or by using the keybind **LShft + H**.
+- Can be opened by clicking the **HELP** [**UCB**](#upper-control-buttons) located above the [**MCB**](#main-control-buttons-mcb), or by using the keybind **LCtrl + H**.
 
 ### **Keybinds**
 Keybind | Description
@@ -121,12 +136,13 @@ LCtrl + A            | [Toggle Friendly RWR Labels](#air-defense--ship-defense-r
 LCtrl + Z            | [Toggle Enemy RWR Labels](#air-defense--ship-defense-rings)
 LCtrl + X            | [BRAA Line From Bulls](#braa-from-bullseye)
 LCtrl + C            | [Place Center](#place-cntr)
+Escape               | Clear [command](#command-area) text / clear find square
 
 
-### **Commands**
+### **Enter Commands**
 - Type any of the following [commands](#command) followed by pressing **ENTER** on your keyboard.
 
-Command | Description
+Commands | Description
 --------|------------
 **RW <**ICAO**>**          | [Toggle Runways](#airbases)
 **RW TA**                | Toggle All Runways for the map
@@ -146,11 +162,28 @@ Command | Description
 **LM CA**                | Load Caucasus MAP
 **LM SY**                | Load Syria MAP
 **LM PG**                | Load Persian Gulf MAP
-**CR <**RANGE**>**           | [Set Cursor Ring Range](#cursor-ring)
-**CA <**RANGE**>**           | [Set Conflict Alert Range](#conflict-alerts)
+**CR <**RADIUS**>**           | [Set Cursor Ring Range](#cursor-ring)
+**FIND** <**ICAO/BEACON**>              | [Find](#find) a airport or beacon indicated with green flashing block.
+**BE**                      | [Place New Bullseye](#placed-bullseyes)
+**BE RS**                   | [Reset Bullseye Reference To Default](#placed-bullseyes)
+
+
+### **Click Commands**
+- Type any of the following [commands](#command) followed by using the **Left Mouse Button** on the item.
+
+Commands | Description
+--------|------------
+**CA <**RADIUS**>**           | [Set Conflict Alert Range](#conflict-alerts)
 **CA**                  | [Disable conflict alert on a contact](#conflict-alert)
-**1-9**                 | Without pressing enter and clicking a contact sets a custom [Leader Direction](#leader-direction)
-**LL <**Length**>**     | Without pressing enter and clicking a contact sets a custom [Leader Length](#leader-length)
+**1-9**                 | Sets a custom [Leader Direction](#leader-direction)
+**0**                   | Resets [Leader Direction](#leader-direction) back to global.
+**LL <**Length**>**     | Sets a custom [Leader Length](#leader-length)
+**LL**                    | Resets [Leader Length](#leader-length) back to global.
+**MF <**RADIUS**> <**ALT**> <**ALT**>** | [Merge Flight](#merge-flights) to remove datablocks and history surrounding the flight lead.
+**MF**                                   | Removes the [Merge Flight](#merge-flights)
+**CS** <**Callsign**>           | Change A Contacts Callsign
+**CS**                   | Reset Callsign
+
 
 ### **Upper Control Buttons**
 ![UCB](Images/UCB.png)
@@ -174,6 +207,7 @@ Command | Description
 [**PLACE RR**](#place-rr) | Allows a secondary range ring center position to be placed by left clicking anywhere within the scope.
 [**RR CNTR**](#rr-cntr) | Indicates when you are off of the default range ring center position.
 [**MAPS**](#maps) | Opens the maps submenu to show available maps to display. **MAPS** are based off of real world ARTCC/FIR boundaries.
+[**GEOMAPS**](#geomaps) | Opens the geographic maps submenu for airports and beacons.
 [**BRITE**](#brite) | Opens the brightness submenu.
 [**CHAR SIZE**](#char-size) | Opens the character size submenu.
 [**FILTER**](#filter) | Opens the filter submenu.
@@ -210,10 +244,24 @@ scroll while the cursor is within the button to increase/decrease the range betw
 
 #### **MAPS**
 ![Maps](Images/Maps.png)
-![GeoMap](Images/GeoMap.png)
 1) Within the **MAPS** submenu, you will be preseneted with options to select a map. To select a map, Use the left mouse button on the map you wish to display. Currently these are **Caucasus**, **Syria**, and **Persian Gulf**. More maps will come in time, while also letting them be customized by the controller or server owners.
 2) Additionally you will see a **GEOMAPS** button, left clicking this button will display within the radar scope a quick look list of airports indicated by **ICAO**, **AIRBASE**, and **RUNWAYS**. this is useful for the **AB**, **RW**, **TW**, and **LC** commands.
 
+#### **GEOMAPS**
+![GeoMaps](Images/GeoMaps.png)
+**Button**|**Description**
+----------|---------------
+[**AIRBASES**](#airbases-geomaps) | Displays a list of Airbases by ICAO, Name, and Runways.
+[**BEACONS**](#beacons-geomaps) | DIsplays a list of Beacons by Callsign, Name, Channel, Frequency, and Type.
+
+##### **AIRBASES GEOMAPS**
+![AirbaseGeoMaps](Images/GeoMapsAirbases.png)
+- Quick reference for the [**FIND**](#find), [**AB**](#airbases), [**RW**](#airbases), [**TW**](#airbases), and [**LC**](#airbases) commands.
+
+##### **BEACONS GEOMAPS**
+![BeaconGeoMaps](Images/GeoMapsBeacons.png)
+- Quick reference for the [**FIND**](#find) command.
+
 #### **BRITE**
 ![Brite](Images/Brite.png)
 - To change the brightness, use the left mouse button on the button you wish to change the brightness of, then use your mouse scroll while the cursor is within the button to increase/decrease the brightness.
@@ -247,6 +295,7 @@ scroll while the cursor is within the button to increase/decrease the range betw
 [**MT**](#metar) | Change the character size of METAR's
 [**GM**](#maps) | Change the character size of the GEOMAP.
 [**RWR**](#air-defense--ship-defense-rings) | Change the character size of the RWR air defense & ship labels.
+[**BCN**](#beacons) | Change the character size of the beacon display information
 
 #### **FILTER**
 ![Filter](Images/Filter.png)
@@ -273,6 +322,7 @@ scroll while the cursor is within the button to increase/decrease the range betw
 [**ENMY THR**](#air-defense--ship-defense-rings) | Toggle the display of enemy threat rings
 [**FRND RWR**](#air-defense--ship-defense-rings) | Toggle the display of friendly RWR air defense & ship labels
 [**ENMY RWR**](#air-defense--ship-defense-rings) | Toggle the dispaly of enemy RWR air defense & ship labels
+[**BCN**](#beacons)                              | Toggle the display of Beacons.
 
 #### **SHIFT**
 ![Shift](Images/Shift.png)
@@ -341,6 +391,28 @@ scroll while the cursor is within the button to increase/decrease the range betw
 1) To toggle the connecting line between contacts on or off, use left mouse button on the intended item in the list.
 2) To remove a link entirely from the list and the connecting line, use right mouse button on the intended item in the list.
 
+### **Bullseyes**
+![BlueBullseye](Images/BlueBullseye.png)
+- Blue bullseyes that are placed by the mission creators will be indicated in a dark blue color, with a center dot and 2 surrounding rings.
+
+![RedBullseye](Images/RedBullseye.png)
+- Red bullseyes that are placed by the mission creators will be indicated in a dark red color, with a center dot and 2 surrounding rings.
+
+#### **Placed Bullseyes**
+1) To place a bullseye, use the command **BE** and press enter, a bullseye will appear at the center of your scope.
+- To move a placed bullseye, use **Left Mouse Button**, click the bullseye and continue to hold and move your mouse cursor.
+- To set a placed bullseye as a new reference, use **Right Mouse Button** and click the bullseye.
+- To reset the bullseye reference back to the mission default, use the command **BE RS**
+- To delete a placed bullseye use **Double Left Mouse Button** and click the bullseye.
+- **NOTE:** If you've placed a bullseye and set it as a reference, when you delete it, the reference will go back to the last placed one. If there are no more placed bullseyes left after the last one you delete, it will go back to the default mission bullseye.
+
+![BluePlacedBullseye](Images/BluePlacedBullseye.png)
+- Blue placed bullseyes will be indicated in a light blue color with 2 rings.
+
+![RedPlacedBullseye](Images/RedPlacedBullseye.png)
+- Red placed bullseys will be indicated in a light red color with 2 rings.
+
+
 ### **Bulls Cursor**
 ![BullsCursor](Images/BullsCursor.png)
 - Provides **BEARING & RANGE** to the bullseye.
@@ -410,6 +482,7 @@ Number | Location
 **7** | **NW**
 **8** | **N**
 **9** | **NE**
+**0** | **Reset**
 
 #### **Leader Length**
 - Leader lines extend from the contact, to the data block in positions other than number 5, center.
@@ -426,6 +499,8 @@ Type | Description
 **K** | Tanker
 **R** | Recon
 **W** | AWACS
+**S** | Search and Rescue Helicopter
+**U** | Transport Helicopter
 
 #### **Velocity Vectors**
 - Velocity Vectors are projected along the contacts true heading track and extend and retract based upon the contacts ground speed.
@@ -450,6 +525,12 @@ Type | Description
 #### **Filter Altitudes**
 - In the example below, the filter altitude is set from **002** to **040**.
 
+#### **Merge Flights**
+![MergeFlight](Images/MergeFlight.png)
+- Merging flights is useful for contacts flying in formation, it will remove the datablock and history of the wingman surrounding the winglead, filterable by a radius and min/max altitude in relation to the flight lead.
+1) To merge a flight, use the command **MF <**RADIUS**> <**MIN_ALT**> <**MAX_ALT**>** without pressing enter, click the flight lead.
+- Example: **MF 5 020 020**, this will filter out the datablocks and history of wingmen within 5NM within 2000FT below and within 2000FT above.
+
 ![FilterAltitudes](Images/FilterAltitudes.png)
 - In hundreds of feet, above sea level.
 - Filter altitudes can be set with the command **FA <**ALT**> <**ALT**>**, where the first alt is the minimum and second is the maximum.
@@ -457,9 +538,9 @@ Type | Description
 
 ### **Airbases**
 ![Airbase](Images/Airbase.png)
-- Airbases can be displayed with the command **AB <**ICAO**>**, it will show all runways and taxiways.
-- To toggle the display of all runways for an airbase you can use the command **RW <*ICAO**>**.
-- To toggle the displau of taxiways for an airbase you can use the command **TW <**ICAO>**.
+- Airbases can be displayed with the command **AB** <**ICAO**>, it will show all runways and taxiways.
+- To toggle the display of all runways for an airbase you can use the command **RW** <**ICAO**>.
+- To toggle the displau of taxiways for an airbase you can use the command **TW** <**ICAO>**.
 - The length and width of the runways & taxiways can be changed in the [**SHIFT**](#shift) submenu.
 
 #### **Localizers**
@@ -515,6 +596,18 @@ Type | Description
 - Based on real world ARTCC/FIR boundaries.
 - Displayed in a **yellow color**.
 
+### **Find**
+![FindICAO](Images/FindICAO.png)
+![Find](Images/Find.png)
+1) To find an [airport](#airbases-geomaps) use the command **FIND <**ICAO**>** and press enter. A green flashing square will appear at the place you're finding.
+2) To find a [beacon](#beacons-geomaps), VOR, DME, VORTAC, VORDME, and TACAN use the command **FIND <**CALLSIGN**>**. A green flashing square will appear at the place you're finding.
+3) Once you've found the flashing square, use the **Escape** key on your keyboard, or **Left Mouse Button** anywhere on the scope.
+
+### **Beacons**
+![Beacons](Images/Beacons.png)
+
+- Beacons are displayed with a yellow dotted ring, you can use **Left Mouse Button** on the beacon to display more information about it.
+
 ### **Command Area**
 ![Commands](Images/Commands.png)
 - Located on the left side edge of the screen centered to be always in the middle.