diff --git a/.gitignore b/.gitignore
index cdcd4769..975572ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,5 +60,7 @@ typings/
 # dotenv environment variables file
 .env
 
+#OSX metafiles
+.DS_Store
 
 # End of https://www.gitignore.io/api/node
diff --git a/contracts/hw.device-type/am571x-evm/contract.json b/contracts/hw.device-type/am571x-evm/contract.json
index 2bab3a29..a0b60659 100644
--- a/contracts/hw.device-type/am571x-evm/contract.json
+++ b/contracts/hw.device-type/am571x-evm/contract.json
@@ -11,7 +11,7 @@
       "bluetooth": false
     },
     "storage": {
-      "internal": false
+      "internal": true
     },
     "media": {
       "installation": "sdcard"
diff --git a/contracts/hw.device-type/apalis-imx6q/contract.json b/contracts/hw.device-type/apalis-imx6q/contract.json
index 59c06736..16bc9e71 100644
--- a/contracts/hw.device-type/apalis-imx6q/contract.json
+++ b/contracts/hw.device-type/apalis-imx6q/contract.json
@@ -11,7 +11,7 @@
       "bluetooth": false
     },
     "storage": {
-      "internal": false
+      "internal": true
     },
     "media": {
       "installation": "sdcard"
diff --git a/contracts/hw.device-type/artik10/contract.json b/contracts/hw.device-type/artik10/contract.json
index 3b5ea5ab..933e5411 100644
--- a/contracts/hw.device-type/artik10/contract.json
+++ b/contracts/hw.device-type/artik10/contract.json
@@ -11,7 +11,7 @@
       "bluetooth": false
     },
     "storage": {
-      "internal": false
+      "internal": true
     },
     "media": {
       "installation": "sdcard"
diff --git a/contracts/hw.device-type/artik5/contract.json b/contracts/hw.device-type/artik5/contract.json
index fb3357dd..19fa70ec 100644
--- a/contracts/hw.device-type/artik5/contract.json
+++ b/contracts/hw.device-type/artik5/contract.json
@@ -11,7 +11,7 @@
       "bluetooth": true
     },
     "storage": {
-      "internal": false
+      "internal": true
     },
     "media": {
       "installation": "sdcard"
diff --git a/contracts/hw.device-type/artik530/contract.json b/contracts/hw.device-type/artik530/contract.json
index e8dc8ceb..92672543 100644
--- a/contracts/hw.device-type/artik530/contract.json
+++ b/contracts/hw.device-type/artik530/contract.json
@@ -11,7 +11,7 @@
       "bluetooth": true
     },
     "storage": {
-      "internal": false
+      "internal": true
     },
     "media": {
       "installation": "sdcard"
diff --git a/contracts/hw.device-type/artik710/contract.json b/contracts/hw.device-type/artik710/contract.json
index a55d99d3..e73e1473 100644
--- a/contracts/hw.device-type/artik710/contract.json
+++ b/contracts/hw.device-type/artik710/contract.json
@@ -11,7 +11,7 @@
       "bluetooth": true
     },
     "storage": {
-      "internal": false
+      "internal": true
     },
     "media": {
       "installation": "sdcard"
diff --git a/contracts/hw.device-type/beagleboard-xm/boot-external.tpl b/contracts/hw.device-type/beagleboard-xm/boot-external.tpl
deleted file mode 100644
index 7d4df03d..00000000
--- a/contracts/hw.device-type/beagleboard-xm/boot-external.tpl
+++ /dev/null
@@ -1 +0,0 @@
-Hold down the S2 button near the SD card while you connect power to the {{hw.device-type.name}}. Let go of the S2 button when the 4 blue USER leds start flashing
diff --git a/contracts/hw.device-type/beagleboard-xm/boot-internal.tpl b/contracts/hw.device-type/beagleboard-xm/boot-internal.tpl
deleted file mode 100644
index c1d012f3..00000000
--- a/contracts/hw.device-type/beagleboard-xm/boot-internal.tpl
+++ /dev/null
@@ -1 +0,0 @@
-Press the S3 power button next to the ethernet port on your {{hw.device-type.name}}
diff --git a/contracts/hw.device-type/beagleboard-xm/prepare-network.tpl b/contracts/hw.device-type/beagleboard-xm/prepare-network.tpl
deleted file mode 100644
index 7ef8d976..00000000
--- a/contracts/hw.device-type/beagleboard-xm/prepare-network.tpl
+++ /dev/null
@@ -1 +0,0 @@
-Ensure the Wifi dongle is attached to your device, and that the ethernet cable is plugged into your device and leads to an internet-connected router
diff --git a/contracts/hw.device-type/beaglebone-black/boot-external.tpl b/contracts/hw.device-type/beaglebone-black/boot-external.tpl
deleted file mode 100644
index 7d4df03d..00000000
--- a/contracts/hw.device-type/beaglebone-black/boot-external.tpl
+++ /dev/null
@@ -1 +0,0 @@
-Hold down the S2 button near the SD card while you connect power to the {{hw.device-type.name}}. Let go of the S2 button when the 4 blue USER leds start flashing
diff --git a/contracts/hw.device-type/beaglebone-black/boot-internal.tpl b/contracts/hw.device-type/beaglebone-black/boot-internal.tpl
deleted file mode 100644
index c1d012f3..00000000
--- a/contracts/hw.device-type/beaglebone-black/boot-internal.tpl
+++ /dev/null
@@ -1 +0,0 @@
-Press the S3 power button next to the ethernet port on your {{hw.device-type.name}}
diff --git a/contracts/hw.device-type/beaglebone-black/prepare-network.tpl b/contracts/hw.device-type/beaglebone-black/prepare-network.tpl
deleted file mode 100644
index 7ef8d976..00000000
--- a/contracts/hw.device-type/beaglebone-black/prepare-network.tpl
+++ /dev/null
@@ -1 +0,0 @@
-Ensure the Wifi dongle is attached to your device, and that the ethernet cable is plugged into your device and leads to an internet-connected router
diff --git a/contracts/hw.device-type/beaglebone-green-wifi/boot-external.tpl b/contracts/hw.device-type/beaglebone-green-wifi/boot-external.tpl
deleted file mode 100644
index 7d4df03d..00000000
--- a/contracts/hw.device-type/beaglebone-green-wifi/boot-external.tpl
+++ /dev/null
@@ -1 +0,0 @@
-Hold down the S2 button near the SD card while you connect power to the {{hw.device-type.name}}. Let go of the S2 button when the 4 blue USER leds start flashing
diff --git a/contracts/hw.device-type/beaglebone-green-wifi/boot-internal.tpl b/contracts/hw.device-type/beaglebone-green-wifi/boot-internal.tpl
deleted file mode 100644
index c1d012f3..00000000
--- a/contracts/hw.device-type/beaglebone-green-wifi/boot-internal.tpl
+++ /dev/null
@@ -1 +0,0 @@
-Press the S3 power button next to the ethernet port on your {{hw.device-type.name}}
diff --git a/contracts/hw.device-type/beaglebone-green-wifi/prepare-network.tpl b/contracts/hw.device-type/beaglebone-green-wifi/prepare-network.tpl
deleted file mode 100644
index 7ef8d976..00000000
--- a/contracts/hw.device-type/beaglebone-green-wifi/prepare-network.tpl
+++ /dev/null
@@ -1 +0,0 @@
-Ensure the Wifi dongle is attached to your device, and that the ethernet cable is plugged into your device and leads to an internet-connected router
diff --git a/contracts/hw.device-type/beaglebone-green/boot-external.tpl b/contracts/hw.device-type/beaglebone-green/boot-external.tpl
deleted file mode 100644
index 7d4df03d..00000000
--- a/contracts/hw.device-type/beaglebone-green/boot-external.tpl
+++ /dev/null
@@ -1 +0,0 @@
-Hold down the S2 button near the SD card while you connect power to the {{hw.device-type.name}}. Let go of the S2 button when the 4 blue USER leds start flashing
diff --git a/contracts/hw.device-type/beaglebone-green/boot-internal.tpl b/contracts/hw.device-type/beaglebone-green/boot-internal.tpl
deleted file mode 100644
index c1d012f3..00000000
--- a/contracts/hw.device-type/beaglebone-green/boot-internal.tpl
+++ /dev/null
@@ -1 +0,0 @@
-Press the S3 power button next to the ethernet port on your {{hw.device-type.name}}
diff --git a/contracts/hw.device-type/beaglebone-green/prepare-network.tpl b/contracts/hw.device-type/beaglebone-green/prepare-network.tpl
deleted file mode 100644
index 7ef8d976..00000000
--- a/contracts/hw.device-type/beaglebone-green/prepare-network.tpl
+++ /dev/null
@@ -1 +0,0 @@
-Ensure the Wifi dongle is attached to your device, and that the ethernet cable is plugged into your device and leads to an internet-connected router
diff --git a/contracts/hw.device-type/boot-external.tpl b/contracts/hw.device-type/boot-external.tpl
deleted file mode 100644
index 8047a09c..00000000
--- a/contracts/hw.device-type/boot-external.tpl
+++ /dev/null
@@ -1 +0,0 @@
-Plug in the {{hw.device-type.media.installation}} and apply power to the device
diff --git a/contracts/hw.device-type/boot-internal.tpl b/contracts/hw.device-type/boot-internal.tpl
deleted file mode 100644
index c3f54364..00000000
--- a/contracts/hw.device-type/boot-internal.tpl
+++ /dev/null
@@ -1 +0,0 @@
-Power the device on, ensuring it boots from internal storage
diff --git a/contracts/hw.device-type/etcher-pro/contract.json b/contracts/hw.device-type/etcher-pro/contract.json
new file mode 100644
index 00000000..0d26bd91
--- /dev/null
+++ b/contracts/hw.device-type/etcher-pro/contract.json
@@ -0,0 +1,20 @@
+{
+  "slug": "etcher-pro",
+  "version": "1",
+  "type": "hw.device-type",
+  "name": "Etcher Pro",
+  "data": {
+    "arch": "aarch64",
+    "hdmi": true,
+    "led": false,
+    "connectivity": {
+      "wifi": true
+    },
+    "storage": {
+      "internal": true
+    },
+    "media": {
+      "installation": "sdcard"
+    }
+  }
+}
diff --git a/contracts/hw.device-type/fincm3/contract.json b/contracts/hw.device-type/fincm3/contract.json
index b5289ec5..d615ea35 100644
--- a/contracts/hw.device-type/fincm3/contract.json
+++ b/contracts/hw.device-type/fincm3/contract.json
@@ -2,7 +2,7 @@
   "slug": "fincm3",
   "version": "1",
   "type": "hw.device-type",
-  "name": "BALENA FIN",
+  "name": "Balena Fin (CM3)",
   "data": {
     "arch": "armv7hf",
     "hdmi": true,
diff --git a/contracts/hw.device-type/insert-install-media.tpl b/contracts/hw.device-type/insert-install-media.tpl
deleted file mode 100644
index d4a88651..00000000
--- a/contracts/hw.device-type/insert-install-media.tpl
+++ /dev/null
@@ -1 +0,0 @@
-Insert the {{hw.device-type.media.installation}} into the {{hw.device-type.name}}
diff --git a/contracts/hw.device-type/intel-nuc/boot-external.tpl b/contracts/hw.device-type/intel-nuc/boot-external.tpl
deleted file mode 100644
index 4fd84b41..00000000
--- a/contracts/hw.device-type/intel-nuc/boot-external.tpl
+++ /dev/null
@@ -1 +0,0 @@
-Connect a keyboard and screen then power up the Intel NUC. Press the F10 key while BIOS is loading in order to enter the boot menu. Next, select the "UEFI : USB" option
diff --git a/contracts/hw.device-type/intel-nuc/boot-internal.tpl b/contracts/hw.device-type/intel-nuc/boot-internal.tpl
deleted file mode 100644
index e38d3362..00000000
--- a/contracts/hw.device-type/intel-nuc/boot-internal.tpl
+++ /dev/null
@@ -1 +0,0 @@
-Press the power on button on your {{hw.device-type.name}}. Press F2 to enter Setup. Select the UEFI:SATA option under Boot Drive Order, save and exit Setup
diff --git a/contracts/hw.device-type/kitra520/contract.json b/contracts/hw.device-type/kitra520/contract.json
index 0e33caad..2c1007aa 100644
--- a/contracts/hw.device-type/kitra520/contract.json
+++ b/contracts/hw.device-type/kitra520/contract.json
@@ -11,7 +11,7 @@
       "bluetooth": false
     },
     "storage": {
-      "internal": false
+      "internal": true
     },
     "media": {
       "installation": "sdcard"
diff --git a/contracts/hw.device-type/kitra710/contract.json b/contracts/hw.device-type/kitra710/contract.json
index 10f2209a..69abcab8 100644
--- a/contracts/hw.device-type/kitra710/contract.json
+++ b/contracts/hw.device-type/kitra710/contract.json
@@ -11,7 +11,7 @@
       "bluetooth": true
     },
     "storage": {
-      "internal": false
+      "internal": true
     },
     "media": {
       "installation": "sdcard"
diff --git a/contracts/hw.device-type/nitrogen6x/contract.json b/contracts/hw.device-type/nitrogen6x/contract.json
index 1979884c..0db55b2c 100644
--- a/contracts/hw.device-type/nitrogen6x/contract.json
+++ b/contracts/hw.device-type/nitrogen6x/contract.json
@@ -12,7 +12,7 @@
       "wifi": true
     },
     "storage": {
-      "internal": true
+      "internal": false
     },
     "media": {
       "installation": "sdcard"
diff --git a/contracts/hw.device-type/nitrogen6xq2g/contract.json b/contracts/hw.device-type/nitrogen6xq2g/contract.json
index fcb0ee42..e4ea379d 100644
--- a/contracts/hw.device-type/nitrogen6xq2g/contract.json
+++ b/contracts/hw.device-type/nitrogen6xq2g/contract.json
@@ -12,7 +12,7 @@
       "wifi": true
     },
     "storage": {
-      "internal": true
+      "internal": false
     },
     "media": {
       "installation": "sdcard"
diff --git a/contracts/hw.device-type/nitrogen8mm-dwe/contract.json b/contracts/hw.device-type/nitrogen8mm-dwe/contract.json
index 333bf186..b145912f 100644
--- a/contracts/hw.device-type/nitrogen8mm-dwe/contract.json
+++ b/contracts/hw.device-type/nitrogen8mm-dwe/contract.json
@@ -15,7 +15,7 @@
       "internal": true
     },
     "media": {
-      "installation": "sdcard"
+      "installation": "dfu"
     }
   }
 }
