diff --git a/BaseStationInstaller/Models/Board.cs b/BaseStationInstaller/Models/Board.cs
index feccac8..87a06b6 100644
--- a/BaseStationInstaller/Models/Board.cs
+++ b/BaseStationInstaller/Models/Board.cs
@@ -23,7 +23,7 @@ public Board() { }
         public string Name { get; set; }
         //public ArduinoModel Platform { get; set; }
 
-        public string FQBN;
+        public string FQBN { get; set; }
 
         public List<Platform> Platforms { get; set; }
 
diff --git a/BaseStationInstaller/config.json b/BaseStationInstaller/config.json
index 2b91b25..9f2912c 100644
--- a/BaseStationInstaller/config.json
+++ b/BaseStationInstaller/config.json
@@ -1,83 +1,153 @@
 [
-    {
-        "Name": "BaseStationClassic",
-        "Git": "https://github.com/DCC-EX/BaseStation-Classic.git",
-        "Libraries": [],
-        "SupportedBoards": [
-            {
-                "Name": "Uno",
-                "Platforms": [{ "Architecture": "avr", "Package": "arduino" }],
-                "SupportedMotoShields": [
-                    { "Name": "Arduino Motor Shield", "ShieldType": 0 },
-                    { "Name": "Pololu MC33926 Motor Shield", "ShieldType": 1 }
-                ]
-            },
-            {
-                "Name": "Mega",
-                "Platforms": [{ "Architecture": "avr", "Package": "arduino" }],
-                "SupportedMotoShields": [
-                    { "Name": "Arduino Motor Shield", "ShieldType": 0 },
-                    { "Name": "Pololu MC33926 Motor Shield", "ShieldType": 1 }
-                ]
-            }
+  {
+    "Name": "BaseStationClassic",
+    "Git": "https://github.com/DCC-EX/BaseStation-Classic.git",
+    "Libraries": [],
+    "SupportedBoards": [
+      {
+        "Name": "Uno",
+        "FQBN": "arduino:avr:uno",
+        "Platforms": [
+          {
+            "Architecture": "avr",
+            "Package": "arduino"
+          }
         ],
-        "DisplayName": "Base Station Classic",
-        "InputFileLocation": "DCCpp",
-        "AllowAdvanced": false,
-        "ConfigFile": "DCCpp/Config.h"
-    },
-    {
-        "Name": "CommandStation-EX",
-        "Git": "https://github.com/DCC-EX/CommandStation-EX.git",
-        "Libraries": [
-            {
-                "Name": "DIO2",
-                "Repo": "https://github.com/Locoduino/DIO2.git",
-                "Location": "libraries/DIO2",
-                "LibraryDownloadAvailable": true
-            },
-            {
-                "Name": "SparkFun External EEPROM Arduino Library",
-                "Repo": "https://github.com/sparkfun/SparkFun_External_EEPROM_Arduino_Library.git",
-                "Location": "libraries/SparkFun_External_EEPROM_Arduino_Library",
-                "LibraryDownloadAvailable": true
-            }
+        "SupportedMotoShields": [
+          {
+            "Name": "Arduino Motor Shield",
+            "ShieldType": 0
+          },
+          {
+            "Name": "Pololu MC33926 Motor Shield",
+            "ShieldType": 1
+          }
+        ]
+      },
+      {
+        "Name": "Mega",
+        "FQBN": "arduino:avr:mega",
+        "Platforms": [
+          {
+            "Architecture": "avr",
+            "Package": "arduino"
+          }
         ],
-        "SupportedBoards": [
-            {
-                "Name": "Uno",
-                "Platforms": [{ "Architecture": "avr", "Package": "arduino" }],
-                "SupportedMotoShields": [
-                    { "Name": "Arduino Motor Shield", "ShieldType": 0 },
-                    { "Name": "Pololu MC33926 Motor Shield", "ShieldType": 1 }
-                ]
-            },
-            {
-                "Name": "Mega",
-                "Platforms": [{ "Architecture": "avr", "Package": "arduino" }],
-                "SupportedMotoShields": [
-                    { "Name": "Arduino Motor Shield", "ShieldType": 0 },
-                    { "Name": "Pololu MC33926 Motor Shield", "ShieldType": 1 }
-                ]
-            },
-            {
-                "Name": "SAMD21",
-                "Platforms": [
-                    { "Architecture": "avr", "Package": "arduino" },
-                    { "Architecture": "samd", "Package": "arduino" },
-                    { "Architecture": "samd", "Package": "SparkFun" }
-                ],
-                "SupportedMotoShields": [
-                    { "Name": "Arduino Motor Shield", "ShieldType": 0 },
-                    { "Name": "Pololu MC33926 Motor Shield", "ShieldType": 1 },
-                    { "Name": "FireBox MK1", "ShieldType": 3 },
-                    { "Name": "FireBox MK1S", "ShieldType": 4 }
-                ]
-            }
+        "SupportedMotoShields": [
+          {
+            "Name": "Arduino Motor Shield",
+            "ShieldType": 0
+          },
+          {
+            "Name": "Pololu MC33926 Motor Shield",
+            "ShieldType": 1
+          }
+        ]
+      }
+    ],
+    "DisplayName": "Base Station Classic",
+    "InputFileLocation": "DCCpp",
+    "AllowAdvanced": false,
+    "ConfigFile": "DCCpp/Config.h"
+  },
+  {
+    "Name": "CommandStation-EX",
+    "Git": "https://github.com/DCC-EX/CommandStation-EX.git",
+    "Libraries": [
+      {
+        "Name": "DIO2",
+        "Repo": "https://github.com/Locoduino/DIO2.git",
+        "Location": "libraries/DIO2",
+        "LibraryDownloadAvailable": true
+      },
+      {
+        "Name": "SparkFun External EEPROM Arduino Library",
+        "Repo": "https://github.com/sparkfun/SparkFun_External_EEPROM_Arduino_Library.git",
+        "Location": "libraries/SparkFun_External_EEPROM_Arduino_Library",
+        "LibraryDownloadAvailable": true
+      }
+    ],
+    "SupportedBoards": [
+      {
+        "Name": "Uno",
+        "FQBN": "arduino:avr:uno",
+        "Platforms": [
+          {
+            "Architecture": "avr",
+            "Package": "arduino"
+          }
         ],
-        "DisplayName": "CommandStation EX",
-        "InputFileLocation": "",
-        "AllowAdvanced": true,
-        "ConfigFile": "config.h"
-    }
+        "SupportedMotoShields": [
+          {
+            "Name": "Arduino Motor Shield",
+            "ShieldType": 0
+          },
+          {
+            "Name": "Pololu MC33926 Motor Shield",
+            "ShieldType": 1
+          }
+        ]
+      },
+      {
+        "Name": "Mega",
+        "FQBN": "arduino:avr:mega",
+        "Platforms": [
+          {
+            "Architecture": "avr",
+            "Package": "arduino"
+          }
+        ],
+        "SupportedMotoShields": [
+          {
+            "Name": "Arduino Motor Shield",
+            "ShieldType": 0
+          },
+          {
+            "Name": "Pololu MC33926 Motor Shield",
+            "ShieldType": 1
+          }
+        ]
+      },
+      {
+        "Name": "SAMD21",
+        "FQBN": "SparkFun:samd",
+        "Platforms": [
+          {
+            "Architecture": "avr",
+            "Package": "arduino"
+          },
+          {
+            "Architecture": "samd",
+            "Package": "arduino"
+          },
+          {
+            "Architecture": "samd",
+            "Package": "SparkFun"
+          }
+        ],
+        "SupportedMotoShields": [
+          {
+            "Name": "Arduino Motor Shield",
+            "ShieldType": 0
+          },
+          {
+            "Name": "Pololu MC33926 Motor Shield",
+            "ShieldType": 1
+          },
+          {
+            "Name": "FireBox MK1",
+            "ShieldType": 3
+          },
+          {
+            "Name": "FireBox MK1S",
+            "ShieldType": 4
+          }
+        ]
+      }
+    ],
+    "DisplayName": "CommandStation EX",
+    "InputFileLocation": ".",
+    "AllowAdvanced": true,
+    "ConfigFile": "config.h"
+  }
 ]