diff --git a/contracts/hw.device-type/prepare-network.tpl b/contracts/hw.device-type/prepare-network.tpl
deleted file mode 100644
index 2abd3d99..00000000
--- a/contracts/hw.device-type/prepare-network.tpl
+++ /dev/null
@@ -1 +0,0 @@
-Ensure the ethernet cable is plugged into your device and leads to an internet-connected router. Also, in case you're using an external wifi dongle, ensure its attached to your device
diff --git a/contracts/hw.device-type/remove-install-media.tpl b/contracts/hw.device-type/remove-install-media.tpl
deleted file mode 100644
index daa6b8df..00000000
--- a/contracts/hw.device-type/remove-install-media.tpl
+++ /dev/null
@@ -1 +0,0 @@
-Remove the {{hw.device-type.media.installation}}
diff --git a/contracts/hw.device-type/revpi-core-3/contract.json b/contracts/hw.device-type/revpi-core-3/contract.json
index 73804202..f75f46e7 100644
--- a/contracts/hw.device-type/revpi-core-3/contract.json
+++ b/contracts/hw.device-type/revpi-core-3/contract.json
@@ -15,7 +15,7 @@
       "internal": true
     },
     "media": {
-      "installation": "sdcard"
+      "installation": "dfu"
     }
   }
 }
diff --git a/contracts/hw.device-type/ts4900/boot-external.tpl b/contracts/hw.device-type/ts4900/boot-external.tpl
deleted file mode 100644
index 404e7715..00000000
--- a/contracts/hw.device-type/ts4900/boot-external.tpl
+++ /dev/null
@@ -1 +0,0 @@
-Set the J11 jump to position 2-3 (the position furthest away from the edge of the board) and then power up the board
diff --git a/contracts/hw.device-type/ts4900/boot-internal.tpl b/contracts/hw.device-type/ts4900/boot-internal.tpl
deleted file mode 100644
index da077164..00000000
--- a/contracts/hw.device-type/ts4900/boot-internal.tpl
+++ /dev/null
@@ -1 +0,0 @@
-Set boot selector to boot from eMMC, this will depend on what base carrier board you are using. Now apply power to the board
diff --git a/contracts/hw.device-type/ts7700/contract.json b/contracts/hw.device-type/ts7700/contract.json
new file mode 100644
index 00000000..1e4ee5c8
--- /dev/null
+++ b/contracts/hw.device-type/ts7700/contract.json
@@ -0,0 +1,21 @@
+{
+  "slug": "ts7700",
+  "version": "1",
+  "type": "hw.device-type",
+  "name": "Technologic TS-7700",
+  "data": {
+    "arch": "armv5e",
+    "hdmi": true,
+    "led": false,
+    "connectivity": {
+      "bluetooth": false,
+      "wifi": false
+    },
+    "storage": {
+      "internal": false
+    },
+    "media": {
+      "installation": "sdcard"
+    }
+  }
+}
diff --git a/contracts/hw.device-type/via-vab820-quad/boot-external.tpl b/contracts/hw.device-type/via-vab820-quad/boot-external.tpl
deleted file mode 100644
index 10cbe6fc..00000000
--- a/contracts/hw.device-type/via-vab820-quad/boot-external.tpl
+++ /dev/null
@@ -1 +0,0 @@
-Set boot selector to boot from {{hw.device-type.media.installation}}, this will depend on what base carrier board you are using. Now apply power to the board
diff --git a/contracts/hw.device-type/via-vab820-quad/boot-internal.tpl b/contracts/hw.device-type/via-vab820-quad/boot-internal.tpl
deleted file mode 100644
index 8f7965d3..00000000
--- a/contracts/hw.device-type/via-vab820-quad/boot-internal.tpl
+++ /dev/null
@@ -1 +0,0 @@
-Set the J11 jumper to position 1-2 and Replug the power cable for the {{hw.device-type.name}} to power it back up
diff --git a/contracts/hw.device-type/via-vab820-quad/prepare-network.tpl b/contracts/hw.device-type/via-vab820-quad/prepare-network.tpl
deleted file mode 100644
index 7ef8d976..00000000
--- a/contracts/hw.device-type/via-vab820-quad/prepare-network.tpl
+++ /dev/null
@@ -1 +0,0 @@
-Ensure the Wifi dongle is attached to your device, and that the ethernet cable is plugged into your device and leads to an internet-connected router
diff --git a/contracts/hw.device-type/visual-appearance-when-off.tpl b/contracts/hw.device-type/visual-appearance-when-off.tpl
deleted file mode 100644
index 82b8fca5..00000000
--- a/contracts/hw.device-type/visual-appearance-when-off.tpl
+++ /dev/null
@@ -1 +0,0 @@
-All the LEDs of the device will be turned off
diff --git a/contracts/hw.device-type/zc702-zynq7/contract.json b/contracts/hw.device-type/zynq-xz702/contract.json
similarity index 100%
rename from contracts/hw.device-type/zc702-zynq7/contract.json
rename to contracts/hw.device-type/zynq-xz702/contract.json