0.5.24

* Fix i18n not working after 277d5a7

The translation strings file in "core" package should have file names
"core-strings.json" or "core-jsdoc-strings.json".

* Enable ja translation

Rename "core-strings.json" to "core-jsdoc-strings.json".
Add new "core-strings.json" as a copy of the template.
Add two lines for the files in "pxt.json".

.gitignore

@@ -24,3 +24,7 @@ clients/electron/projects
 *.db
 *.suo
 *.log
+
+.DS_Store
+.idea
+*.iml

.travis.yml

@@ -3,17 +3,12 @@ node_js:
   - "5.7.0"
 script:
   - "node node_modules/pxt-core/built/pxt.js travis"  
-  - "(cd libs/lang-test0; node ../../node_modules/pxt-core/built/pxt.js run)"
-  - "(cd libs/lang-test1; node ../../node_modules/pxt-core/built/pxt.js run)"
-  - "(cd libs/lang-test0; node ../../node_modules/pxt-core/built/pxt.js test)"
-  - "(cd libs/lang-test1; node ../../node_modules/pxt-core/built/pxt.js test)"
   - "node node_modules/pxt-core/built/pxt.js testdir tests"
   - "node node_modules/pxt-core/built/pxt.js uploaddoc"
-  - "(cd libs/hello; node ../../node_modules/pxt-core/built/pxt.js testconv https://az851932.vo.msecnd.net/files/td-converter-tests-v0.json)"
 sudo: false
 notifications:
   email:
-    - touchdevelop-build@microsoft.com
+    - kindscript@microsoft.com
 cache:
   directories:
     - node_modules

.vscode/settings.json

@@ -16,5 +16,6 @@
         "**/pxt_modules/**": true
     },    
     "tslint.enable": true,
-    "tslint.rulesDirectory": "node_modules/tslint-microsoft-contrib"
+    "tslint.rulesDirectory": "node_modules/tslint-microsoft-contrib",
+    "typescript.tsdk": "./node_modules/typescript/lib"
 }

README.md

@@ -1,11 +1,11 @@
-# micro:bit target for PXT
+# Calliope target for PXT
 
-This target allow to program a [BBC micro:bit](https://www.microbit.co.uk/) using 
+This target allow to program a [Calliope](http://calliope.cc/) using 
 PXT ([Microsoft Programming Experience Toolkit](https://github.com/Microsoft/pxt)).
 
-* [Try it live](https://codethemicrobit.com)
+[![Build Status](https://travis-ci.org/Microsoft/pxt-calliope.svg?branch=master)](https://travis-ci.org/Microsoft/pxt-calliope)
 
-[![Build Status](https://travis-ci.org/Microsoft/pxt-microbit.svg?branch=master)](https://travis-ci.org/Microsoft/pxt-microbit)
+![](http://calliope.cc/content/1-ueber-mini/mini_board.png)
 
 ## Local server
 
@@ -18,8 +18,8 @@ The following commands are a 1-time setup after synching the repo on your machin
 * if not yet installed, install [Node.js 4.4.5 or higher](https://nodejs.org/en/download/)
 * [clone this repo](https://help.github.com/articles/cloning-a-repository/) to your computer and go in the project folder
 ```
-git clone https://github.com/microsoft/pxt-microbit
-cd pxt-microbit
+git clone https://github.com/microsoft/pxt-calliope
+cd pxt-calliope
 ```
 * install the PXT command line (add ``sudo`` for Mac/Linux shells).
 ```
@@ -32,14 +32,15 @@ npm install
 
 ### Running
 
-Run this command to open a local web server (add ``sudo`` for Mac/Linux shells)
+Run this command to open a local web server (add ``sudo`` for Mac/Linux shells).
 ```
 pxt serve
 ```
 If the local server opens in the wrong browser, make sure to copy the URL containing the local token. 
 Otherwise, the editor will not be able to load the projects.
 
-If you need modify the `.cpp` files, turn on yotta compilation with the ``-yt`` flag (add ``sudo`` for Mac/Linux shells):
+If you need modify the `.cpp` files, turn on yotta compilation with the ``-yt`` flag (add ``sudo`` for Mac/Linux shells). On Windows, you must be running
+from the ``Run Yotta`` command prompt.
 ```
 pxt serve -yt
 ```
@@ -53,16 +54,6 @@ pxt update
 
 More instructions at https://github.com/Microsoft/pxt#running-a-target-from-localhost 
 
-## Universal Windows App
-
-The Windows 10 app is a [Universal Windows Hosted Web App](https://microsoftedge.github.io/WebAppsDocs/en-US/win10/CreateHWA.htm)
-that wraps ``codethemicrobit.com`` and provides additional features.
-
-### Building
-
-* Install Visual Studio 2015 Update 2 or higher. Make sure the Windows 10 templates are installed.
-* open the ``win10/app.sln`` solution and launch the ``codethemicrobit`` project.
-
 ## Testing
 
 The build automatically runs the following:
@@ -71,7 +62,6 @@ The build automatically runs the following:
 * `pxt run` in `libs/lang-test*` - this will run the test in command line runner; 
   there is a number of asserts in both of these
 * `pxt testdir` in `tests` - this makes sure all the files compile and generates .hex files
-* run the TD->TS converter on a number of test scripts from `microbit.co.uk` and make sure the results compile
 
 To test something on the device:
 

clients/electron/.gitignore

@@ -0,0 +1,2 @@
+node_modules
+projects

clients/electron/README.md

@@ -0,0 +1,5 @@
+# PXT micro:bit Electron app
+
+A very basic wrapper around the web app. To install, copy the contents of this
+directory to somewhere outside the main `pxt-microbit` repository. Then run `npm
+install && npm start`.

clients/electron/index.html

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8">
+    <title>code the micro:bit</title>
+  </head>
+  <body>
+    <webview id="webview" style="position:absolute; left:0; top:0; right:0; bottom:0"/>
+    <script>
+      const webview = document.getElementById("webview")
+      const url = `http://localhost:3232/${window.location.hash}`
+      webview.src = url
+    </script>
+  </body>
+</html>

clients/electron/main.js

@@ -1,67 +1,39 @@
-const electron = require('electron')
-// Module to control application life.
-const app = electron.app
-// Module to create native browser window.
-const BrowserWindow = electron.BrowserWindow
-// pxt toolchain
+const {app, BrowserWindow, Menu} = require('electron')
 const pxt = require('pxt-core')
+const path = require('path')
 
-// Keep a global reference of the window object, if you don't, the window will
-// be closed automatically when the JavaScript object is garbage collected.
-let mainWindow
+let win
 
-function createWindow() {
-  console.log('starting app...')
-  // Create the browser window.
-  mainWindow = new BrowserWindow({
-    width: 800, height: 600,
-    webPreferences: {
-      nodeIntegration: false,
-    }
+const cliPath = path.join(process.cwd(), "node_modules/pxt-microbit") 
+
+function startServerAndCreateWindow() {
+  pxt.mainCli(cliPath, ["serve", "-no-browser"])
+  createWindow()
+}
+
+function createWindow () {
+  win = new BrowserWindow({
+    width: 800,
+    height: 600,
+    title: "code the micro:bit"
   })
-
-  ts.pxt.Util.debug = true;
-  pxt.mainCli("C:/gh/pxt-microbit/clients/electron/node_modules/pxt-microbit", ["serve", "-just"]);
-  
-  // no menu
-  mainWindow.setMenu(null);
-
-  // and load the index.html of the app.
-  mainWindow.loadURL(`http://localhost:3232/#local_token=08ba9b8f-6ccb-4202-296d-28fac7a553d9`)
-
-  // Open the DevTools.
-  mainWindow.webContents.openDevTools()
-
-  // Emitted when the window is closed.
-  mainWindow.on('closed', function () {
-    // Dereference the window object, usually you would store windows
-    // in an array if your app supports multi windows, this is the time
-    // when you should delete the corresponding element.
-    mainWindow = null
+  Menu.setApplicationMenu(null)
+  win.loadURL(`file://${__dirname}/index.html#local_token=${pxt.globalConfig.localToken}`)
+  win.on('closed', () => {
+    win = null
   })
 }
 
-// This method will be called when Electron has finished
-// initialization and is ready to create browser windows.
-// Some APIs can only be used after this event occurs.
-app.on('ready', createWindow)
+app.on('ready', startServerAndCreateWindow)
 
-// Quit when all windows are closed.
-app.on('window-all-closed', function () {
-  // On OS X it is common for applications and their menu bar
-  // to stay active until the user quits explicitly with Cmd + Q
+app.on('window-all-closed', () => {
   if (process.platform !== 'darwin') {
     app.quit()
   }
 })
 
-app.on('activate', function () {
-  // On OS X it's common to re-create a window in the app when the
-  // dock icon is clicked and there are no other windows open.
-  if (mainWindow === null) {
+app.on('activate', () => {
+  if (win === null) {
     createWindow()
   }
 })
-
-// In this file you can include the rest of your app's specific main process
-// code. You can also put them in separate files and require them here.

clients/electron/package.json

@@ -1,19 +1,14 @@
 {
-  "name": "codethemicrobit",
-  "version": "0.1.0",
-  "description": "A Blocks / JavaScript editor for the micro:bit",
-  "main": "main.js",
-  "scripts": {
-    "start": "electron ."
-  },
+  "name"    : "code-the-microbit",
+  "version" : "1.0.0",
+  "description": "Blocks / Javascript editor",
   "author": "Microsoft",
-  "license": "MIT",
-  "devDependencies": {
-    "electron-prebuilt": "^1.2.0"
+  "main"    : "main.js",
+  "scripts": {
+      "start": "node_modules/.bin/electron ."
   },
-  "dependencies": {
-    "typescript": "1.8.7",
-    "pxt-core": "*",
-    "pxt-microbit": "*"
+  "devDependencies": {
+      "electron": "*",
+      "pxt-microbit": "*"
   }
-}
+}

clients/macuploader/.gitignore

@@ -0,0 +1,137 @@
+
+# Created by https://www.gitignore.io/api/osx,xcode,objective-c,vim
+
+### OSX ###
+*.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+
+### Xcode ###
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
+build/
+DerivedData/
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata/
+
+## Other
+*.moved-aside
+*.xccheckout
+*.xcscmblueprint
+
+
+### Objective-C ###
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
+build/
+DerivedData/
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata/
+
+## Other
+*.moved-aside
+*.xcuserstate
+
+## Obj-C/Swift specific
+*.hmap
+*.ipa
+*.dSYM.zip
+*.dSYM
+
+# CocoaPods
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+# Pods/
+
+# Carthage
+#
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+Carthage/Build
+
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the 
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md
+
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+
+# Code Injection
+#
+# After new code Injection tools there's a generated folder /iOSInjectionProject
+# https://github.com/johnno1962/injectionforxcode
+
+iOSInjectionProject/
+
+### Objective-C Patch ###
+*.xcscmblueprint
+
+
+### Vim ###
+# swap
+[._]*.s[a-w][a-z]
+[._]s[a-w][a-z]
+# session
+Session.vim
+# temporary
+.netrwhist
+*~
+# auto-generated tag files
+tags

clients/macuploader/Microbit Uploader.xcodeproj/project.pbxproj

@@ -0,0 +1,307 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		E93040071D895D1F00D931CA /* DirectoryWatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = E93040061D895D1F00D931CA /* DirectoryWatcher.m */; };
+		E930400A1D89620900D931CA /* Uploader.m in Sources */ = {isa = PBXBuildFile; fileRef = E93040091D89620900D931CA /* Uploader.m */; };
+		E9F4FEE21D8709980071D783 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = E9F4FEE11D8709980071D783 /* AppDelegate.m */; };
+		E9F4FEE51D8709980071D783 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = E9F4FEE41D8709980071D783 /* main.m */; };
+		E9F4FEE71D8709980071D783 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E9F4FEE61D8709980071D783 /* Assets.xcassets */; };
+		E9F4FEEA1D8709980071D783 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = E9F4FEE81D8709980071D783 /* MainMenu.xib */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		E93040051D895D1F00D931CA /* DirectoryWatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirectoryWatcher.h; sourceTree = "<group>"; };
+		E93040061D895D1F00D931CA /* DirectoryWatcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DirectoryWatcher.m; sourceTree = "<group>"; };
+		E93040081D89620900D931CA /* Uploader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Uploader.h; sourceTree = "<group>"; };
+		E93040091D89620900D931CA /* Uploader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Uploader.m; sourceTree = "<group>"; };
+		E9F4FEDD1D8709980071D783 /* Microbit Uploader.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Microbit Uploader.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		E9F4FEE01D8709980071D783 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
+		E9F4FEE11D8709980071D783 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
+		E9F4FEE41D8709980071D783 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+		E9F4FEE61D8709980071D783 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		E9F4FEE91D8709980071D783 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
+		E9F4FEEB1D8709980071D783 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		E9F4FEDA1D8709980071D783 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		E9F4FED41D8709980071D783 = {
+			isa = PBXGroup;
+			children = (
+				E9F4FEDF1D8709980071D783 /* Microbit Uploader */,
+				E9F4FEDE1D8709980071D783 /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		E9F4FEDE1D8709980071D783 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				E9F4FEDD1D8709980071D783 /* Microbit Uploader.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		E9F4FEDF1D8709980071D783 /* Microbit Uploader */ = {
+			isa = PBXGroup;
+			children = (
+				E9F4FEE01D8709980071D783 /* AppDelegate.h */,
+				E9F4FEE11D8709980071D783 /* AppDelegate.m */,
+				E9F4FEE61D8709980071D783 /* Assets.xcassets */,
+				E9F4FEE81D8709980071D783 /* MainMenu.xib */,
+				E9F4FEEB1D8709980071D783 /* Info.plist */,
+				E9F4FEE31D8709980071D783 /* Supporting Files */,
+				E93040051D895D1F00D931CA /* DirectoryWatcher.h */,
+				E93040061D895D1F00D931CA /* DirectoryWatcher.m */,
+				E93040081D89620900D931CA /* Uploader.h */,
+				E93040091D89620900D931CA /* Uploader.m */,
+			);
+			path = "Microbit Uploader";
+			sourceTree = "<group>";
+		};
+		E9F4FEE31D8709980071D783 /* Supporting Files */ = {
+			isa = PBXGroup;
+			children = (
+				E9F4FEE41D8709980071D783 /* main.m */,
+			);
+			name = "Supporting Files";
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		E9F4FEDC1D8709980071D783 /* Microbit Uploader */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = E9F4FEEE1D8709980071D783 /* Build configuration list for PBXNativeTarget "Microbit Uploader" */;
+			buildPhases = (
+				E9F4FED91D8709980071D783 /* Sources */,
+				E9F4FEDA1D8709980071D783 /* Frameworks */,
+				E9F4FEDB1D8709980071D783 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "Microbit Uploader";
+			productName = "Microbit Uploader";
+			productReference = E9F4FEDD1D8709980071D783 /* Microbit Uploader.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		E9F4FED51D8709980071D783 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0800;
+				ORGANIZATIONNAME = thomasdenney;
+				TargetAttributes = {
+					E9F4FEDC1D8709980071D783 = {
+						CreatedOnToolsVersion = 7.3.1;
+					};
+				};
+			};
+			buildConfigurationList = E9F4FED81D8709980071D783 /* Build configuration list for PBXProject "Microbit Uploader" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+				Base,
+			);
+			mainGroup = E9F4FED41D8709980071D783;
+			productRefGroup = E9F4FEDE1D8709980071D783 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				E9F4FEDC1D8709980071D783 /* Microbit Uploader */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		E9F4FEDB1D8709980071D783 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				E9F4FEE71D8709980071D783 /* Assets.xcassets in Resources */,
+				E9F4FEEA1D8709980071D783 /* MainMenu.xib in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		E9F4FED91D8709980071D783 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				E9F4FEE51D8709980071D783 /* main.m in Sources */,
+				E930400A1D89620900D931CA /* Uploader.m in Sources */,
+				E9F4FEE21D8709980071D783 /* AppDelegate.m in Sources */,
+				E93040071D895D1F00D931CA /* DirectoryWatcher.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXVariantGroup section */
+		E9F4FEE81D8709980071D783 /* MainMenu.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				E9F4FEE91D8709980071D783 /* Base */,
+			);
+			name = MainMenu.xib;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+		E9F4FEEC1D8709980071D783 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "-";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		E9F4FEED1D8709980071D783 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "-";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
+		E9F4FEEF1D8709980071D783 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				COMBINE_HIDPI_IMAGES = YES;
+				INFOPLIST_FILE = "Microbit Uploader/Info.plist";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.thomasdenney.Microbit-Uploader";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		E9F4FEF01D8709980071D783 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				COMBINE_HIDPI_IMAGES = YES;
+				INFOPLIST_FILE = "Microbit Uploader/Info.plist";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.thomasdenney.Microbit-Uploader";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		E9F4FED81D8709980071D783 /* Build configuration list for PBXProject "Microbit Uploader" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				E9F4FEEC1D8709980071D783 /* Debug */,
+				E9F4FEED1D8709980071D783 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		E9F4FEEE1D8709980071D783 /* Build configuration list for PBXNativeTarget "Microbit Uploader" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				E9F4FEEF1D8709980071D783 /* Debug */,
+				E9F4FEF01D8709980071D783 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = E9F4FED51D8709980071D783 /* Project object */;
+}

clients/macuploader/Microbit Uploader.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:Microbit Uploader.xcodeproj">
+   </FileRef>
+</Workspace>

clients/macuploader/Microbit Uploader/AppDelegate.h

@@ -0,0 +1,6 @@
+#import <Cocoa/Cocoa.h>
+
+@interface AppDelegate : NSObject <NSApplicationDelegate>
+
+@end
+

clients/macuploader/Microbit Uploader/AppDelegate.m

@@ -0,0 +1,130 @@
+#import "AppDelegate.h"
+#import "DirectoryWatcher.h"
+#import "Uploader.h"
+
+@interface AppDelegate ()<DirectoryWatcherDelegate, UploaderDelegate, NSUserNotificationCenterDelegate>
+
+@property DirectoryWatcher * watcher;
+@property Uploader * uploader;
+@property NSStatusItem * menubarItem;
+
+@end
+
+@implementation AppDelegate
+
+- (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
+    // Insert code here to initialize your application
+    self.watcher = [[DirectoryWatcher alloc] initWithPath:[self downloadsDirectory]];
+    self.watcher.delegate = self;
+    [self.watcher startWatching];
+    
+    self.uploader = [[Uploader alloc] init];
+    self.uploader.delegate = self;
+    
+    [NSUserNotificationCenter defaultUserNotificationCenter].delegate = self;
+    
+    [self createMenuBarIcon];
+    [self configureVolumeMountNotifications];
+    [self showActiveMicroBits];
+}
+
+- (void)applicationWillTerminate:(NSNotification *)aNotification {
+    // Insert code here to tear down your application
+    [self.watcher stopWatching];
+}
+
+- (void)dealloc {
+    [[NSWorkspace sharedWorkspace].notificationCenter removeObserver:self];
+}
+
+#pragma mark - Directory
+
+- (void)watcher:(DirectoryWatcher *)watcher observedNewFileAtPath:(NSString *)path {
+    NSString * fullPath = [watcher.path stringByAppendingPathComponent:path];
+    if ([self.uploader shouldUploadFileAtPath:fullPath]) {
+        [self.uploader uploadFile:fullPath];
+    }
+}
+
+- (NSString*)downloadsDirectory {
+    NSArray * paths = NSSearchPathForDirectoriesInDomains(NSDownloadsDirectory, NSUserDomainMask, YES);
+    return paths.firstObject;
+}
+
+#pragma mark - Uploader delegate
+
+- (void)uploader:(Uploader *)uploader transferredFile:(NSString *)file toMicroBit:(NSString *)microbit {
+    [self showNotification:@"micro:bit upload" withDescription:[NSString stringWithFormat:@"%@ uploaded to %@", file.lastPathComponent, microbit]];
+}
+
+- (void)uploader:(Uploader *)uploader failedToTransferFile:(NSString *)file toMicroBit:(NSString *)microbit {
+    [self showNotification:@"micro:bit upload failed" withDescription:[NSString stringWithFormat:@"Couldn't transfer %@ to %@", file.lastPathComponent, microbit]];
+}
+
+- (void)showNotification:(NSString*)title withDescription:(NSString*)description {
+    NSUserNotification * notification = [NSUserNotification new];
+    notification.title = title;
+    notification.informativeText = description;
+    notification.soundName = NSUserNotificationDefaultSoundName;
+    [[NSUserNotificationCenter defaultUserNotificationCenter] deliverNotification:notification];
+}
+
+#pragma mark - NSUserNotificationCenterDelegate
+
+- (BOOL)userNotificationCenter:(NSUserNotificationCenter *)center shouldPresentNotification:(NSUserNotification *)notification {
+    return YES;
+}
+
+#pragma mark - Volume mount/unmount notification
+
+- (void)configureVolumeMountNotifications {
+    [[NSWorkspace sharedWorkspace].notificationCenter addObserver:self selector:@selector(volumeMountNotification:) name:NSWorkspaceDidRenameVolumeNotification object:nil];
+    [[NSWorkspace sharedWorkspace].notificationCenter addObserver:self selector:@selector(volumeMountNotification:) name:NSWorkspaceDidMountNotification object:nil];
+    [[NSWorkspace sharedWorkspace].notificationCenter addObserver:self selector:@selector(volumeMountNotification:) name:NSWorkspaceDidUnmountNotification object:nil];
+}
+
+- (void)volumeMountNotification:(NSNotification*)sender {
+    //Delay upadting the menu to give the chance for the disk to fully mount or unmount
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        [self showActiveMicroBits];
+    });
+}
+
+#pragma mark - Menu bar app
+
+- (void)createMenuBarIcon {
+    self.menubarItem = [[NSStatusBar systemStatusBar] statusItemWithLength:NSSquareStatusItemLength];
+    self.menubarItem.button.image = [NSImage imageNamed:@"menubar"];
+}
+
+- (void)showActiveMicroBits {
+    NSMenu * menu = [NSMenu new];
+    NSString * countString;
+    NSUInteger count = self.uploader.microBitPaths.count;
+    if (count == 0) {
+        countString = @"No connect micro:bits";
+    }
+    else if (count == 1) {
+        countString = @"1 connected micro:bit";
+    }
+    else {
+        countString = [NSString stringWithFormat:@"%lu connected micro:bits", count];
+    }
+    NSMenuItem * microBitCount = [[NSMenuItem alloc] initWithTitle:countString action:nil keyEquivalent:@""];
+    microBitCount.enabled = NO;
+    [menu addItem:microBitCount];
+    
+    NSMenuItem * websiteItem = [[NSMenuItem alloc] initWithTitle:@"Editor" action:@selector(launchEditor:) keyEquivalent:@"e"];
+    [menu addItem:websiteItem];
+    
+    NSMenuItem * quitItem = [[NSMenuItem alloc] initWithTitle:@"Quit" action:@selector(terminate:) keyEquivalent:@"q"];
+    [menu addItem:quitItem];
+    
+    self.menubarItem.menu = menu;
+}
+
+- (void)launchEditor:(id)sender {
+    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://codethemicrobit.com/"]];
+}
+
+@end

clients/macuploader/Microbit Uploader/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -0,0 +1,68 @@
+{
+  "images" : [
+    {
+      "size" : "16x16",
+      "idiom" : "mac",
+      "filename" : "icon_16x16.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "16x16",
+      "idiom" : "mac",
+      "filename" : "icon_16x16@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "32x32",
+      "idiom" : "mac",
+      "filename" : "icon_32x32.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "32x32",
+      "idiom" : "mac",
+      "filename" : "icon_32x32@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "128x128",
+      "idiom" : "mac",
+      "filename" : "icon_128x128.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "128x128",
+      "idiom" : "mac",
+      "filename" : "icon_128x128@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "256x256",
+      "idiom" : "mac",
+      "filename" : "icon_256x256.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "256x256",
+      "idiom" : "mac",
+      "filename" : "icon_256x256@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "512x512",
+      "idiom" : "mac",
+      "filename" : "icon_512x512.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "512x512",
+      "idiom" : "mac",
+      "filename" : "icon_512x512@2x.png",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

clients/macuploader/Microbit Uploader/Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

clients/macuploader/Microbit Uploader/Assets.xcassets/menubar.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "idiom" : "mac",
+      "filename" : "menubar.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

clients/macuploader/Microbit Uploader/Base.lproj/MainMenu.xib

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
+            <connections>
+                <outlet property="delegate" destination="Voe-Tx-rLC" id="GzC-gU-4Uq"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customObject id="Voe-Tx-rLC" customClass="AppDelegate"/>
+        <customObject id="YLy-65-1bz" customClass="NSFontManager"/>
+    </objects>
+</document>

clients/macuploader/Microbit Uploader/DirectoryWatcher.h

@@ -0,0 +1,24 @@
+#import <Foundation/Foundation.h>
+
+@class DirectoryWatcher;
+
+@protocol DirectoryWatcherDelegate <NSObject>
+
+- (void)watcher:(DirectoryWatcher*)watcher observedNewFileAtPath:(NSString*)path;
+
+@end
+
+@interface DirectoryWatcher : NSObject
+
+- (instancetype)initWithPath:(NSString*)path;
+
+@property (readonly) NSString * path;
+
+@property id<DirectoryWatcherDelegate> delegate;
+
+- (void)startWatching;
+
+//Automatically called when deallocated
+- (void)stopWatching;
+
+@end

clients/macuploader/Microbit Uploader/DirectoryWatcher.m

@@ -0,0 +1,75 @@
+#import "DirectoryWatcher.h"
+#import <CoreServices/CoreServices.h>
+
+void callback(ConstFSEventStreamRef streamRef, void * info, size_t numEvents, void * eventPaths, const FSEventStreamEventFlags eventFlags[], const FSEventStreamEventId eventIds[]);
+
+@interface DirectoryWatcher ()
+
+@property NSString * path;
+@property NSMutableSet<NSString*>* knownFiles;
+@property FSEventStreamRef stream;
+
+- (void)rescanPathWithEvents:(BOOL)sendEvents;
+
+@end
+
+@implementation DirectoryWatcher
+
+- (instancetype)initWithPath:(NSString *)path {
+    if (!path) {
+        return nil;
+    }
+    
+    self = [super init];
+    if (self) {
+        self.path = path;
+    }
+    return self;
+}
+
+- (void)dealloc {
+    [self stopWatching];
+}
+
+- (void)startWatching {
+    self.knownFiles = [NSMutableSet new];
+    [self rescanPathWithEvents:NO];
+    
+    CFStringRef path = (__bridge CFStringRef)(self.path);
+    CFArrayRef pathsToWatch = CFArrayCreate(NULL, (const void**)&path, 1, NULL);
+    CFAbsoluteTime latency = 1;
+    FSEventStreamContext context = { 0, (__bridge void * _Nullable)(self), NULL, NULL, NULL };
+    self.stream = FSEventStreamCreate(NULL, &callback, &context, pathsToWatch, kFSEventStreamEventIdSinceNow, latency, kFSEventStreamCreateFlagNone);
+    FSEventStreamScheduleWithRunLoop(self.stream, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
+    FSEventStreamStart(self.stream);
+}
+
+- (void)stopWatching {
+    if (self.stream) {
+        FSEventStreamStop(self.stream);
+        FSEventStreamInvalidate(self.stream);
+        FSEventStreamRelease(self.stream);
+        self.stream = nil;
+    }
+}
+
+- (void)rescanPathWithEvents:(BOOL)sendEvents {
+    NSArray<NSString*>* downloadFiles = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:self.path error:nil];
+    NSMutableSet<NSString*>* fullSet = [NSMutableSet new];
+    for (NSString * file in downloadFiles) {
+        [fullSet addObject:file];
+        if (![self.knownFiles containsObject:file]) {
+            if (sendEvents) {
+                [self.delegate watcher:self observedNewFileAtPath:file];
+            }
+        }
+    }
+    self.knownFiles = fullSet;
+}
+
+@end
+
+void callback(ConstFSEventStreamRef streamRef, void * info, size_t numEvents, void * eventPaths, const FSEventStreamEventFlags eventFlags[], const FSEventStreamEventId eventIds[]) {
+    DirectoryWatcher * watcher = (__bridge DirectoryWatcher*)info;
+    [watcher rescanPathWithEvents:YES];
+}

clients/macuploader/Microbit Uploader/Info.plist

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.01</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>2</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
+	<key>LSUIElement</key>
+	<true/>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2016 Thomas Denney. All rights reserved.</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>

clients/macuploader/Microbit Uploader/Uploader.h

@@ -0,0 +1,21 @@
+#import <Foundation/Foundation.h>
+
+@class Uploader;
+
+@protocol UploaderDelegate <NSObject>
+
+- (void)uploader:(Uploader*)uploader transferredFile:(NSString*)file toMicroBit:(NSString*)microbit;
+- (void)uploader:(Uploader*)uploader failedToTransferFile:(NSString*)file toMicroBit:(NSString*)microbit;
+
+@end
+
+@interface Uploader : NSObject
+
+@property id<UploaderDelegate> delegate;
+
+- (BOOL)shouldUploadFileAtPath:(NSString*)path;
+- (NSArray<NSString*>*)microBitPaths;
+- (void)uploadFile:(NSString*)file;
+- (void)uploadFile:(NSString*)file toMicroBit:(NSString*)path;
+
+@end

clients/macuploader/Microbit Uploader/Uploader.m

@@ -0,0 +1,74 @@
+#import "Uploader.h"
+
+@interface Uploader ()
+
+@property NSOperationQueue * backgroundCopyQueue;
+
+@end
+
+@implementation Uploader
+
+- (instancetype)init {
+    self = [super init];
+    if (self) {
+        self.backgroundCopyQueue = [NSOperationQueue new];
+    }
+    return self;
+}
+
+- (BOOL)shouldUploadFileAtPath:(NSString *)path {
+    //Whilst Safari is downloading the file it appends .download to the name
+    NSRegularExpression * ignoreDownload = [NSRegularExpression regularExpressionWithPattern:@".download$" options:NSRegularExpressionCaseInsensitive error:nil];
+    if ([ignoreDownload numberOfMatchesInString:path.lastPathComponent options:0 range:NSMakeRange(0, path.lastPathComponent.length)] > 0) {
+        return NO;
+    }
+    
+    //Chrome and Firefox create .hex files
+    NSRegularExpression * hexFiles = [NSRegularExpression regularExpressionWithPattern:@".hex$" options:NSRegularExpressionCaseInsensitive error:nil];
+    if ([hexFiles numberOfMatchesInString:path.lastPathComponent options:0 range:NSMakeRange(0, path.lastPathComponent.length)] > 0) {
+        return YES;
+    }
+    
+    //Safari tends to just name files 'Unknown X'
+    NSRegularExpression * unknownFiles = [NSRegularExpression regularExpressionWithPattern:@"^Unknown(( |-)[0-9]+)?" options:NSRegularExpressionCaseInsensitive error:nil];
+    if ([unknownFiles numberOfMatchesInString:path.lastPathComponent options:0 range:NSMakeRange(0, path.lastPathComponent.length)]) {
+        return YES;
+    }
+    
+    return NO;
+}
+
+- (NSArray<NSString*>*)microBitPaths {
+    NSArray<NSURL*>* allVolumes = [[NSFileManager defaultManager] mountedVolumeURLsIncludingResourceValuesForKeys:nil options:NSVolumeEnumerationSkipHiddenVolumes];
+    NSMutableArray<NSString*>* microbitPaths = [NSMutableArray new];
+    NSRegularExpression * microbitRegex = [NSRegularExpression regularExpressionWithPattern:@"^MICROBIT" options:NSRegularExpressionCaseInsensitive error:nil];
+    for (NSURL * volume in allVolumes) {
+        NSString * lastPathComponent = volume.lastPathComponent;
+        if ([microbitRegex numberOfMatchesInString:lastPathComponent options:0 range:NSMakeRange(0, lastPathComponent.length)] > 0) {
+            [microbitPaths addObject:volume.path];
+        }
+    }
+    
+    return microbitPaths;
+}
+
+- (void)uploadFile:(NSString *)file {
+    for (NSString * microbit in [self microBitPaths]) {
+        [self uploadFile:file toMicroBit:microbit];
+    }
+}
+
+- (void)uploadFile:(NSString *)file toMicroBit:(NSString *)path {
+    [self.backgroundCopyQueue addOperationWithBlock:^{
+        NSError * copyError;
+        NSString * destination = [path stringByAppendingPathComponent:file.lastPathComponent];
+        if (![[NSFileManager defaultManager] copyItemAtPath:file toPath:destination error:&copyError]) {
+            [self.delegate uploader:self failedToTransferFile:file toMicroBit:path.lastPathComponent];
+        }
+        else {
+            [self.delegate uploader:self transferredFile:file toMicroBit:path.lastPathComponent];
+        }
+    }];
+}
+
+@end

clients/macuploader/Microbit Uploader/main.m

@@ -0,0 +1,5 @@
+#import <Cocoa/Cocoa.h>
+
+int main(int argc, const char * argv[]) {
+    return NSApplicationMain(argc, argv);
+}

clients/macuploader/README.md

@@ -0,0 +1,40 @@
+# micro:bit uploader for OS X
+
+![](Microbit Uploader/Assets.xcassets/AppIcon.appiconset/icon_256x256.png)
+
+This project is a clone of the [Windows
+uploader](https://codethemicrobit.com/uploader), but for OS X. Once launched,
+the app runs in your menu bar and will automatically deploy any HEX files to
+your `micro:bit`. Like the Windows version, it is compatible with any browser
+that can run [codethemicrobit.com](http://codethemicrobit.com).
+
+## Install the built version
+
+1. Download the latest `.zip` release from the `Release` directory
+2. Unzip it
+3. Drag `Microbit Uploader` to your Applications folder and launch it
+
+## Building
+
+To build the project you'll need a copy of OS X 10.11 or higher and Xcode 8 or
+higher (you may be able to build on earlier OSes or versions of Xcode, but this
+remains untested). Once you have a development environment set up, just build
+and run `Microbit Uploader.xcodeproj`.
+
+## Distributing
+
+1. Open the Xcode project
+2. Product > Archive
+3. Export:
+
+    ![Export](Graphics/export.png)
+
+4. You will then have the option of either signing or not-signing the
+   application:
+
+    a) If you have an Apple developer account, select 'Export a Developer
+       ID-signed Application'
+
+    b) If you don't have a developer ID, select 'Export as a macOS App'
+
+5. Zip the produced app and upload to CDN or equivalent

cmds/cmds.ts

@@ -13,22 +13,25 @@ export function deployCoreAsync(res: ts.pxtc.CompileResult) {
     return getBitDrivesAsync()
         .then(drives => {
             if (drives.length == 0) {
-                console.log("cannot find any drives to deploy to")
-            } else {
-                console.log(`copy ${ts.pxtc.BINARY_HEX} to ` + drives.join(", "))
+                console.log("cannot find any drives to deploy to");
+                return Promise.resolve(0);
             }
-            return Promise.map(drives, d =>
-                writeFileAsync(d + ts.pxtc.BINARY_HEX, res.outfiles[ts.pxtc.BINARY_HEX])
-                    .then(() => {
-                        console.log("wrote hex file to " + d)
-                    }))
-        })
-        .then(() => { })
+
+            console.log(`copy ${ts.pxtc.BINARY_HEX} to ` + drives.join(", "));
+
+            let writeHexFile = (filename: string) => {
+                return writeFileAsync(filename + ts.pxtc.BINARY_HEX, res.outfiles[ts.pxtc.BINARY_HEX])
+                    .then(() => console.log("wrote hex file to " + filename));
+            };
+
+            return Promise.map(drives, d => writeHexFile(d))
+                .then(() => drives.length);
+        });
 }
 
 function getBitDrivesAsync(): Promise<string[]> {
     if (process.platform == "win32") {
-        let rx = new RegExp("^([A-Z]:).* " + pxt.appTarget.compile.deployDrives)
+        const rx = new RegExp("^([A-Z]:).* " + pxt.appTarget.compile.deployDrives)
         return execAsync("wmic PATH Win32_LogicalDisk get DeviceID, VolumeName, FileSystem")
             .then(buf => {
                 let res: string[] = []
@@ -42,9 +45,14 @@ function getBitDrivesAsync(): Promise<string[]> {
             })
     }
     else if (process.platform == "darwin") {
-        let rx = new RegExp(pxt.appTarget.compile.deployDrives)
+        const rx = new RegExp(pxt.appTarget.compile.deployDrives)
         return readDirAsync("/Volumes")
             .then(lst => lst.filter(s => rx.test(s)).map(s => "/Volumes/" + s + "/"))
+    } else if (process.platform == "linux") {
+        const rx = new RegExp(pxt.appTarget.compile.deployDrives)
+        const user = process.env["USER"]
+        return readDirAsync(`/media/${user}`)
+            .then(lst => lst.filter(s => rx.test(s)).map(s => `/media/${user}/${s}/`))
     } else {
         return Promise.resolve([])
     }

docfiles/apptracking.html

@@ -0,0 +1,6 @@
+<script type="text/javascript">
+    (function(e,b){if(!b.__SV){var a,f,i,g;window.mixpanel=b;b._i=[];b.init=function(a,e,d){function f(b,h){var a=h.split(".");2==a.length&&(b=b[a[0]],h=a[1]);b[h]=function(){b.push([h].concat(Array.prototype.slice.call(arguments,0)))}}var c=b;"undefined"!==typeof d?c=b[d]=[]:d="mixpanel";c.people=c.people||[];c.toString=function(b){var a="mixpanel";"mixpanel"!==d&&(a+="."+d);b||(a+=" (stub)");return a};c.people.toString=function(){return c.toString(1)+".people (stub)"};i="disable time_event track track_pageview track_links track_forms register register_once alias unregister identify name_tag set_config reset people.set people.set_once people.increment people.append people.union people.track_charge people.clear_charges people.delete_user".split(" ");
+    for(g=0;g<i.length;g++)f(c,i[g]);b._i.push([a,e,d])};b.__SV=1.2;a=e.createElement("script");a.type="text/javascript";a.async=!0;a.src="undefined"!==typeof MIXPANEL_CUSTOM_LIB_URL?MIXPANEL_CUSTOM_LIB_URL:"file:"===e.location.protocol&&"//cdn.mxpnl.com/libs/mixpanel-2-latest.min.js".match(/^\/\//)?"https://cdn.mxpnl.com/libs/mixpanel-2-latest.min.js":"//cdn.mxpnl.com/libs/mixpanel-2-latest.min.js";f=e.getElementsByTagName("script")[0];f.parentNode.insertBefore(a,f)}})(document,window.mixpanel||[]);
+    mixpanel.init("762fef19c053a0ea4cec43d2fecae76e", { disable_persistence: true });
+    if (typeof pxtConfig !== "undefined") mixpanel.register({ target: pxtConfig.targetId, version: pxtConfig.targetVersion });
+</script>

docfiles/meta.html

@@ -19,10 +19,3 @@
 <link rel="shortcut icon" href="@appLogo@">
 <meta name="theme-color" content="@accentColor@">
 
-<style>
-    #root .avatar .avatar-image {
-        background-image: url(https://az851932.vo.msecnd.net/pub/jovrytni/microbit.simplified.svg);
-        background-size: contain;
-        background-repeat: no-repeat;
-    }
-</style>

docfiles/target.css

@@ -0,0 +1,5 @@
+#root .avatar .avatar-image {
+    background-image: url(https://az851932.vo.msecnd.net/pub/jovrytni/microbit.simplified.svg);
+    background-size: contain;
+    background-repeat: no-repeat;
+}

docfiles/tracking.html

@@ -1,13 +1,6 @@
-<script type="text/javascript">
-    var appInsights=window.appInsights||function(config){
-    function r(config){t[config]=function(){var i=arguments;t.queue.push(function(){t[config].apply(t,i)})}}var t={config:config},u=document,e=window,o="script",s=u.createElement(o),i,f;for(s.src=config.url||"//az416426.vo.msecnd.net/scripts/a/ai.0.js",u.getElementsByTagName(o)[0].parentNode.appendChild(s),t.cookie=u.cookie,t.queue=[],i=["Event","Exception","Metric","PageView","Trace"];i.length;)r("track"+i.pop());return r("setAuthenticatedUserContext"),r("clearAuthenticatedUserContext"),config.disableExceptionTracking||(i="onerror",r("_"+i),f=e[i],e[i]=function(config,r,u,e,o){var s=f&&f(config,r,u,e,o);return s!==!0&&t["_"+i](config,r,u,e,o),s}),t
-    }({ 
-        instrumentationKey:"e9ae05ca-350b-427a-9775-3ba3f6efabce"
-    });window.appInsights=appInsights;
-</script>
 <script type="text/javascript">
     (function(e,b){if(!b.__SV){var a,f,i,g;window.mixpanel=b;b._i=[];b.init=function(a,e,d){function f(b,h){var a=h.split(".");2==a.length&&(b=b[a[0]],h=a[1]);b[h]=function(){b.push([h].concat(Array.prototype.slice.call(arguments,0)))}}var c=b;"undefined"!==typeof d?c=b[d]=[]:d="mixpanel";c.people=c.people||[];c.toString=function(b){var a="mixpanel";"mixpanel"!==d&&(a+="."+d);b||(a+=" (stub)");return a};c.people.toString=function(){return c.toString(1)+".people (stub)"};i="disable time_event track track_pageview track_links track_forms register register_once alias unregister identify name_tag set_config reset people.set people.set_once people.increment people.append people.union people.track_charge people.clear_charges people.delete_user".split(" ");
     for(g=0;g<i.length;g++)f(c,i[g]);b._i.push([a,e,d])};b.__SV=1.2;a=e.createElement("script");a.type="text/javascript";a.async=!0;a.src="undefined"!==typeof MIXPANEL_CUSTOM_LIB_URL?MIXPANEL_CUSTOM_LIB_URL:"file:"===e.location.protocol&&"//cdn.mxpnl.com/libs/mixpanel-2-latest.min.js".match(/^\/\//)?"https://cdn.mxpnl.com/libs/mixpanel-2-latest.min.js":"//cdn.mxpnl.com/libs/mixpanel-2-latest.min.js";f=e.getElementsByTagName("script")[0];f.parentNode.insertBefore(a,f)}})(document,window.mixpanel||[]);
-
-    mixpanel.init("762fef19c053a0ea4cec43d2fecae76e");
+    mixpanel.init("762fef19c053a0ea4cec43d2fecae76e", { disable_persistence: true });
+    if (typeof pxtConfig !== "undefined") mixpanel.register({ target: pxtConfig.targetId, version: pxtConfig.targetVersion });    
 </script>

docs/about.md

@@ -1,3 +1,50 @@
+![](/static/mb/device/pano.jpg)
+
+# About
+
+### @description A Blocks / Javascript code editor for the micro:bit, a pocket-size computer with 5x5 display, sensors and Bluetooth.
+
+The [BBC micro:bit](https://www.microbit.co.uk) is a [pocket-size computer](/device) with a 5x5 display of 25 LEDs, Bluetooth and sensors that can be programmed by anyone.
+The BBC micro:bit was made possible by many [partners](https://www.microbit.co.uk/partners).
+
+The micro:bit provides an easy and fun introduction to programming and making – switch on, program it to do something fun – wear it, customize it.
+Just like Arduino, the micro:bit can be connected to and interact with sensors, displays, and other devices. 
+
+* [Read the docs](/docs)
+
+## [Hardware: The Device](/device)
+
+The BBC micro:bit is packaged with sensors, radio and other goodies. Learn about the [hardware components](/device) of the micro:bit to make the most of it!
+
+## Programming: [Blocks](/blocks) or [JavaScript](/javascript)
+
+You can program the micro:bit using [Blocks](/blocks) or [JavaScript](/javascript) in your web browser via the [micro:bit APIs](/reference):
+
+```block
+input.onButtonPressed(Button.A, () => {
+    basic.showString("Hi!");
+})
+```
+```typescript
+input.onButtonPressed(Button.A, () => {
+    basic.showString("Hi!");
+})
+```
+
+The editor work in [most modern browsers](/browsers), work [offline](/offline) once loaded and do not require any installation. 
+
+## [Compile and Flash: Your Program!](/device/usb)
+
+When you have your code ready, you connect your micro:bit to a computer via a USB cable, so it appears as a mounted drive (named MICROBIT). 
+
+Compilation to ARM thumb machine code from [Blocks](/blocks) or [JavaScript](/javascript) happens in the browser. You save the ARM binary 
+program to a file, which you then copy to the micro:bit drive, which flashes the micro:bit device with the new program.
+
+## Simulator: Test Your Code
+
+You can run your code using the micro:bit simulator, all within the confines of a web browser. 
+The simulator has support for the LED screen, buttons, as well as compass, accelerometer, and digital I/O pins.
+
 ```sim
 basic.forever(() => {
   basic.showString("Hi!");
@@ -20,43 +67,8 @@ input.onButtonPressed(Button.B, () => {
 . # . # .
 . . # . .`);
 });
-``` 
-# About
-
-### @description A Blocks / Javascript code editor for the micro:bit, a pocket-size computer with 5x5 display, sensors and Bluetooth.
-
-The [BBC micro:bit](https://www.microbit.co.uk) is a [pocket-size computer](/device) with a 5x5 display of 25 LEDs, Bluetooth and sensors that can be programmed by anyone.
-The BBC micro:bit was made possible by many [partners](https://www.microbit.co.uk/partners).
-
-The micro:bit provides an easy and fun introduction to programming and making – switch on, program it to do something fun – wear it, customize it.
-Just like Arduino, the micro:bit can be connected to and interact with sensors, displays, and other devices. 
-
-## Hardware: The Device
-
-Learn about the [hardware components](/device) of the micro:bit to make the most of it!
-
-## Programming: Blocks or JavaScript
-
-You can program the micro:bit using [Blocks](/blocks) or [JavaScript](/javascript), via the [micro:bit APIs](/reference):
-
-```blocks
-input.onButtonPressed(Button.A, () => {
-    basic.showString("Hi!");
-})
 ```
 
-## Compile and Flash: Your Program!
-
-When you have your code ready, you connect your micro:bit to a computer via a USB cable, so it appears as a mounted drive (named MICROBIT). 
-
-Compilation to ARM thumb machine code from [Blocks](/blocks) or [JavaScript](/javascript) happens in the browser. You save the ARM binary 
-program to a file, which you then copy to the micro:bit drive, which flashes the micro:bit device with the new program.
-
-## Simulator: Test Your Code
-
-You can run your code using the micro:bit simulator, all within the confines of a web browser. 
-The simulator has support for the LED screen, buttons, as well as compass, accelerometer, and digital I/O pins.
-
 ## C++ Runtime
 
 The [C++ micro:bit runtime](http://lancaster-university.github.io/microbit-docs/), created at [Lancaster University](http://www.lancaster.ac.uk/), provides access to the hardware functions of the micro:bit, 
@@ -65,6 +77,15 @@ as well as a set of helper functions (such as displaying a number/image/string o
 The [micro:bit library](/reference) mirrors the functions of the C++ library. 
 When code is compiled to ARM machine code, the calls to JavaScript micro:bit functions are replaced with calls to the corresponding C++ functions.
 
-## Open Source
+## [Command Line Tools](/cli)
+
+Looking to use codethemicrobit.com in your favorite editor? Install the [command line tools](/cli) and get rolling!
+
+## [Packages](/packages)
+
+Create, edit and distribute your own blocks and JavaScript using [packages](/packages). Packages are hosted on GitHub and may be written
+using C++, JavaScript and/or ARM thumb.
+
+## [Open Source](/open-source)
 
 The code for the micro:bit is [open source](/open-source) on GitHub. Contributors are welcome!

docs/browsers.md

@@ -0,0 +1,104 @@
+# Unsupported configuration
+
+[codethemicrobit.com](https://codethemicrobit.com) doesn't currently support
+your browser or operating system. The following configurations are supported:
+
+## Windows
+
+You need one of these browsers running on Windows 7, Windows 8, Windows 8.1, or
+Windows 10:
+
+* Internet Explorer 11
+* Microsoft Edge
+* Google Chrome
+* Mozilla Firefox
+
+## Mac
+
+You need one of these browsers running on OS X 10.9 Mavericks, OS X 10.10
+Yosemite, OS X 10.11 El Capitan, or macOS 10.12 Sierra:
+
+* Safari
+* Google Chrome
+* Mozilla Firefox
+
+## Linux
+
+If you're using a Raspberry Pi, please see [the documentation
+here](/raspberry-pi).
+
+You need to be running a Linux distribution recent enough to run the most recent
+version of one of the following:
+
+* Google Chrome, or Chromium
+* Mozilla Firefox, Iceweasel, or Seamonkey
+
+## How to check your OS or browser
+
+### Windows
+
+* Click on the Start menu
+* Type 'System'
+* Click on the app called 'System'
+* The version of Windows you are using will be displayed:
+
+![](/static/configurations/windows-version.png)
+
+### Mac
+
+* Click on the Apple icon in the top left
+* Click on 'About this Mac'
+* This window will be displayed:
+
+![](/static/configurations/osx-version.png)
+
+### Internet Explorer
+
+* Click on the Settings icon in the top right
+* Click 'About Internet Explorer'
+* This window will be displayed:
+
+![](/static/configurations/ie-version.png)
+
+### Edge
+
+Edge automatically updates, so you should always be using the latest version
+
+* Click on the menu icon in the top right (three dots)
+* Scroll to the bottom
+* Information similar to the following will be displayed:
+
+![](/static/configurations/edge-version.png)
+
+### Google Chrome
+
+Google Chrome automatically updates, so you should always be using the latest version
+
+* Click on the menu icon in the top right (three dots)
+* Click Help, and About Google Chrome
+* Information similar to the following will be displayed:
+
+![](/static/configurations/chrome-version.png)
+
+### Firefox
+
+Firefox automatically updates, so you should always be using the latest version
+
+* Click on the menu icon in the top right (three horizontal lines)
+* Click the question mark icon (help button)
+* Click 'About Firefox'
+
+![](/static/configurations/firefox-version.png)
+
+### Safari
+
+Safari updates when your operating system updates, so if you are using the
+latest version of OS X then you'll be using the latest version of Safari.
+
+* Click on the Safari menu in the top left
+* Click 'About Safari'
+
+![](/static/configurations/safari-version.png)
+
+IT administrators should check which browser versions are supported
+[here](/browsers/technical).

docs/browsers/linux.md

@@ -0,0 +1,16 @@
+# Recommended browser for Linux
+
+As you are using Linux, it is recommended that you use [Mozilla
+Firefox][firefox] or [Google Chrome][chrome].
+
+Please see [here][technical] for technical information on which browsers are
+supported, or [here][versions] to check which version you are using.
+
+[edge]: https://www.microsoft.com/en-us/windows/microsoft-edge
+[ie]: https://www.microsoft.com/en-us/download/internet-explorer.aspx
+[firefox]: https://www.mozilla.org/en-US/firefox/new/
+[chrome]: https://www.google.com/chrome/
+[opera]: https://www.opera.com
+[safari]: http://www.apple.com/safari/
+[technical]: /browsers/technical
+[versions]: /browsers

docs/browsers/mac.md

@@ -0,0 +1,16 @@
+# Recommended browser for Mac
+
+As you are using a Mac, it is recommended that you use [Safari][]. Alternatively,
+[Google Chrome][chrome] and [Mozilla Firefox][firefox] are also supported.
+
+Please see [here][technical] for technical information on which browsers are
+supported, or [here][versions] to check which version you are using.
+
+[edge]: https://www.microsoft.com/en-us/windows/microsoft-edge
+[ie]: https://www.microsoft.com/en-us/download/internet-explorer.aspx
+[firefox]: https://www.mozilla.org/en-US/firefox/new/
+[chrome]: https://www.google.com/chrome/
+[opera]: https://www.opera.com
+[safari]: http://www.apple.com/safari/
+[technical]: /browsers/technical
+[versions]: /browsers

docs/browsers/technical.md

@@ -0,0 +1,36 @@
+# Technical information about browser support
+
+[codethemicrobit.com][] requires that you use a recent version of a modern
+browser, such as Microsoft Edge, Google Chrome, Mozilla Firefox, Safari, Opera,
+or IE11.  This is because the editor uses modern web technologies such as [web
+workers][] to enable compiling [TypeScript][] in the browser, or the using the
+same [Monaco][] editor that powers [Visual Studio Code][].
+
+[codethemicrobit.com]: https://codethemicrobit.com
+[web workers]: http://www.w3.org/TR/workers/
+[typescript]: http://www.typescriptlang.org
+[monaco]: https://microsoft.github.io/monaco-editor/
+[visual studio code]: http://code.visualstudio.com
+
+Most modern browsers automatically update themselves, but in some environments
+such as schools these automatic updates are disabled for security. **We
+strongly recommend that you use the most recent version of any of these
+browsers**, but if you can't then you must use at least:
+
+| Browser           | Minimum version | Release date   | Windows     | Mac        |
+| ----------------- | --------------- | -------------- | ----------- | ---------- |
+| Edge              | 12              | March 2015     | Windows 10+ | N/A        |
+| Internet Explorer | 11              | October 2013   | Windows 7+  | N/A        |
+| Mozilla Firefox   | 31 ESR          | July 2014      | Windows XP+ | OS X 10.6+ |
+| Google Chrome     | 38              | October 2014   | Windows XP+ | OS X 10.6+ |
+| Safari            | 9               | September 2015 | N/A         | OS X 10.9+ |
+| Opera             | 21              | May 2014       | Windows 7+  | OS X 10.9+ |
+
+
+Please see our information for which browsers are recommended for [Windows][],
+[Mac][], [Linux][], or [Raspberry Pi][].
+
+[Windows]: /browsers/windows
+[Mac]: /browsers/mac
+[Linux]: /browsers/linux
+[Raspberry Pi]: /raspberry-pi

docs/browsers/windows.md

@@ -0,0 +1,18 @@
+# Recommended browser for Windows
+
+We recommend [Microsoft Edge][edge] if you are running Windows 10, but users on
+Windows 7 or higher can use [Internet Explorer 11][ie] or recent versions of
+[Mozilla Firefox][firefox], [Google Chrome][chrome], or [Opera][opera].
+
+
+Please see [here][technical] for technical information on which browsers are
+supported, or [here][versions] to check which version you are using.
+
+[edge]: https://www.microsoft.com/en-us/windows/microsoft-edge
+[ie]: https://www.microsoft.com/en-us/download/internet-explorer.aspx
+[firefox]: https://www.mozilla.org/en-US/firefox/new/
+[chrome]: https://www.google.com/chrome/
+[opera]: https://www.opera.com
+[safari]: http://www.apple.com/safari/
+[technical]: /browsers/technical
+[versions]: /browsers

docs/device/crocodile-clips.md

@@ -1,11 +1,40 @@
 # crocodile clips
 
-The large holes at the bottom of the board are designed to attach alligator/crocodile clips.
-Register an event that will execute whenever the user attaches one side of the crocodile clip to the `GND` pin, then connects and disconnects the unattached side of the crocodile clip to pin `0`, `1`, or `2`.
+The large holes at the bottom of the board are designed to attach alligator/crocodile clips 
+to create electrical circuit with other components.
 
-### Example: on pin pressed with random numbers
+# ~hint
 
-This example displays a random number every time the crocodile clip holds  `GND` then connects and disconnects the `P0` pin. Each time the crocodile clip is firmly connected and disconnected from pin `P0`, the micro:bit will return a random Number between 0 and the parameter limit
+**No crocodile clips!?!?!** Use wires or Aluminium foil! [Read more...](/device/foil-circuits)
+
+# ~
+
+
+## Connecting Crocodile Clips
+
+The hole for ``P0`` and ``GND`` allow to grab the board on the side which makes for a great grip.
+
+![](/static/mb/device/croc-clips/crocclipsclamped.jpg)
+
+Pass one jaw in the hole and grab the side of the board with the other jaw.
+
+![](/static/mb/device/croc-clips/sideclamp.jpg)
+
+For the center holes, ``P1`` and ``P2``, you can also grab the bottom of the board but they are a bit harder to grip.
+
+You can also grip the board between the jaws. In which case, you will want to make sure to avoid overlapping the jaws 
+with the other pins as it will create short-circuit in the board.
+
+![](/static/mb/device/croc-clips/badclamp.jpg)
+
+Adding a little tape helps keeping the crocodile clips in place.
+
+![](/static/mb/device/croc-clips/frontclamp.jpg)
+
+## Example: on pin pressed with random numbers
+
+This example displays a random number every time the crocodile clip holds  `GND` then connects and disconnects the `P0` pin. 
+Each time the crocodile clip is firmly connected and disconnected from pin `P0`, the micro:bit will return a random Number between 0 and the parameter limit.
 
 ```blocks
 input.onPinPressed(TouchPin.P0, () => {
@@ -13,11 +42,6 @@ input.onPinPressed(TouchPin.P0, () => {
 })
 ```
 
-### Connecting Crocodile Clips
-
-![](/static/mb/crocodile-clips-2.jpg)
-
-### See also
-
-[micro:bit pins](/device/pins), [pin is pressed](/reference/input/pin-is-pressed), [analog read pin](/reference/pins/analog-read-pin), [analog write pin](/reference/pins/analog-write-pin), [digital read pin](/reference/pins/digital-read-pin), [digital write pin](/reference/pins/digital-write-pin)
+## See also
 
+[micro:bit pins](/device/pins)

docs/device/error-codes.md

@@ -1,7 +1,5 @@
 # Error codes
 
-The micro:bit error codes
-
 Your micro:bit may encounter a situation that prevents it from running your code. When this happens, a frowny face will appear on your micro:bit screen (see picture) followed by an error number.
 
 Below is a list of error numbers and what they mean:

docs/device/foil-circuits.md

@@ -0,0 +1,52 @@
+# foil circuits
+
+The large holes at the bottom of the board are designed to attach alligator/crocodile clips 
+to create electrical circuit with other components.
+
+If you do not have crocodile clips at hand, dyou can use wires or even Aluminium foil to acheive the same result.
+We will show you how to connect the micro:bit to headphones using Alumunium foil and tape.
+
+https://youtu.be/mhXYyPuvpz0
+
+### Materials
+
+* micro:bit and battery pack (you can also power it via USB)
+* a small piece of cardboard
+* Aluminium foil
+* tape
+
+### Assembly instructions
+
+Tape the micro:bit and battery pack to the card board. Make sure to remove the batteries while you are building your circuit.
+
+![](/static/mb/device/croc-clips/microbitattached.jpg)
+
+Cut the thinest strip of foil possible and roll it into a cable. You can also try to fold, whatever works for you.
+Build two of those wires.
+
+![](/static/mb/device/croc-clips/foilcut.jpg)
+
+Place the foil wire on the ``GND`` pin and attach with a piece of tape. Press hard to get the best connection between
+the foil and the pin board. Make sure the foil is not overlapping with the other pins!
+
+![](/static/mb/device/croc-clips/groundconnected.jpg)
+
+Place the second wire on the ``P0`` pin the same way. Make sure the wire does not overlap with the other pins!
+
+![](/static/mb/device/croc-clips/microbitconnect.jpg)
+
+Tape the headphone jack connector to the cardboard and roll the wire coming from ``GND`` around the metal base. 
+Make sure the wire does not touch the other metal rings on the jack.
+
+![](/static/mb/device/croc-clips/jackground.jpg)
+
+Tape the second wire on the head of the jack connector.
+
+![](/static/mb/device/croc-clips/jackconnect.jpg)
+
+![](/static/mb/device/croc-clips/foilcircuit.jpg)
+
+
+## See also
+
+[micro:bit pins](/device/pins)

docs/device/usb.md

@@ -1,132 +1,31 @@
-# Run Scripts on your micro:bit
+# Uploading programs on your micro:bit
 
-How to compile, transfer, and run a script on your micro:bit.
+While you're writing and testing your programs, you'll mostly be [running them
+in the simulator](/device/simulator), but once you've finished your program you
+can **compile** it and run it on your micro:bit.
 
-While you're writing and testing your scripts, you'll mostly be running scripts in your browser by clicking the `PLay` button 
-(see [run code in your browser](/device/simulator) for info about this).
+The basic steps are:
 
-Once your masterpiece is complete, you can compile your script and run it on your micro:bit.
+1. Connect your micro:bit to your computer via USB
+2. Click **Download** and download the `.hex` file
+3. Copy the `.hex` file from your computer onto the micro:bit drive
 
-## Requirements
+![](/static/mb/device/usb-thin.jpg)
 
-You need the following things to transfer and run a script on your micro:bit:
+## Instructions
 
-* A-Male to Micro USB cable to connect your computer to your micro:bit. This is the same cable that is commonly used to connect a smart phone to a computer.
-* a PC running Windows 7 of later, or a Mac running OS X 10.6 or later
-* access to the Internet
+Pick the instructions for your operating system and browser:
 
-## Step 1: Connect your micro:bit to your computer
+* [Windows - Microsoft Edge](/device/usb/windows-edge)
+* [Windows - Internet Explorer](/device/usb/windows-ie)
+* [Windows - Chrome](/device/usb/windows-chrome)
+* [Windows - Firefox](/device/usb/windows-firefox)
+* [Mac - Safari](/device/usb/mac-safari)
+* [Mac - Chrome](/device/usb/mac-chrome)
+* [Mac - Firefox](/device/usb/mac-firefox)
 
-First, connect the micro:bit:
+### ~hint
 
-1. Connect the small end of the USB cable to the micro USB port on your micro:bit.
-
-2. Connect the other end of the USB cable to a USB port on your computer.
-
-Your computer should recognise your micro:bit as a new drive. On computers running Windows, MICROBIT appears as a drive under Devices and drives. On a Mac it appears as a new drive under Devices.
-
-Windows
-
-![](/static/mb/device/usb-0.jpg)
-
-Mac (picture bvabdbco)
-WARN: unknown picture: bvabdbco:5x3
-
-## Step 2: Compile your script
-
-Next, compile your script:
-
-1. Sign in to Touch Develop on your computer.
-
-2. Open your script (find the script in **My Scripts** and click `Edit`).
-
-3. Click **Download**. Your script is converted into a hex file that you can transfer and run on your micro:bit.
-
-4. When prompted, choose to save the compiled file on your computer (or anywhere other than the micro:bit). Depending on which browser you are using, the download will adopt the download behaviour of that particular browser.
-
-### Windows
-
-** Chrome**
-
-Your .hex file appears as a download at the bottom of the browser. Open up your windows file explorer. Your micro:bit appears as a drive called MICROBIT.
-
-**Right click** on the download and select **show in folder**. Drag and drop the hex file from the download folder onto the MICROBIT drive.
-
-Alternatively, you can drag and drop the downloaded hex file from the bottom of the browser onto the file explorer and onto the MICROBIT drive.
-
-![](/static/mb/device/usb-1.jpg)
-
-**Firefox**
-
-A dialogue box will appear, asking whether you would like to open or save your hex file. Select **Save**, then **OK** and the file will appear in your downloads in the top right of your browser. Select the **blue arrow**, select the relevant file and drag and drop it onto your Windows Explorer and onto your MICROBIT drive.
-
-![](/static/mb/device/usb-2.jpg)
-
-![](/static/mb/device/usb-3.jpg)
-
-**IE10**
-
-Click on **Download**. You will see a message “Do you want to save this .hex file.” Select **Save**.
-
-### Mac
-
-** Safari**
-
-When you select **Download** in Safari on Mac, your file will be downloaded to your downloads folder. Go to your downloads folder and open the file. In Safari the file will appear as unknown.txt rather than a named .hex file. Drag and drop it onto your MICROBIT drive.
-
-![](/static/mb/device/usb-4.jpg)
-
-**Firefox**
-
-A dialogue box will appear, asking whether you would like to open or save your hex file. Select **Save** and **OK** and the file will then appear in your downloads in the top right of your browser.  Click on **Show in Finder** and the file will appear in your downloads folder. Select the file and drag and drop it onto your MICROBIT drive.
-
-![](/static/mb/device/usb-5.jpg)
-
-![](/static/mb/device/usb-6.jpg)
-
-**Chrome**
-
-When you select **Download** in Chrome, the file will be downloaded to the bottom of the browser in .hex format. Click on the small arrow and select **Show in Finder**. This will show the file in your download folder. Drag and drop the file onto your MICROBIT drive.
-
-![](/static/mb/device/usb-7.jpg)
-
-## Step 3: Transfer the file to your micro:bit
-
-1. The file will transfer onto your micro:bit.
-
-2. If you're using Windows, you can use **Send to** as described below.
-
-3. The LED on the back of your micro:bit flashes during the transfer (which should only take a few seconds).
-
-4. Once transferred, the code will run automatically on your micro:bit. To rerun your program, press the reset button on the back of your micro:bit. The reset button automatically runs the newest file on the micro:bit.
-
-**Send to**: If you're using Windows you use *Send to* in File Explorer:
-
-- In File Explorer, right-click on the hex file (created in Step 2 above), choose **Send to**, and then **MICROBIT**.
-
-![](/static/mb/device/usb-8.jpg)
-
-By copying the script onto the 'MICROBIT' drive, you have programmed it into the flash memory on the micro:bit, which means even after you unplug the micro:bit, your script will still run if the micro:bit is powered by battery.
-
-## Troubleshooting
-
-You can’t drag and drop more than one hex file at once onto your micro:bit. If you try to drag and drop a second hex file onto your micro:bit  before the first file has finished downloading, then the second file may fail in different ways.
-
-When the first program has been written to the micro:bit, the drive will disengage. If you drag and drop a second file at this point it may not find the drive and the second write will fail.
-
-The errors may look like this:
-
-**Windows**
-
-![](/static/mb/device/usb-9.jpg)
-
-**Mac**
-
-![](/static/mb/device/usb-10.png)
-
-Or it may appear that there are two hex files on your micro:bit so the micro:bit won’t be able to run multiple files. To rectify this, unplug your micro:bit and plug it in again. Make sure that your micro:bit  appears as MICROBIT and not MAINTENANCE.
-
-### See also
-
-[Run code in a browser](/device/simulator)
+Transfer not working? See some [troubleshooting tips](/device/usb/troubleshooting).
 
+### ~

docs/device/usb/mac-chrome.md

@@ -0,0 +1,69 @@
+# Uploading from Chrome for Mac
+
+While you're writing and testing your programs, you'll mostly be [running them
+in the simulator](/device/simulator), but once you've finished your program you
+can **compile** it and run it on your micro:bit.
+
+The basic steps are:
+
+1. Connect your micro:bit to your computer via USB
+2. Click **Download** and download the `.hex` file
+3. Copy the `.hex` file from your computer onto the micro:bit drive
+
+## Requirements
+
+You need the following things to transfer and run a script on your micro:bit:
+
+* A-Male to Micro USB cable to connect your computer to your micro:bit. This is
+    the same cable that is commonly used to connect a smart phone to a computer.
+* A PC running Windows 7 or later, or a Mac running OS X 10.6 or later
+
+## Step 1: Connect your micro:bit to your computer
+
+First, connect the micro:bit:
+
+1. Connect the small end of the USB cable to the micro USB port on your micro:bit.
+
+2. Connect the other end of the USB cable to a USB port on your computer.
+
+Your computer should recognise your micro:bit as a new drive. On computers
+running Windows, `MICROBIT` appears as a drive under Devices and drives. On a Mac
+it appears as a new drive under Devices.
+
+![](/static/mb/device/usb-osx-device.png)
+
+## Step 2: Download your program
+
+1. Open your project on [codethemicrobit.com](https://codethemicrobit.com)
+2. Click **Download**
+3. When prompted, choose to **save** the compiled file onto your computer. The
+   prompt will be different depending on which browser you are using, or
+   whether you are using a Windows computer or a Mac
+
+When you select **Download** in Chrome, the file will appear at the bottom of
+the browser. Click on the small arrow and select **Show in Finder**. This will
+show the file in your download folder. Drag and drop the file onto your
+`MICROBIT` drive.
+
+![](/static/mb/device/usb-osx-chrome.png)
+
+## Step 3: Transfer the file to your micro:bit
+
+* Once you've found the folder containing your `.hex` file, drag and drop it
+    onto your `MICROBIT` drive
+* The LED on the back of your micro:bit flashes during the transfer (which 
+    should only take a few seconds).
+* Once transferred, the code will run automatically on your micro:bit. To rerun
+   your program, press the reset button on the back of your micro:bit. The reset 
+   button automatically runs the newest file on the micro:bit.
+
+By copying the script onto the `MICROBIT` drive, you have programmed it into the
+flash memory on the micro:bit, which means even after you unplug the micro:bit,
+your program will still run if the micro:bit is powered by battery.
+
+
+### ~hint
+
+Transfer not working? See some [troubleshooting tips](/device/usb/troubleshooting).
+
+### ~

docs/device/usb/mac-firefox.md

@@ -0,0 +1,71 @@
+# Uploading from Firefox for Mac
+
+While you're writing and testing your programs, you'll mostly be [running them
+in the simulator](/device/simulator), but once you've finished your program you
+can **compile** it and run it on your micro:bit.
+
+The basic steps are:
+
+1. Connect your micro:bit to your computer via USB
+2. Click **Download** and download the `.hex` file
+3. Copy the `.hex` file from your computer onto the micro:bit drive
+
+## Requirements
+
+You need the following things to transfer and run a script on your micro:bit:
+
+* A-Male to Micro USB cable to connect your computer to your micro:bit. This is
+    the same cable that is commonly used to connect a smart phone to a computer.
+* A PC running Windows 7 or later, or a Mac running OS X 10.6 or later
+
+## Step 1: Connect your micro:bit to your computer
+
+First, connect the micro:bit:
+
+1. Connect the small end of the USB cable to the micro USB port on your micro:bit.
+
+2. Connect the other end of the USB cable to a USB port on your computer.
+
+Your computer should recognise your micro:bit as a new drive. On computers
+running Windows, `MICROBIT` appears as a drive under Devices and drives. On a Mac
+it appears as a new drive under Devices.
+
+![](/static/mb/device/usb-osx-device.png)
+
+## Step 2: Download your program
+
+1. Open your project on [codethemicrobit.com](https://codethemicrobit.com)
+2. Click **Download**
+3. When prompted, choose to **save** the compiled file onto your computer. The
+   prompt will be different depending on which browser you are using, or
+   whether you are using a Windows computer or a Mac
+
+A dialogue box will appear, asking whether you would like to open or save your
+hex file. Select **Save file** and click **OK** and the file will then appear in
+your downloads in the top right of your browser. Right click on the file and
+click on **Show in Finder** and the file will appear in your downloads folder.
+Select the file and drag and drop it onto your `MICROBIT` drive.
+
+![](/static/mb/device/usb-osx-firefox-1.jpg)
+
+![](/static/mb/device/usb-osx-firefox-2.png)
+
+## Step 3: Transfer the file to your micro:bit
+
+* Once you've found the folder containing your `.hex` file, drag and drop it
+    onto your `MICROBIT` drive
+* The LED on the back of your micro:bit flashes during the transfer (which 
+    should only take a few seconds).
+* Once transferred, the code will run automatically on your micro:bit. To rerun
+   your program, press the reset button on the back of your micro:bit. The reset 
+   button automatically runs the newest file on the micro:bit.
+
+By copying the script onto the `MICROBIT` drive, you have programmed it into the
+flash memory on the micro:bit, which means even after you unplug the micro:bit,
+your program will still run if the micro:bit is powered by battery.
+
+### ~hint
+
+Transfer not working? See some [troubleshooting tips](/device/usb/troubleshooting).
+
+### ~

docs/device/usb/mac-safari.md

@@ -0,0 +1,68 @@
+# Uploading from Safari for Mac
+
+While you're writing and testing your programs, you'll mostly be [running them
+in the simulator](/device/simulator), but once you've finished your program you
+can **compile** it and run it on your micro:bit.
+
+The basic steps are:
+
+1. Connect your micro:bit to your computer via USB
+2. Click **Download** and download the `.hex` file
+3. Copy the `.hex` file from your computer onto the micro:bit drive
+
+## Requirements
+
+You need the following things to transfer and run a script on your micro:bit:
+
+* A-Male to Micro USB cable to connect your computer to your micro:bit. This is
+    the same cable that is commonly used to connect a smart phone to a computer.
+* A PC running Windows 7 or later, or a Mac running OS X 10.6 or later
+
+## Step 1: Connect your micro:bit to your computer
+
+First, connect the micro:bit:
+
+1. Connect the small end of the USB cable to the micro USB port on your micro:bit.
+
+2. Connect the other end of the USB cable to a USB port on your computer.
+
+Your computer should recognise your micro:bit as a new drive. On computers
+running Windows, `MICROBIT` appears as a drive under Devices and drives. On a Mac
+it appears as a new drive under Devices.
+
+![](/static/mb/device/usb-osx-device.png)
+
+## Step 2: Download your program
+
+1. Open your project on [codethemicrobit.com](https://codethemicrobit.com)
+2. Click **Download**
+3. When prompted, choose to **save** the compiled file onto your computer. The
+   prompt will be different depending on which browser you are using, or
+   whether you are using a Windows computer or a Mac
+
+When you select **Download** in Safari a file called `Unknown` will be
+downloaded into your Downloads folder. Open your Downloads folder and drag and
+drop the file onto your `MICROBIT` drive, under Devices:
+
+![](/static/mb/device/usb-osx-dnd.png)
+
+## Step 3: Transfer the file to your micro:bit
+
+* Once you've found the folder containing your `.hex` file, drag and drop it
+    onto your `MICROBIT` drive
+* The LED on the back of your micro:bit flashes during the transfer (which 
+    should only take a few seconds).
+* Once transferred, the code will run automatically on your micro:bit. To rerun
+   your program, press the reset button on the back of your micro:bit. The reset 
+   button automatically runs the newest file on the micro:bit.
+
+By copying the script onto the `MICROBIT` drive, you have programmed it into the
+flash memory on the micro:bit, which means even after you unplug the micro:bit,
+your program will still run if the micro:bit is powered by battery.
+
+
+### ~hint
+
+Transfer not working? See some [troubleshooting tips](/device/usb/troubleshooting).
+
+### ~

docs/device/usb/troubleshooting.md

@@ -0,0 +1,24 @@
+# Troubleshooting Transfer
+
+You can’t drag and drop more than one hex file at once onto your micro:bit. If
+you try to drag and drop a second hex file onto your micro:bit  before the first
+file has finished downloading, then the second file may fail in different ways.
+
+When the first program has been written to the micro:bit, the drive will
+disengage. If you drag and drop a second file at this point it may not find the
+drive and the second write will fail.
+
+The errors may look like this:
+
+**Windows**
+
+![](/static/mb/device/usb-windows-copy-file-error.jpg)
+
+**Mac**
+
+![](/static/mb/device/usb-osx-copy-file-error.png)
+
+Or it may appear that there are two hex files on your micro:bit so the micro:bit
+won’t be able to run multiple files. To rectify this, unplug your micro:bit and
+plug it in again. Make sure that your micro:bit  appears as `MICROBIT` and not
+`MAINTENANCE`.

docs/device/usb/windows-chrome.md

@@ -0,0 +1,79 @@
+# Uploading from Chrome for Windows
+
+While you're writing and testing your programs, you'll mostly be [running them
+in the simulator](/device/simulator), but once you've finished your program you
+can **compile** it and run it on your micro:bit.
+
+The basic steps are:
+
+1. Connect your micro:bit to your computer via USB
+2. Click **Download** and download the `.hex` file
+3. Copy the `.hex` file from your computer onto the micro:bit drive
+
+### ~hint
+
+You can use the [micro:bit uploader](/uploader) to automatically deploy ``.hex`` files to your micro:bit!
+![](/static/uploader/tooltip.png)
+
+### ~
+
+## Requirements
+
+You need the following things to transfer and run a script on your micro:bit:
+
+* A-Male to Micro USB cable to connect your computer to your micro:bit. This is
+    the same cable that is commonly used to connect a smart phone to a computer.
+* A PC running Windows 7 or later, or a Mac running OS X 10.6 or later
+
+## Step 1: Connect your micro:bit to your computer
+
+First, connect the micro:bit:
+
+1. Connect the small end of the USB cable to the micro USB port on your micro:bit.
+
+2. Connect the other end of the USB cable to a USB port on your computer.
+
+Your computer should recognise your micro:bit as a new drive. On computers
+running Windows, `MICROBIT` appears as a drive under Devices and drives. On a Mac
+it appears as a new drive under Devices.
+
+![](/static/mb/device/usb-windows-device.jpg)
+
+## Step 2: Download your program
+
+1. Open your project on [codethemicrobit.com](https://codethemicrobit.com)
+2. Click **Download**
+3. When prompted, choose to **save** the compiled file onto your computer. The
+   prompt will be different depending on which browser you are using, or
+   whether you are using a Windows computer or a Mac
+
+Your `.hex` file appears as a download at the bottom of the browser. Click on
+the arrow next to the name of the file and then click **Show in folder**.
+
+![](/static/mb/device/usb-windows-chrome.png)
+
+Drag and drop the `.hex` file from the download folder onto the `MICROBIT` drive.
+
+## Step 3: Transfer the file to your micro:bit
+
+* Once you've found the folder containing your `.hex` file, drag and drop it
+    onto your `MICROBIT` drive
+* The LED on the back of your micro:bit flashes during the transfer (which 
+    should only take a few seconds).
+* Once transferred, the code will run automatically on your micro:bit. To rerun
+   your program, press the reset button on the back of your micro:bit. The reset 
+   button automatically runs the newest file on the micro:bit.
+
+In File Explorer, right-click on the hex file (created in Step 2 above), choose **Send to**, and then **MICROBIT**.
+
+![](/static/mb/device/usb-windows-sendto.jpg)
+
+By copying the script onto the `MICROBIT` drive, you have programmed it into the
+flash memory on the micro:bit, which means even after you unplug the micro:bit,
+your program will still run if the micro:bit is powered by battery.
+
+### ~hint
+
+Transfer not working? See some [troubleshooting tips](/device/usb/troubleshooting).
+
+### ~

docs/device/usb/windows-edge.md

@@ -0,0 +1,89 @@
+# Uploading from Edge on Windows
+
+How to compile, transfer, and run a program on your micro:bit on **Microsoft Edge**.
+
+While you're writing and testing your programs, you'll mostly be [running them
+in the simulator](/device/simulator), but once you've finished your program you
+can **compile** it and run it on your micro:bit.
+
+The basic steps are:
+
+1. Connect your micro:bit to your computer via USB
+2. Click **Download** and download the `.hex` file
+3. Copy the `.hex` file from your computer onto the micro:bit drive
+
+### ~hint
+
+You can use the [micro:bit uploader](/uploader) to automatically deploy ``.hex`` files to your micro:bit!
+![](/static/uploader/tooltip.png)
+
+### ~
+
+## Requirements
+
+You need the following things to transfer and run a script on your micro:bit:
+
+* A-Male to Micro USB cable to connect your computer to your micro:bit. This is
+    the same cable that is commonly used to connect a smart phone to a computer.
+* A PC running Windows 7 or later, or a Mac running OS X 10.6 or later
+
+## Step 1: Connect your micro:bit to your computer
+
+First, connect the micro:bit:
+
+1. Connect the small end of the USB cable to the micro USB port on your micro:bit.
+
+2. Connect the other end of the USB cable to a USB port on your computer.
+
+Your computer should recognise your micro:bit as a new drive. On computers
+running Windows, `MICROBIT` appears as a drive under Devices and drives. On a Mac
+it appears as a new drive under Devices.
+
+![](/static/mb/device/usb-windows-device.jpg)
+
+## Step 2: Download your program
+
+1. Open your project on [codethemicrobit.com](https://codethemicrobit.com)
+2. Click **Download**
+3. When prompted, choose to **save** the compiled file onto your computer. The
+   prompt will be different depending on which browser you are using, or
+   whether you are using a Windows computer or a Mac
+
+A message will appear at the bottom of the browser asking what you want to do
+with the file. Click **Save**:
+
+![](/static/mb/device/usb-windows-edge-1.png)
+
+Then click **Open folder** and drag and drop the file from your Downloads to
+your `MICROBIT` drive.
+
+![](/static/mb/device/usb-windows-edge-2.png)
+
+## Step 3: Transfer the file to your micro:bit
+
+* Once you've found the folder containing your `.hex` file, drag and drop it
+    onto your `MICROBIT` drive
+* If you're using Windows, you can use **Send to** as described below 
+* The LED on the back of your micro:bit flashes during the transfer (which 
+    should only take a few seconds).
+* Once transferred, the code will run automatically on your micro:bit. To rerun
+   your program, press the reset button on the back of your micro:bit. The reset 
+   button automatically runs the newest file on the micro:bit.
+
+In File Explorer, right-click on the hex file (created in Step 2 above), choose **Send to**, and then **MICROBIT**.
+
+![](/static/mb/device/usb-windows-sendto.jpg)
+
+By copying the script onto the `MICROBIT` drive, you have programmed it into the
+flash memory on the micro:bit, which means even after you unplug the micro:bit,
+your program will still run if the micro:bit is powered by battery.
+
+If you want to save time, you can use the [micro:bit uploader](/uploader) to
+automatically deploy hex files to your micro:bit. It works on Windows and is
+compatible with any browser.
+
+### ~hint
+
+Transfer not working? See some [troubleshooting tips](/device/usb/troubleshooting).
+
+### ~

docs/device/usb/windows-firefox.md

@@ -0,0 +1,86 @@
+# Uploading from Firefox on Windows
+
+How to compile, transfer, and run a program on your micro:bit on **Firefox for Windows**.
+
+While you're writing and testing your programs, you'll mostly be [running them
+in the simulator](/device/simulator), but once you've finished your program you
+can **compile** it and run it on your micro:bit.
+
+The basic steps are:
+
+1. Connect your micro:bit to your computer via USB
+2. Click **Download** and download the `.hex` file
+3. Copy the `.hex` file from your computer onto the micro:bit drive
+
+### ~hint
+
+You can use the [micro:bit uploader](/uploader) to automatically deploy ``.hex`` files to your micro:bit!
+![](/static/uploader/tooltip.png)
+
+### ~
+
+## Requirements
+
+You need the following things to transfer and run a script on your micro:bit:
+
+* A-Male to Micro USB cable to connect your computer to your micro:bit. This is
+    the same cable that is commonly used to connect a smart phone to a computer.
+* A PC running Windows 7 or later, or a Mac running OS X 10.6 or later
+
+## Step 1: Connect your micro:bit to your computer
+
+First, connect the micro:bit:
+
+1. Connect the small end of the USB cable to the micro USB port on your micro:bit.
+
+2. Connect the other end of the USB cable to a USB port on your computer.
+
+Your computer should recognise your micro:bit as a new drive. On computers
+running Windows, `MICROBIT` appears as a drive under Devices and drives. On a Mac
+it appears as a new drive under Devices.
+
+![](/static/mb/device/usb-windows-device.jpg)
+
+## Step 2: Download your program
+
+1. Open your project on [codethemicrobit.com](https://codethemicrobit.com)
+2. Click **Download**
+3. When prompted, choose to **save** the compiled file onto your computer. The
+   prompt will be different depending on which browser you are using, or
+   whether you are using a Windows computer or a Mac
+
+A window will appear asking whether you want to save or open the `.hex` file.
+Select **Save File** and then select **OK**.
+
+![](/static/mb/device/usb-windows-firefox-1.png)
+
+The file will then appear in your downloads in the top right of your browser.
+Click the **folder icon** next to the filename to open it in Windows Explorer.
+
+![](/static/mb/device/usb-windows-firefox-2.jpg)
+
+Drag and drop the `.hex` file from the download folder onto the `MICROBIT` drive.
+## Step 3: Transfer the file to your micro:bit
+
+* Once you've found the folder containing your `.hex` file, drag and drop it
+    onto your `MICROBIT` drive
+* If you're using Windows, you can use **Send to** as described below 
+* The LED on the back of your micro:bit flashes during the transfer (which 
+    should only take a few seconds).
+* Once transferred, the code will run automatically on your micro:bit. To rerun
+   your program, press the reset button on the back of your micro:bit. The reset 
+   button automatically runs the newest file on the micro:bit.
+
+In File Explorer, right-click on the hex file (created in Step 2 above), choose **Send to**, and then **MICROBIT**.
+
+![](/static/mb/device/usb-windows-sendto.jpg)
+
+By copying the script onto the `MICROBIT` drive, you have programmed it into the
+flash memory on the micro:bit, which means even after you unplug the micro:bit,
+your program will still run if the micro:bit is powered by battery.
+
+### ~hint
+
+Transfer not working? See some [troubleshooting tips](/device/usb/troubleshooting).
+
+### ~

docs/device/usb/windows-ie.md

@@ -0,0 +1,86 @@
+# Uploading from Internet Explorer on Windows
+
+While you're writing and testing your programs, you'll mostly be [running them
+in the simulator](/device/simulator), but once you've finished your program you
+can **compile** it and run it on your micro:bit.
+
+The basic steps are:
+
+1. Connect your micro:bit to your computer via USB
+2. Click **Download** and download the `.hex` file
+3. Copy the `.hex` file from your computer onto the micro:bit drive
+
+### ~hint
+
+You can use the [micro:bit uploader](/uploader) to automatically deploy ``.hex`` files to your micro:bit!
+![](/static/uploader/tooltip.png)
+
+### ~
+
+## Requirements
+
+You need the following things to transfer and run a script on your micro:bit:
+
+* A-Male to Micro USB cable to connect your computer to your micro:bit. This is
+    the same cable that is commonly used to connect a smart phone to a computer.
+* A PC running Windows 7 or later, or a Mac running OS X 10.6 or later
+
+## Step 1: Connect your micro:bit to your computer
+
+First, connect the micro:bit:
+
+1. Connect the small end of the USB cable to the micro USB port on your micro:bit.
+
+2. Connect the other end of the USB cable to a USB port on your computer.
+
+Your computer should recognise your micro:bit as a new drive. On computers
+running Windows, `MICROBIT` appears as a drive under Devices and drives. On a Mac
+it appears as a new drive under Devices.
+
+![](/static/mb/device/usb-windows-device.jpg)
+
+## Step 2: Download your program
+
+1. Open your project on [codethemicrobit.com](https://codethemicrobit.com)
+2. Click **Download**
+3. When prompted, choose to **save** the compiled file onto your computer. The
+   prompt will be different depending on which browser you are using, or
+   whether you are using a Windows computer or a Mac
+
+A message will appear at the bottom of the browser asking what you want to do
+with the file. Click **Save**:
+
+![](/static/mb/device/usb-windows-ie11-1.png)
+
+Then click **Open folder** and drag and drop the file from your Downloads to
+your `MICROBIT` drive.
+
+![](/static/mb/device/usb-windows-ie11-2.png)
+
+## Step 3: Transfer the file to your micro:bit
+
+* Once you've found the folder containing your `.hex` file, drag and drop it
+    onto your `MICROBIT` drive
+* If you're using Windows, you can use **Send to** as described below 
+* The LED on the back of your micro:bit flashes during the transfer (which 
+    should only take a few seconds).
+* Once transferred, the code will run automatically on your micro:bit. To rerun
+   your program, press the reset button on the back of your micro:bit. The reset 
+   button automatically runs the newest file on the micro:bit.
+
+**Send to**: If you're using Windows you use *Send to* in File Explorer:
+
+In File Explorer, right-click on the hex file (created in Step 2 above), choose **Send to**, and then **MICROBIT**.
+
+![](/static/mb/device/usb-windows-sendto.jpg)
+
+By copying the script onto the `MICROBIT` drive, you have programmed it into the
+flash memory on the micro:bit, which means even after you unplug the micro:bit,
+your program will still run if the micro:bit is powered by battery.
+
+
+### ~hint
+
+Transfer not working? See some [troubleshooting tips](/device/usb/troubleshooting).
+
+### ~

docs/docs.md

@@ -21,6 +21,7 @@
 ### More questions?
 
 * [Frequently Asked Question](/faq)
+* [Embedding project](/share)
 * [Help Translate](/translate)
 * [Release notes](/release-notes)
 

docs/faq.md

@@ -18,7 +18,8 @@ to reopen your latest project. You can also open previous project stored locally
 
 The project source is also stored in each compiled ``.hex`` file. Drag and drop the ``.hex`` file into the web editor to load the project.
 
-To share your project with others, you can use the **Embed** feature. It stores your project in the cloud and creates a URL that you can share with others.
+To share your project with others, you can use the [Embed Project...](/share). 
+It stores your project in the cloud and creates a URL that you can share with others.
 
 If you are using [Visual Studio Code](/code), all your programs are stored as files on your computer and you can use your favorite source control system as needed.
 

docs/lessons/happy-birthday.md

@@ -13,14 +13,8 @@ Music
 
 ## Prior learning/place of lesson in scheme of work
 
-Learn how to convert your BBC micro:bit into a music player using pins P0 and GND, earphones (or speakers), as well as crocodile clips (or spring clips). We will be learning how to code musical notes using simple commands such as play, keys, and notes.
-
-## What the teacher needs to know / QuickStart Computing Glossary
-
-* Hardware: The physical systems and components of digital devices; see also software.
-* Programmable toys: Robots designed for children to use, accepting input, storing short sequences of simple instructions and moving according to this stored program.
-* Program: A stored set of instructions encoded in a language understood by the computer that does some form of computation, processing input and/or stored data to generate output.
-* Simulation: Using a computer to model the state and behaviour of real-world (or imaginary) systems, including physical or social systems; an integral part of most computer games.
+Learn how to convert your BBC micro:bit into a music player using pins P0 and GND, earphones (or speakers), as well as crocodile clips (or spring clips). 
+We will be learning how to code musical notes using simple commands such as play, keys, and notes.
 
 ## Objectives
 

docs/lessons/happy-birthday/activity.md

@@ -1,13 +1,13 @@
 # happy birthday blocks activity
 
-Play sounds with music blocks. 
+Play sounds with music blocks.
 
 Have you ever tried to play a song on an instrument? Let's try coding the song "Happy Birthday" on the micro:bit !
 
 Let's start by adding the code in the music drawer that includes a single musical chord (or pitched sound) with the `play` block. Then insert the chord "C". Once you are done coding, don't forget to run your code in the simulator or the micro:bit.
 
 ```blocks
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
 ```
 
 * click run to see if the code works as expected.
@@ -15,12 +15,12 @@ music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
 We want to continue to adding musical chords with the `play` block. So insert the appropriate chord blocks: `D`, `F`, `G` to complete the first part of the song. Modify your code so that your code looks like this.
 
 ```blocks
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quater));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quarter));
 basic.pause(100);
 ```
 
@@ -29,19 +29,19 @@ basic.pause(100);
 We want to continue to adding musical chords with the `play` block. Then insert the appropriate chords: `B`, `C`, `D`, `E` , `F` to complete the second part of the song. Modify your code so that your code looks like this.
 
 ```blocks
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quater));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quarter));
 basic.pause(100);
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.G), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quater));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.G), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quarter));
 basic.pause(100);
 ```
 

docs/lessons/happy-birthday/challenges.md

@@ -8,19 +8,19 @@ Complete the [happy birthday](/lessons/happy-birthday/activity) activity and you
 
 
 ```blocks
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quater));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quarter));
 basic.pause(100);
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.G), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quater));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.G), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quarter));
 basic.pause(100);
 
 
@@ -35,26 +35,26 @@ Let's code the third part of Happy Birthday!
 To do this, you need to add blocks after the last line of the `play` blocks. We want to continue to adding musical chords with the `play` block. Then insert the appropriate chord blocks `G`, `E`, `C`, `B`, `A` to complete the third part of the song. Modify your code so that your code looks like this.
 
 ```blocks
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quater));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quarter));
 basic.pause(100);
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.G), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quater));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.G), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quarter));
 basic.pause(100);
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.A), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quater));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.A), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quarter));
 basic.pause(100);
 ```
 
@@ -66,33 +66,33 @@ Finally, we continue to adding the appropriate `play` block and fit the followin
 
 
 ```blocks
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quater));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quarter));
 basic.pause(100);
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.G), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quater));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.G), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quarter));
 basic.pause(100);
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.A), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quater));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.A), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quarter));
 basic.pause(100);
-music.playTone(music.noteFrequency(Note.A), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.A), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.B), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.G), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quater));
+music.playTone(music.noteFrequency(Note.A), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.A), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.B), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.G), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quarter));
 ```
 
 

docs/lessons/hero.md

@@ -1,7 +1,5 @@
 # hero 
 
-make a game to test hand-eye coordination.
-
 Make a game to test hand-eye coordination
 
 * [activity](/lessons/hero/activity)

docs/lessons/hero/activity.md

@@ -44,7 +44,7 @@ let hero = game.createSprite(2, 2);
 let food = game.createSprite(4, 4);
 let ghost = game.createSprite(0, 0);
 ghost.change(LedSpriteProperty.Blink, 100);
-food = led.brightness() == 8;
+food.set(LedSpriteProperty.Brightness, 8);
 
 ```
 
@@ -56,7 +56,7 @@ let hero = game.createSprite(2, 2);
 let food = game.createSprite(4, 4);
 let ghost = game.createSprite(0, 0);
 ghost.change(LedSpriteProperty.Blink, 100);
-food = led.brightness() == 8;
+food.set(LedSpriteProperty.Brightness, 8);
 while (true) {
     basic.pause(400);
 }
@@ -73,7 +73,7 @@ let hero = game.createSprite(2, 2);
 let food = game.createSprite(4, 4);
 let ghost = game.createSprite(0, 0);
 ghost.change(LedSpriteProperty.Blink, 100);
-food = led.brightness() == 8;
+food.set(LedSpriteProperty.Brightness, 8);
 while (true) {
     basic.pause(400);
     if (ghost.get(LedSpriteProperty.X) < hero.get(LedSpriteProperty.X)) {
@@ -99,7 +99,7 @@ let hero = game.createSprite(2, 2);
 let food = game.createSprite(4, 4);
 let ghost = game.createSprite(0, 0);
 ghost.change(LedSpriteProperty.Blink, 100);
-food = led.brightness() == 8;
+food.set(LedSpriteProperty.Brightness, 8);
 while (true) {
     basic.pause(400);
     if (ghost.get(LedSpriteProperty.X) < hero.get(LedSpriteProperty.X)) {
@@ -127,7 +127,7 @@ let hero = game.createSprite(2, 2);
 let food = game.createSprite(4, 4);
 let ghost = game.createSprite(0, 0);
 ghost.change(LedSpriteProperty.Blink, 100);
-food = led.brightness() == 8;
+food.set(LedSpriteProperty.Brightness, 8);
 while (true) {
     basic.pause(400);
     if (ghost.get(LedSpriteProperty.X) < hero.get(LedSpriteProperty.X)) {
@@ -164,7 +164,7 @@ let hero = game.createSprite(2, 2);
 let food = game.createSprite(4, 4);
 let ghost = game.createSprite(0, 0);
 ghost.change(LedSpriteProperty.Blink, 100);
-food = led.brightness() == 8;
+food.set(LedSpriteProperty.Brightness, 8);
 while (true) {
     basic.pause(400);
     if (ghost.get(LedSpriteProperty.X) < hero.get(LedSpriteProperty.X)) {
@@ -212,7 +212,7 @@ let hero = game.createSprite(2, 2);
 let food = game.createSprite(4, 4);
 let ghost = game.createSprite(0, 0);
 ghost.change(LedSpriteProperty.Blink, 100);
-food = led.brightness() == 8;
+food.set(LedSpriteProperty.Brightness, 8);
 while (true) {
     basic.pause(400);
     if (ghost.get(LedSpriteProperty.X) < hero.get(LedSpriteProperty.X)) {

docs/projects.md

@@ -2,6 +2,9 @@
 
 Here are some cool projects that you can build with your micro:bit!
 
+## Games
+
+Fun games to build with your micro:bit.
 
 ```codecard
 [{
@@ -20,18 +23,42 @@ Here are some cool projects that you can build with your micro:bit!
   "name": "Rock Paper Scissors",
   "url":"/projects/rock-paper-scissors",
   "imageUrl":"/static/mb/projects/a4-motion.png"
-},{
-  "name": "Compass",
-  "url":"/projects/compass",
-  "imageUrl":"/static/mb/projects/a5-compass.png"
-},{
+}]
+```
+
+## Maker, Arts, Fashion
+
+```codecard
+[{
   "name": "Hack your headphones",
   "url":"/projects/hack-your-headphones",
   "imageUrl":"/static/mb/projects/a6-music.png"
-},{
+}, {
   "name": "Banana keyboard",
   "url":"/projects/banana-keyboard",
   "imageUrl":"/static/mb/projects/a7-conductive.png"
+}, {
+  "name": "Guitar",
+  "url":"/projects/guitar",
+  "imageUrl":"/static/mb/projects/guitar.png"
+}, {
+  "name": "Watch",
+  "url":"/projects/the-watch",
+  "imageUrl":"/static/mb/projects/a10-watch.png"
+}, {
+  "name": "Timing gates",
+  "url":"/projects/timing-gates",
+  "imageUrl":"/static/mb/projects/timing-gates.jpg"
+}]
+```
+
+## More
+
+```codecard
+[{
+  "name": "Compass",
+  "url":"/projects/compass",
+  "imageUrl":"/static/mb/projects/a5-compass.png"
 },{
   "name": "Telegraph",
   "url":"/projects/telegraph",
@@ -40,13 +67,9 @@ Here are some cool projects that you can build with your micro:bit!
   "name": "Radio",
   "url":"/projects/radio",
   "imageUrl":"/static/mb/projects/a9-radio.png"
-},{
-  "name": "Watch",
-  "url":"/projects/the-watch",
-  "imageUrl":"/static/mb/projects/a10-watch.png"
 }]
 ```
 
 ### See Also
 
-[Flashing Heart](/projects/flashing-heart), [Smiley Buttons](/projects/smiley-buttons), [Love Meter](/projects/love-meter), [Rock Paper Scissors](/projects/rock-paper-scissors), [Compass](/projects/compass), [Hack your headphones](/projects/hack-your-headphones), [Banana keyboard](/projects/banana-keyboard), [Telegraph](/projects/telegraph), [Radio](/projects/radio), [Watch](/projects/the-watch)
+[Flashing Heart](/projects/flashing-heart), [Smiley Buttons](/projects/smiley-buttons), [Love Meter](/projects/love-meter), [Rock Paper Scissors](/projects/rock-paper-scissors), [Compass](/projects/compass), [Hack your headphones](/projects/hack-your-headphones), [Banana keyboard](/projects/banana-keyboard), [Telegraph](/projects/telegraph), [Radio](/projects/radio), [Guitar](/projects/guitar), [Watch](/projects/the-watch)

docs/projects/banana-keyboard.md

@@ -1,12 +1,16 @@
-# banana keyboard activity 
+# banana keyboard
 
-build a banana keyboard 
+### @description A beginner maker activity, building a piano from bananas.
 
-# micro:bit banana keyboard
+### ~avatar
+
+Build your own micro:bit piano using bananas!
+
+### ~
 
 ![](/static/mb/lessons/banana-keyboard-0.png)
 
-In this project, you will build your own music player micro:bit banana keyboard from household fruit. Project duration: 15 minutes.
+## Duration: ~20 minutes.
 
 ## Materials
 
@@ -15,86 +19,11 @@ In this project, you will build your own music player micro:bit banana keyboard
 * Orange
 * Crocodile clips
 
-## Steps
+## Activities
 
-### Step 1
-
-![](/static/mb/lessons/banana-keyboard-1.png)
-
-Using the 1st crocodile clip, connect the end of the crocodile clip onto GND pin on the micro:bit.
-
-### Step 2
-
-![](/static/mb/lessons/banana-keyboard-2.png)
-
-![](/static/mb/lessons/banana-keyboard-3.png)
-
-Using the 2nd crocodile clip, connect the end of the crocodile clip onto the 0 pin on the micro:bit.
-
-### Step 3
-
-![](/static/mb/lessons/banana-keyboard-4.png)
-
-Using the 1st crocodile clip, connect the second end of the crocodile clip onto based of the headphone jack.
-
-### Step 4
-
-![](/static/mb/lessons/banana-keyboard-5.png)
-
-![](/static/mb/lessons/banana-keyboard-6.png)
-
-Using the 2nd crocodile clip, connect the second end of the crocodile clip onto tip of the headphone jack.
-
-### Step 5
-
-![](/static/mb/lessons/banana-keyboard-7.png)
-
-Using the 3rd crocodile clip, connect the end of the crocodile clip onto the 1st crocodile clip already clipped onto GND.
-
-### Step 6
-
-![](/static/mb/lessons/banana-keyboard-8.png)
-
-![](/static/mb/lessons/banana-keyboard-9.png)
-
-Using the 3rd crocodile clip, connect the unattached end of the crocodile clip onto the orange.
-
-### Step 7
-
-![](/static/mb/lessons/banana-keyboard-10.png)
-
-Using the 4th crocodile clip, connect the end of the crocodile clip onto pin 1 on the micro:bit.
-
-### Step 8
-
-![](/static/mb/lessons/banana-keyboard-11.png)
-
-Using the 4th crocodile clip, connect the unattached end of the crocodile clip onto the banana.
-
-### Step 9
-
-![](/static/mb/lessons/banana-keyboard-12.png)
-
-Your banana keyboard is ready!
-
-### Step 10
-
-Connect your micro:bit to your computer using your USB cable and run this script:
-```blocks
-let sound = music.noteFrequency(Note.C);
-input.onPinPressed(TouchPin.P1, () => {
-    for (let i = 0; i < 5; i++) {
-        sound = sound + 25;
-        music.playTone(sound, music.beat(BeatFraction.Sixteenth));
-    }
-});
-```
-
-Tap your banana instrument to play sound against... the fruit!
-
-
-### ~avatar boothing
-
-Excellent, you're ready to continue with the [challenges](/projects/banana-keyboard-challenges)!
+* [Making the keyboard](/projects/banana-keyboard/making)  
+* [Beat box](/projects/banana-keyboard/beat-box)
 
+### ~button /projects/banana-keyboard/making
+Let's get started!
 ### ~

docs/projects/banana-keyboard/beat-box.md

@@ -1,10 +1,4 @@
-# banana keyboard blocks challenges
-
-control images with variables. 
-
-## Before we get started
-
-Control images with variables. 
+# banana keyboard - beat box
 
 Have you ever tried to making beat box sounds? Let's try making a beatbox with code!
 
@@ -35,7 +29,7 @@ input.onPinPressed(TouchPin.P1, () => {
 ```
 
 
-* click *run* to see if the code works as expected.
+* click *Download* to see if the code works as expected.
 
 
 
@@ -57,8 +51,4 @@ input.onPinPressed(TouchPin.P2, () => {
 })
 ```
 
-* click *run* to see if the code works as expected.
-
-### ~button /projects/telegraph
-NEXT: Telegraph
-### ~
+* click *Download* to see if the code works as expected.

docs/projects/banana-keyboard/making.md

@@ -0,0 +1,85 @@
+# banana keyboard - making
+
+## Materials
+
+* micro:bit, battery holder and 2 AAA batteries
+* Bananas
+* Orange
+* Crocodile clips
+
+## Steps
+
+### Step 1
+
+![](/static/mb/lessons/banana-keyboard-1.png)
+
+Using the 1st crocodile clip, connect the end of the crocodile clip onto GND pin on the micro:bit.
+
+### Step 2
+
+![](/static/mb/lessons/banana-keyboard-2.png)
+
+![](/static/mb/lessons/banana-keyboard-3.png)
+
+Using the 2nd crocodile clip, connect the end of the crocodile clip onto the 0 pin on the micro:bit.
+
+### Step 3
+
+![](/static/mb/lessons/banana-keyboard-4.png)
+
+Using the 1st crocodile clip, connect the second end of the crocodile clip onto based of the headphone jack.
+
+### Step 4
+
+![](/static/mb/lessons/banana-keyboard-5.png)
+
+![](/static/mb/lessons/banana-keyboard-6.png)
+
+Using the 2nd crocodile clip, connect the second end of the crocodile clip onto tip of the headphone jack.
+
+### Step 5
+
+![](/static/mb/lessons/banana-keyboard-7.png)
+
+Using the 3rd crocodile clip, connect the end of the crocodile clip onto the 1st crocodile clip already clipped onto GND.
+
+### Step 6
+
+![](/static/mb/lessons/banana-keyboard-8.png)
+
+![](/static/mb/lessons/banana-keyboard-9.png)
+
+Using the 3rd crocodile clip, connect the unattached end of the crocodile clip onto the orange.
+
+### Step 7
+
+![](/static/mb/lessons/banana-keyboard-10.png)
+
+Using the 4th crocodile clip, connect the end of the crocodile clip onto pin 1 on the micro:bit.
+
+### Step 8
+
+![](/static/mb/lessons/banana-keyboard-11.png)
+
+Using the 4th crocodile clip, connect the unattached end of the crocodile clip onto the banana.
+
+### Step 9
+
+![](/static/mb/lessons/banana-keyboard-12.png)
+
+Your banana keyboard is ready!
+
+### Step 10
+
+Connect your micro:bit to your computer using your USB cable and run this script:
+```blocks
+input.onPinPressed(TouchPin.P1, () => {
+    music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+});
+```
+
+Tap your banana instrument to play sound against... the fruit!
+
+### ~button /projects/banana-keyboard/beat-box
+NEXT: beat box
+### ~

docs/projects/compass.md

@@ -103,7 +103,3 @@ basic.forever(() => {
     }
 });
 ```
-
-### ~button /projects/hack-your-headphones
-NEXT: Hack Your Headphones
-### ~

docs/projects/flashing-heart.md

@@ -7,11 +7,12 @@
 ```sim
 basic.forever(() => {
 basic.showLeds(`
-. # . # .
-# # # # #
-# # # # #
-. # # # .
-. . # . .`);
+    . # . # .
+    # # # # #
+    # # # # #
+    . # # # .
+    . . # . .`
+    );
 basic.pause(500);
 basic.clearScreen();
 basic.pause(500);
@@ -29,11 +30,12 @@ Use [show leds](/reference/basic/show-leds) and make your code look like this:
 
 ```blocks
 basic.showLeds(`
-. # . # .
-# # # # #
-# # # # #
-. # # # .
-. . # . .`);
+    . # . # .
+    # # # # #
+    # # # # #
+    . # # # .
+    . . # . .`
+    );
 ```
 
 ## Step 2
@@ -42,11 +44,11 @@ Add a [pause](/reference/basic/pause) to wait and [clear screen](/reference/basi
 
 ```blocks
 basic.showLeds(`
-. # . # .
-# # # # #
-# # # # #
-. # # # .
-. . # . .`);
+    . # . # .
+    # # # # #
+    # # # # #
+    . # # # .
+    . . # . .`);
 basic.pause(500);
 basic.clearScreen();
 ```
@@ -58,11 +60,12 @@ Put a [forever loop](/reference/basic/forever) around it.
 ```blocks
 basic.forever(() => {
 basic.showLeds(`
-. # . # .
-# # # # #
-# # # # #
-. # # # .
-. . # . .`);
+    . # . # .
+    # # # # #
+    # # # # #
+    . # # # .
+    . . # . .`
+    );
 basic.pause(500);
 basic.clearScreen();
 })
@@ -75,11 +78,12 @@ Add a [pause](/reference/basic/pause) to wait after clearing the screen.
 ```blocks
 basic.forever(() => {
 basic.showLeds(`
-. # . # .
-# # # # #
-# # # # #
-. # # # .
-. . # . .`);
+    . # . # .
+    # # # # #
+    # # # # #
+    . # # # .
+    . . # . .`
+    );
 basic.pause(500);
 basic.clearScreen();
 basic.pause(500);
@@ -94,26 +98,24 @@ Add a second image of a broken heart.
 ```blocks
 basic.forever(() => {
 basic.showLeds(`
-. # . # .
-# # # # #
-# # # # #
-. # # # .
-. . # . .`);
+    . # . # .
+    # # # # #
+    # # # # #
+    . # # # .
+    . . # . .`
+    );
 basic.pause(500);
 basic.clearScreen();
 basic.pause(500);
 basic.showLeds(`
-. # . # .
-# . # # #
-# . . . #
-. # # # .
-. . # . .`);
+    . # . # .
+    # . # # #
+    # . . . #
+    . # # # .
+    . . # . .`
+    );
 basic.pause(500);
 basic.clearScreen();
 basic.pause(500);
 })
 ```
-
-### ~button /projects/smiley-buttons
-NEXT: Smiley Buttons
-### ~

docs/projects/guitar.md

@@ -0,0 +1,42 @@
+# Guitar
+
+![guitar icon](/static/mb/projects/guitar.png)
+
+### @description A beginner-intermediate maker activity, building a guitar with the micro:bit  
+
+### ~avatar avatar
+
+Make a micro:bit guitar with this guided tutorial!
+
+### ~
+*playing micro:bit guitar*
+https://youtu.be/GYmdTFvxz80
+
+## Duration
+
+5 Activities, approx 30-45 min each based on familiarity with the coding concepts
+
+## Materials
+
+* Cardboard large pieces (recycle!)
+* Tape (masking, duct tape, and/or packing tape)
+* Markers and/or paint
+* Aluminum Foil
+* Scissors that can cut cardboard
+* 1 micro:bit, battery holder and 2 AAA batteries
+* 4-5 Crocodile clips
+* Headphones
+
+## Activities
+
+* [Making the Guitar Body](/projects/guitar/making)  
+* [Buttons, Display & Sound](/projects/guitar/displaybuttons)  
+* [Light Sensor Tone control](/projects/guitar/lightsensor)  
+* [Accelerometer Beat control](/projects/guitar/accelerometer)  
+* [Pin Press Switch](/projects/guitar/pinpress)  
+
+### ~button /projects/guitar/making
+
+Let's get started!
+
+### ~

docs/projects/guitar/accelerometer.md

@@ -0,0 +1,115 @@
+# Accelerometer Beat control
+
+### @description micro:bit guitar: using accelerometer to control tempo
+
+### ~avatar avatar
+
+Use the Accelerometer to control guitar tempo
+* Concepts:
+     * Gravity
+     * Acceleration
+     * X, Y, Z coordinates
+     * Tempo
+     * Beat
+     * Mapping
+     * Graphing
+     * Absolute value
+
+### ~  
+
+## Duration: 30 - 45 minutes  
+  
+*accelerometer controlled tempo*  
+https://youtu.be/kA0HpqCWsjs
+
+## Blocks
+
+```cards
+input.acceleration(Dimension.Y)
+music.setTempo(120)
+pins.map(0, 0, 1023,60, 320)
+Math.abs(1)            
+```
+
+## Accelerometer, gravity and tilting!
+
+The micro:bit contains an **accelerometer** sensor that is able to measure forces applied to the board.
+On earth, we are subject to the **gravity force** which pulls us to the ground!
+
+https://youtu.be/0SULoTKmkhI
+
+When the micro:bit is flat on a table, with the screen pointing up, the gravity force is aligned
+with the **Z** axis of the micro:bit. 
+
+![micro:bit x, y, z axis image](/static/mb/projects/guitar/accelleration_axis.png)  
+
+If you tilt it up and down, the force will align with the **Y** axis -- this is how we can detect tilting!!!
+If the force along **Y** grows, the micro:bit is tilting more and more vertically!
+
+## Measuring Acceleration along different coordinates (X, Y, Z axis)  
+
+The acceleration block approximately measures **milli-g**, which is 1/1000 of a **g** or the 
+acceleration of gravity. 
+
+### Step 1: Graphing acceleration 
+```blocks
+basic.forever(() => {
+    led.plotBarGraph(input.acceleration(Dimension.Y), 1023)
+})
+```
+**Create the code** that measures the change in the Y axis acceleration as a graph on the LEDs  
+  
+**Dowload the code** to the micro:bit 
+  
+**Test the movements that move the graph from 1 to 5 bars on the LEDs** 
+
+### Extra
+
+Try graphing the acceleration along the **X** and **Z** axis. Can you explain the differences?
+
+### ~hint  
+## Mapping  
+**It is common to map one standard to another - such as with temperature**  
+![Fahrenheit to Celsius](/static/mb/projects/guitar/map_analogy.png "Fahrenheit to Celsius")  
+### ~
+
+### Step 2: Mapping acceleration to Beat
+**micro:bit sensors produce signal values between 0 to 1023. The *[map block](/reference/pins/map)* converts the signal to a desired range.**    
+```blocks
+basic.forever(() => {
+        music.setTempo(pins.map(Math.abs(input.acceleration(Dimension.Y)),
+            0, 1023,
+            60, 320))
+         music.playTone(Note.C, music.beat(BeatFraction.Quarter));
+})
+```  
+
+**Create the code** that *Maps*  Y axis acceleration as *tempo*  
+  
+**Download the code** to the micro:bit on the guitar  
+  
+**Test the movements that speed and slow the tempo**  
+
+### Step 3: Combine with light sensor tone control  
+**Put it all together!**
+
+```blocks
+basic.forever(() => {
+        music.setTempo(pins.map(Math.abs(input.acceleration(Dimension.Y)),
+            0, 1023,
+            60, 320))
+        music.playTone(
+            input.lightLevel() * 25,
+            music.beat(BeatFraction.Quarter)
+        );
+})
+```  
+**Combine the code above with the light sensor tone control code from the previous activity**
+  
+**Download the code** to the micro:bit on the guitar    
+
+###  Now play the guitar adjusting tone and tempo using the light sensor and accelerometer!
+
+### ~button /projects/guitar/pinpress
+NEXT: Pin Press on/off
+### ~

docs/projects/guitar/displaybuttons.md

@@ -0,0 +1,179 @@
+# Buttons, Display & Sound
+### @description micro:bit guitar: using buttons with display and sound
+
+### ~avatar avatar
+Use Button Events to control LED Display and play Sound
+* **Concepts:**
+     * Events
+     * Tone/Note
+     * Sequence
+
+### ~
+
+## Duration: 30 - 45 minutes
+
+## Materials
+
+A micro:bit, battery pack and 2 x AAA batteries
+
+![battery pack and micro:bit](/static/mb/projects/guitar/microbit.jpg)
+
+2 to 4 crocodile clips
+
+![crocodile clips](/static/mb/projects/guitar/crocclips.jpg)
+
+Headphones
+
+![earbud headphones](/static/mb/projects/guitar/headphones.jpg)
+
+## Blocks
+
+```cards
+    basic.showLeds(`
+        . # . # .
+        . . . . .
+        . # # # .
+        . # . # .
+        . # # # .
+        `);
+input.onButtonPressed(Button.A, () => {});
+music.playTone(Note.C, music.beat(BeatFraction.Quarter))
+music.rest(music.beat(BeatFraction.Whole))
+music.beat(BeatFraction.Quarter)
+```
+
+## Step 1: Make a Smiley
+Open [codethemicrobit.com](https://codethemicrobit.com) in your web browser
+```blocks
+    basic.showLeds(`
+        . # . # .
+        . . . . .
+        . # # # .
+        . # . # .
+        . # # # .
+        `);
+```
+From **Basics**, drag a **show LEDs** block into the coding area
+  * Create a face with LEDs
+
+![micro:bit USB connection](/static/mb/projects/guitar/connectmicrobit.jpg)
+Connect your micro:bit to your computer via USB and click **`Download`**.
+Follow the instructions to move the code to your micro:bit.
+
+## Step 2: Add Smiley LED Button Events
+```blocks
+input.onButtonPressed(Button.A, () => {
+    basic.showLeds(`
+        . # . # .
+        . . . . .
+        . # # # .
+        . # . # .
+        . # # # .
+        `)
+})
+input.onButtonPressed(Button.B, () => {
+    basic.showLeds(`
+        . # . # .
+        . . . . .
+        . . . . .
+        # . . . #
+        . # # # .
+        `)
+})
+```
+
+From **Input**, drag an **on button 'A' pressed** block into the coding area
+
+* Snap the LED face into the block
+
+* Create a 'B' button block with a different LED face
+
+* Download the code to your micro:bit and try the A & B buttons
+
+
+## Step 3: Add Headphone Speakers using Crocodile clips
+
+![crocodile clips attached to pins 0 and GND](/static/mb/projects/guitar/crocclipintoboard.jpg)
+
+![crocodile clips attached to headphone jack](/static/mb/projects/guitar/jacktocrocs.jpg)
+Connect **GND** to the **base of the headphone jack** using a second crocodile clip (usually black)
+
+Connect **pin 0** to the **tip of the headphone jack** with a crocodile clip
+
+*attaching batteries and micro:bit*
+https://youtu.be/zwRTmpKIaVU
+Attach the micro:bit & battery-pack to the guitar body
+
+*connecting headphone speaker*
+https://youtu.be/ewyEW_U5G9M
+Connect the headphones with crocodile clips
+
+### ~hint
+## The micro:bit can play music
+
+The **play tone** block allows a range letter note tones from **C** to **B5**.
+Songs are played using sequences notes.   Like the beginning of a birthday song (C, C, D, C, F, E).
+```blocks
+input.onButtonPressed(Button.A, () => {
+    music.playTone(Note.C, music.beat(BeatFraction.Quarter))
+    music.rest(music.beat(BeatFraction.Whole))
+    music.playTone(Note.C, music.beat(BeatFraction.Quarter))
+    music.rest(music.beat(BeatFraction.Whole))
+    music.playTone(Note.D, music.beat(BeatFraction.Quarter))
+    music.rest(music.beat(BeatFraction.Whole))
+    music.playTone(Note.C, music.beat(BeatFraction.Quarter))
+    music.rest(music.beat(BeatFraction.Whole))
+    music.rest(music.beat(BeatFraction.Whole))
+    music.playTone(Note.F, music.beat(BeatFraction.Half))
+    music.rest(music.beat(BeatFraction.Whole))
+    music.playTone(Note.E, music.beat(BeatFraction.Whole))
+})
+```
+### ~
+## Step 4: Add Tone Playing Events for Buttons A & B
+```blocks
+input.onButtonPressed(Button.A, () => {
+    basic.showLeds(`
+        . # . # .
+        . . . . .
+        . # # # .
+        . # . # .
+        . # # # .
+        `)
+    music.playTone(Note.A, music.beat(BeatFraction.Whole))
+})
+input.onButtonPressed(Button.B, () => {
+    basic.showLeds(`
+        . # . # .
+        . . . . .
+        . . . . .
+        # . . . #
+        . # # # .
+        `)
+    music.playTone(Note.G, music.beat(BeatFraction.Whole))
+})
+```
+From **Music**, drag **play tone *C* for *1* beat** block under the **show leds** in **Button A Pressed**
+
+  * modify **tone** by choosing a note (*letter*) and experiment with high and low pitches
+  * set **beat** to 1
+
+**Repeat** for **Button B** event
+
+**Download the code** to the micro:bit
+
+**Try the A & B buttons** with headphones and power connected
+
+## Congratulations on completing the basic guitar!
+**Challenge:** Create samples of longer music to play for each button instead of the single tone
+  * *Tip*: Search for "ABC music notation" or "Easy Music Notes" + the name of a song
+
+## Extra
+
+* [Smiley Buttons tutorial](/projects/smiley-buttons)
+* [Hack your headphones](/projects/hack-your-headphones)
+
+
+### ~button /projects/guitar/lightsensor
+NEXT: Light Sensor Tone Control
+### ~

docs/projects/guitar/lightsensor.md

@@ -0,0 +1,115 @@
+# Light Sensor Tone control
+
+### @description micro:bit guitar: using light sensor to control tone
+
+### ~avatar avatar
+
+Use the Light Sensor to the control tone for this [Theremin](https://en.wikipedia.org/wiki/Theremin) inspired guitar
+
+* **Concepts:**
+     * Inputs
+     * Light Intensity
+     * Tone/Frequency
+     * Ratio Mapping
+     * Forever Loop
+     * Math (multiplication) with code properties
+### ~
+
+## Duration: 30 - 45 minutes
+
+*playing tones with light sensor*
+https://youtu.be/2cKg9pokVC4
+
+## The micro:bit LEDs Light Sensors
+
+- the micro:bit can detect external light level intensity reaching the LEDs
+- the light level block reports a reading of values 0 (*dark*) to 255 (*bright*)
+- a **Forever Loop** is required to continually measure the current light level and control the tone
+
+## Forever Loop
+
+The forever loop really does run forever.  The forever loop is useful when there is a need to continually check for an event or use a changing value in code.
+
+## Blocks
+
+```cards
+basic.forever(() => {})
+input.lightLevel()
+led.plotBarGraph(0, 255)
+music.playTone(Note.C, music.beat(BeatFraction.Quarter))
+```
+
+## Step 1: Create a light level detector
+```blocks
+basic.forever(() => {
+    led.plotBarGraph(input.lightLevel(), 255)
+})
+```
+**Build the  blocks**
+  * From **Basic** drag a **forever loop** block into the coding area
+  * From **Led** drag a **plot bar graph** block into the **forever loop**
+  * From **Input** drag a **light level** block into **plot bar graph *of***
+
+**Set the *plot bar graph* value *up to* = *255* **
+
+## Step 2: Test the light required to move the bar graph height
+
+*graphing light input*
+https://youtu.be/pqU7bTcfQ_s
+Experiment to see the effect on graph height when the **plot bar graph** value ***up to*** is changed
+
+**255 is the maximum light input reading**, try numbers smaller than 255
+**Find a value** that allows the graph to show 1 - 5 bars
+
+### ~hint
+### Frequency
+**Frequency** measured in Hz which are cycles per second or vibrations per second
+  * A healthy human ear can detect frequencies in the range of 20Hz to 20,000Hz.
+  * The micro:bit + headphones reliably produce detectable output ~50Hz - 6,000Hz.
+
+**261Hz** represents a C note
+```blocks
+music.playTone(261, music.beat(BeatFraction.Half))
+```
+**play tone** blocks can specify a numeric  **Frequency**
+by replacing the letter **C** note with a **number** block that has the value it represents
+```blocks
+music.playTone(261, music.beat(BeatFraction.Half))
+```
+### ~
+
+## Step 3: Multiply Frequency using Math blocks
+ ```blocks
+input.onButtonPressed(Button.A, () => {
+    music.playTone(261 * 2, music.beat(BeatFraction.Half))
+})
+```
+Create a **play tone** block using a **Math** section, **multiplication** block to set *tone*
+
+### Next
+**Add** a **B** button block that multiplies the **261** tone by a number other than 2 to set tone
+
+**Download the code to the micro:bit**
+
+**Test the sound for multiples of the 261Hz *C* frequency**
+
+## Step 4: Control the Frequency with the light input
+```blocks
+basic.forever(() => {
+    music.playTone(input.lightLevel() * 25, music.beat(BeatFraction.Quarter))
+})
+```
+**Create a *forever loop* containing a *play tone* block**
+
+**Set *tone*, using *Math* multiplication block that multiplies *light level* input by 25**
+or experiment with multipliers larger and smaller than 25
+
+**Test light tone control on the guitar**
+Cover the LEDs with your hand to vary light detected to control the tone
+
+## Good work, this guitar is sounding good!
+**Challenge:** Create a variable for the light level multiplier that you can change using buttons (optional)
+
+### ~button /projects/guitar/accelerometer
+NEXT: Accelerometer Beat control
+### ~

docs/projects/guitar/making.md

@@ -0,0 +1,59 @@
+# Making the Guitar Body
+### @description Maker Project for Guitar Body for micro:bit
+
+### ~avatar avatar
+
+Make the Guitar Body for your micro:bit Guitar
+
+### ~
+
+## Duration: ~45 minutes
+
+## Materials
+  * Cardboard large pieces (recycle!)
+  * Tape (masking, duct tape, and/or packing tape)
+  * Scissors that can cut cardboard
+  * Markers and/or paint
+
+![Materials: cardboard, tape, scissors, markers](/static/mb/projects/guitar/materials.jpg)
+
+## Step 1: Design the body
+*tracing the guitar design*
+https://youtu.be/xMSrWaOZkFg
+
+* Search for [Guitar Silhouette](https://www.bing.com/images/search?q=Guitar+Silhouettes) design ideas and customize
+the shape of your guitar
+* Trace the design on a flat piece of cardboard (40-80 cm is best)
+
+### ~hint
+
+   * Avoid small details that are difficult to cut into cardboard
+   * Unfolding a box gives longer pieces of cardboard and creases can be reinforced
+
+### ~
+
+## Step 2: Cut out the body
+*cutting the cardboard*
+https://youtu.be/aUQkrFoEank
+
+
+## Step 3: Personalize the Guitar
+
+Create unique styles using tape, markers, paint and other available materials (*calling all artists!*)
+
+*decorating the guitar*
+https://youtu.be/zNAZTJeSxY8
+
+Everyone can come up with a unique design!
+
+![guitar design samples](/static/mb/projects/guitar/otherdesigns.jpg)
+
+## Extra!
+*strengthening the guitar*
+https://youtu.be/q0GkQdJmxjE
+
+Strengthen the guitar next with an angled cardboard strip (*optional*).
+
+### ~button /projects/guitar/displaybuttons
+NEXT: Buttons, Display and Sound
+### ~

docs/projects/guitar/pinpress.md

@@ -0,0 +1,131 @@
+# Pin Press Switch
+
+### @description micro:bit guitar: use pin press to toggle guitar play on/off
+
+### ~avatar avatar
+Use pin press to switch guitar play on/off
+
+* Concepts:
+    * Circuit
+    * Conductor
+    * Variable/Global-Variable
+    * Conditional: **`if`**, **`else`**
+    * Boolean: **`True`/`False`**
+### ~
+
+## Duration: approximately 45 minutes
+
+## Materials:
+2-3 Crocodile clips
+
+## Blocks
+
+```cards
+var on = false
+on;
+if (on) { } else {}
+input.onPinPressed(TouchPin.P1, () => {})
+```
+
+
+
+### ~hint
+## Circuits & Switches
+* **Circuits** need a power supply (battery), a resister (like a LED) & a conductor (metal, water, hand)
+* **Switches** turn electric power on by closing (completing) a circuit with a conductor so power can flow
+
+**Metal foil and wires make excellent conductors**
+
+**In this activity we use YOU to conduct electricity**
+**to close the circuit that switches the guitar ON and OFF!**
+### ~
+
+## Step 1: Pin Press Test
+
+```blocks
+input.onPinPressed(TouchPin.P0, () => {
+    basic.showNumber(0)
+})
+input.onPinPressed(TouchPin.P1, () => {
+    basic.showNumber(1)
+})
+input.onPinPressed(TouchPin.P2, () => {
+    basic.showNumber(2)
+})
+```
+**Create the pin-press code**
+
+**Download the code** on the micro:bit
+
+https://youtu.be/PAIU-vHqyGU
+
+**Hold the micro:bit touching The GND pin with one hand**
+**with the other hand alternately touch the 0, 1 and 2 pins**
+
+### ~hint
+**The electric signal traveled from pins, between your hands to `GND` and the micro:bit detected the electric signal!**
+### ~
+
+## Step 2: Installing conductive foil on the guitar
+https://youtu.be/NX0ECcpXFes
+**Add foil to the guitar body where it is easy to touch while playing**
+
+**Connect the foil to `GND` using a crocodile clip**
+
+https://youtu.be/YkymZGNmkrE
+**Add foil to the guitar neck**
+
+**Connect the foil to `pin 1` using a crocodile clip**
+
+## Step 3: Add a switch to turn the guitar ON and OFF
+**Using the `on` global variable we can switch the message on the micro:bit**
+**between ON and OFF**
+```blocks
+let on = false
+basic.forever(() => {
+    if (on == true) {
+        basic.showString("ON")
+    } else {
+        basic.showString("OFF")
+    }
+})
+input.onPinPressed(TouchPin.P1, () => {
+    if (on == true) {
+        on = false
+    } else {
+        on = true
+    }
+})
+```
+**Create the ON/OFF switch code**
+
+**Download the code on the micro:bit**
+
+**Test by touching `P1` to toggle the LED message between ON and OFF**
+
+*Final code*
+TODO: do we want to use `on = !on;` or be more direct in flipping the switch? `on = true; on = false;`
+```blocks
+var on = false
+basic.forever(() => {
+    if (on) {
+        music.setTempo(pins.map(Math.abs(input.acceleration(Dimension.Y)),
+            0, 1023,
+            60, 320))
+        music.playTone(
+            input.lightLevel() * 25,
+            music.beat(BeatFraction.Quarter)
+        );
+    } else {
+        music.rest(music.beat())
+    }
+})
+input.onPinPressed(TouchPin.P1, () => {
+    on = !on;
+})
+```
+## Now Play!
+**Turn the guitar ON and OFF with a pin press on the connected foil by**
+**touching both pieces of foil at the same time to connect the switches**
+
+https://youtu.be/GYmdTFvxz80

docs/projects/hack-your-headphones.md

@@ -1,12 +1,17 @@
 # hack your headphones 
 
-Hack your headphones
+### @description A beginner maker activity, building a piano from bananas.
 
-#  micro:bit music
+### ~avatar
+
+Build your own music player micro:bit from headphones.
+
+### ~
 
 ![](/static/mb/lessons/hack-your-headphones-0.png)
 
-In this project, you will build your own music player micro:bit from headphones. Project duration: 15 minutes.
+
+## Duration: ~15 minutes.
 
 ## Materials
 
@@ -14,48 +19,19 @@ In this project, you will build your own music player micro:bit from headphones.
 * Headphones
 * Crocodile clips
 
-## Steps
+## Activities
 
-### Step 1
+* [Connect your headphone](/projects/hack-your-headphone/making)
+* [Play sounds!]()
 
-![](/static/mb/lessons/banana-keyboard-1.png)
+# ~hint
 
-Using the 1st crocodile clip, connect the end of the crocodile clip onto GND pin on the micro:bit.
+**No crocodile clips!?!?!** Use wires or Aluminium foil! [Read more...](/device/foil-circuits)
 
-### Step 2
+# ~
 
-![](/static/mb/lessons/banana-keyboard-2.png)
+### ~button /projects/hack-your-headphones/making
 
-![](/static/mb/lessons/banana-keyboard-3.png)
-
-Using the 2nd crocodile clip, connect the end of the crocodile clip onto the 0 pin on the micro:bit.
-
-### Step 3
-
-![](/static/mb/lessons/banana-keyboard-4.png)
-
-Using the 1st crocodile clip, connect the second end of the crocodile clip onto based of the headphone jack. The base of your headphone jack is considered the ground so it is connected to the GND of the micro:bit.
-
-### Step 4
-
-![](/static/mb/lessons/banana-keyboard-5.png)
-
-![](/static/mb/lessons/hack-your-headphones-1.png)
-
-Using the 2nd crocodile clip, connect the second end of the crocodile clip onto the tip of the headphone jack. The tip of your headphone jack feeds into the right speaker on the headphone. You connect from the micro:bit pin 0 to the tip of the right side of your headphone. Use the tip of the headphone jack to play sounds.
-
-### Step 5
-
-![](/static/mb/lessons/hack-your-headphones-0.png)
-
-You hacked your headphones!
-
-### Step 6
-
-Connect your micro:bit to your computer using your USB cable and program  [light beatbox](/projects/hack-your-headphones-challenges) music on it. Press the reset button to restart your music player!
-
-### ~avatar avatar
-
-Excellent, you're ready to continue with the [challenges](/projects/hack-your-headphones-challenges)!
+Let's get started!
 
 ### ~

docs/projects/hack-your-headphones/making.md

@@ -0,0 +1,53 @@
+# hack your headphones - making
+
+### ~avatar avatar
+
+Did you know you could attach your headhpones to the micro:bit to generate sounds?
+
+### ~
+
+# ~hint
+
+**No crocodile clips!?!?!** Use wires or Aluminium foil! [Read more...](/device/foil-circuits)
+
+# ~
+
+### Step 1
+
+![](/static/mb/lessons/banana-keyboard-1.png)
+
+Using the 1st crocodile clip, connect the end of the crocodile clip onto GND pin on the micro:bit.
+
+### Step 2
+
+![](/static/mb/lessons/banana-keyboard-2.png)
+
+![](/static/mb/lessons/banana-keyboard-3.png)
+
+Using the 2nd crocodile clip, connect the end of the crocodile clip onto the 0 pin on the micro:bit.
+
+### Step 3
+
+![](/static/mb/lessons/banana-keyboard-4.png)
+
+Using the 1st crocodile clip, connect the second end of the crocodile clip onto based of the headphone jack. The base of your headphone jack is considered the ground so it is connected to the GND of the micro:bit.
+
+### Step 4
+
+![](/static/mb/lessons/banana-keyboard-5.png)
+
+![](/static/mb/lessons/hack-your-headphones-1.png)
+
+Using the 2nd crocodile clip, connect the second end of the crocodile clip onto the tip of the headphone jack. The tip of your headphone jack feeds into the right speaker on the headphone. You connect from the micro:bit pin 0 to the tip of the right side of your headphone. Use the tip of the headphone jack to play sounds.
+
+### Step 5
+
+![](/static/mb/lessons/hack-your-headphones-0.png)
+
+You hacked your headphones!
+
+### ~button /projects/hack-your-headphones/music-of-light
+
+NEXT: music of light
+
+### ~

docs/projects/hack-your-headphones/music-of-light.md

@@ -1,6 +1,4 @@
-# hack your headphones challenges
-
-Control sound with the light level. 
+# hack your headphones - music of light
 
 ### ~avatar avatar
 
@@ -70,7 +68,3 @@ input.onButtonPressed(Button.A, () => {
 ```
 
 * click **Download** and run your code on the micro:bit.
-
-### ~button /projects/banana-keyboard
-NEXT: Banana Keyboard
-### ~

docs/projects/love-meter.md

@@ -48,7 +48,3 @@ input.onPinPressed(TouchPin.P2, () => {
         `);
 });
 ```
-
-### ~button /projects/rock-paper-scissors
-NEXT: Rock Paper Scissors
-### ~

docs/projects/radio-challenges.md

@@ -58,7 +58,9 @@ After running this simulation several seconds by moving the micro:bit side to si
 ![](/static/mb/acc2.png)
 
 ### ~
-Finally, you must open the Excel CSV file by clicking on the data.xls file that was downloaded to Downloads Folder. 
+
+Finally, you must open the Excel CSV file by clicking on the `data.csv` file
+that was downloaded to Downloads Folder. 
 
 ![](/static/mb/data3.png)
 
@@ -87,10 +89,6 @@ Have fun reviewing your simulation and analyze the acceleration by chart the Exc
 * Review and analyze the actual micro:bit device acceleration data on Excel
 * Display acceleration with y or z using plot bar graph by changing acceleration from "x" to "y" or "z" 
 
-### ~button /projects/the-watch
-NEXT: The Watch
-### ~
-
 ```package
 microbit-radio
-```
+```

docs/projects/rock-paper-scissors.md

@@ -236,6 +236,3 @@ input.onButtonPressed(Button.B, () => {
 How else can you make your game better?
 Ever hear of [Rock Paper Scissors Spock Lizard](http://www.samkass.com/theories/RPSSL.html)?
 
-### ~button /projects/compass
-NEXT: Compass
-### ~

docs/projects/smiley-buttons.md

@@ -10,11 +10,12 @@ Use [show leds](/reference/basic/show-leds) to make a smiley face:
 
 ```blocks
 basic.showLeds(`
-. # . # .
-. # . # .
-. . . . .
-# . . . #
-. # # # .`);
+    . # . # .
+    . # . # .
+    . . . . .
+    # . . . #
+    . # # # .`
+    );
 ```
 
 ## Step 2
@@ -24,18 +25,20 @@ frowny face inside it:
 
 ```blocks
 basic.showLeds(`
-. # . # .
-. # . # .
-. . . . .
-# . . . #
-. # # # .`);
-input.onButtonPressed(Button.A, () => { 
-    basic.showLeds(`
     . # . # .
     . # . # .
     . . . . .
-    . # # # .
-    # . . . #`);
+    # . . . #
+    . # # # .`
+    );
+input.onButtonPressed(Button.A, () => { 
+    basic.showLeds(`
+        . # . # .
+        . # . # .
+        . . . . .
+        . # # # .
+        # . . . #`
+        );
 });
 ```
 
@@ -45,29 +48,28 @@ Now add blocks so that when [button B is pressed](/reference/input/button-is-pre
 
 ```blocks
 basic.showLeds(`
-. # . # .
-. # . # .
-. . . . .
-# . . . #
-. # # # .`);
-input.onButtonPressed(Button.A, () => { 
-    basic.showLeds(`
-    . # . # .
-    . # . # .
-    . . . . .
-    . # # # .
-    # . . . #`);
-});
-input.onButtonPressed(Button.B, () => { 
-    basic.showLeds(`
     . # . # .
     . # . # .
     . . . . .
     # . . . #
-    . # # # .`);
+    . # # # .`
+    );
+input.onButtonPressed(Button.A, () => { 
+    basic.showLeds(`
+        . # . # .
+        . # . # .
+        . . . . .
+        . # # # .
+        # . . . #`
+        );
+});
+input.onButtonPressed(Button.B, () => { 
+    basic.showLeds(`
+        . # . # .
+        . # . # .
+        . . . . .
+        # . . . #
+        . # # # .`
+        );
 });
 ```
-
-### ~button /projects/love-meter
-NEXT: Love Meter
-### ~

docs/projects/telegraph.md

@@ -1,75 +1,25 @@
 # telegraph activity 
 
-Build a telgraph.
-
-# micro:bit telegraph
-
 ![](/static/mb/lessons/telegraph-0.png)
 
-In this project, you will build your telegraph between micro:bits. Project duration: 15 minutes.
+### ~avatar
+
+Build a telegraph between two micro:bits to communicate with your friends!
+
+### ~
+
+## Duration: ~30 minutes
 
 ## Materials
 
 * micro:bit, battery holder and 2 AAA batteries
 * Crocodile clips
 
-## Steps
+## Activities
 
-### Step 1
-
-![](/static/mb/lessons/banana-keyboard-1.png)
-
-Using the 1st crocodile clip, connect the end of the crocodile clip onto GND pin on the micro:bit.
-
-### Step 2
-
-![](/static/mb/lessons/ornament-chain-2.png)
-
-Using the 2nd crocodile clip, connect the end of the crocodile clip onto the 3V pin on the micro:bit.
-
-### Step 3
-
-![](/static/mb/lessons/ornament-chain-3.png)
-
-Using the 3rd crocodile clip, connect the end of the crocodile clip onto pin 1 of the micro:bit.
-
-### Step 4
-
-![](/static/mb/lessons/ornament-chain-4.png)
-
-Using the 4th crocodile clip, connect the end of the crocodile clip onto pin 2 of the micro:bit.
-
-### Step 5
-
-![](/static/mb/lessons/ornament-chain-5.png)
-
-Using the 1st crocodile clip, connect the unattached end of the crocodile clip onto the GND on the 2nd micro:bit.
-
-### Step 6
-
-![](/static/mb/lessons/ornament-chain-6.png)
-
-Using the 2nd crocodile clip, connect the unattached end of the crocodile clip onto the 3V pin on the 2nd micro:bit.
-
-### Step 7
-
-![](/static/mb/lessons/ornament-chain-7.png)
-
-Using the 3rd crocodile clip, connect the unattached end of the crocodile clip onto pin 2 of the 2nd micro:bit.
-
-### Step 8
-
-![](/static/mb/lessons/ornament-chain-8.png)
-
-Using the 4th crocodile clip, connect the unattached end of the crocodile clip onto pin 1 of the 2nd micro:bit
-
-### Step 9
-
-![](/static/mb/lessons/telegraph-0.png)
-
-
-### ~avatar avatar
-
-Excellent, you're ready to continue with the [challenges](/projects/telegraph-challenges)!
+* [Making the circuit](/projects/telegraph/making)  
+* [Manual telegraph](/projects/telegraph/manual-telegraph)
 
+### ~button /projects/telegraph/making
+Let's get started!
 ### ~

docs/projects/telegraph/making.md

@@ -0,0 +1,75 @@
+# telegraph - making 
+
+### ~avatar
+
+Let's build a telegraph between two micro:bits.
+
+### ~
+
+![](/static/mb/lessons/telegraph-0.png)
+
+## Materials
+
+* micro:bit, battery holder and 2 AAA batteries
+* Crocodile clips
+
+## Steps
+
+### Step 1
+
+![](/static/mb/lessons/banana-keyboard-1.png)
+
+Using the 1st crocodile clip, connect the end of the crocodile clip onto GND pin on the micro:bit.
+
+### Step 2
+
+![](/static/mb/lessons/ornament-chain-2.png)
+
+Using the 2nd crocodile clip, connect the end of the crocodile clip onto the 3V pin on the micro:bit.
+
+### Step 3
+
+![](/static/mb/lessons/ornament-chain-3.png)
+
+Using the 3rd crocodile clip, connect the end of the crocodile clip onto pin 1 of the micro:bit.
+
+### Step 4
+
+![](/static/mb/lessons/ornament-chain-4.png)
+
+Using the 4th crocodile clip, connect the end of the crocodile clip onto pin 2 of the micro:bit.
+
+### Step 5
+
+![](/static/mb/lessons/ornament-chain-5.png)
+
+Using the 1st crocodile clip, connect the unattached end of the crocodile clip onto the GND on the 2nd micro:bit.
+
+### Step 6
+
+![](/static/mb/lessons/ornament-chain-6.png)
+
+Using the 2nd crocodile clip, connect the unattached end of the crocodile clip onto the 3V pin on the 2nd micro:bit.
+
+### Step 7
+
+![](/static/mb/lessons/ornament-chain-7.png)
+
+Using the 3rd crocodile clip, connect the unattached end of the crocodile clip onto pin 2 of the 2nd micro:bit.
+
+### Step 8
+
+![](/static/mb/lessons/ornament-chain-8.png)
+
+Using the 4th crocodile clip, connect the unattached end of the crocodile clip onto pin 1 of the 2nd micro:bit
+
+### Step 9
+
+![](/static/mb/lessons/telegraph-0.png)
+
+
+### ~button /projects/telegraph/manual-telegraph
+
+NEXT: manual telegraph
+
+### ~

docs/projects/telegraph/manual-telegraph.md

@@ -1,18 +1,10 @@
-# telegraph activity 
+# telegraph - manual telegraph 
 
-Build a telegraph.
-
-# micro:bit telegraph
-
-Have you ever tried to communicate through a telegraph? Let's try coding a "Telegraph" on two BBC micro:bits !
-
-Complete the following [tutorial](/projects/telegraph), your hack should look like this:
-
-![](/static/mb/lessons/telegraph-0.png)
+Let's build the code that will send a impulse while the user presses ``A``.
 
 ### Step 1
 
-We now need to digitally write to the specified pin (P0) as digital. Let's start by adding the code in the pin drawer that includes 'digital write (0,1) to pin P0'.. Then insert 1 for digital write. 
+We now need to digitally write to pin ``P0`` as **high** (1). 
 
 ```blocks
 pins.digitalWritePin(DigitalPin.P0, 1)
@@ -21,7 +13,8 @@ pins.digitalWritePin(DigitalPin.P0, 1)
 
 ### Step 2
 
-We want to add a block to turn on an LED in the middle area of the LED display using plot x, y. So insert the appropriate LED plot x, y. 
+We want to add a block to turn on an LED in the middle area of the LED display using plot x, y. 
+So insert the appropriate LED plot x, y. 
 
 ```blocks
 pins.digitalWritePin(DigitalPin.P0, 1)
@@ -31,7 +24,8 @@ led.plot(2, 2)
 
 ### Step 3
 
-We want to insert a condition that tells us when to turn on the LED. So insert the if block under logic drawer. Then add a condition that occurs if we do not turn on a LED with plot x, y. We also should plot an LED on the display if button A is pressed. Your code should appear as follows:
+We want to insert a condition that tells us when to turn on the LED. So insert the if block under logic drawer. 
+Then add a condition that occurs if we do not turn on a LED with plot x, y. We also should plot an LED on the display if button A is pressed. Your code should appear as follows:
 
 ```blocks
 if (input.buttonIsPressed(Button.A)) {
@@ -45,7 +39,7 @@ if (input.buttonIsPressed(Button.A)) {
 
 ### Step 4
 
-We want to write code if button A is NOT pressed. It is important to say that digital write is not on. We also want to turn off all LED lights on the LED screen
+We want to write code if button A is NOT pressed. It is important to say that digital write is not on. We also want to turn off all the LED light.
 
 ```blocks
 if (input.buttonIsPressed(Button.A)) {
@@ -53,7 +47,7 @@ if (input.buttonIsPressed(Button.A)) {
     led.plot(2, 2)
 } else {
     pins.digitalWritePin(DigitalPin.P0, 0)
-    basic.clearScreen()
+    led.unplot(2, 2)
 }
 ```
 
@@ -64,27 +58,24 @@ Let's add a forever loop so this code runs in the background forever. Modify you
 ```blocks
 basic.forever(() => {
     if (input.buttonIsPressed(Button.A)) {
-    pins.digitalWritePin(DigitalPin.P0, 1)
-    led.plot(2, 2)
-} else {
-    pins.digitalWritePin(DigitalPin.P0, 0)
-    basic.clearScreen()
-}    
-})
-
+        pins.digitalWritePin(DigitalPin.P0, 1)
+        led.plot(2, 2)
+    } else {
+        pins.digitalWritePin(DigitalPin.P0, 0)
+        led.unplot(2, 2)
+    })
 ```
 
 ### Step 6
 
-
 We now need to digitally read to the specified pin (P1) as digital. Let's start by going to the pin drawer and adding digital read pin (0,1) and changing the pin to P1. Now we need to create a condition for digital read pin (0,1). So we go to the logic drawer and select the comparison operator. Then we want to set the comparison operator to 1 to turn on digital read on pin 1. We want to insert a condition that tells us if button A is pressed and we should turn on digital read on pin 1. So insert the if block under logic drawer. Then add a condition that occurs if digital read on P1 is on. Then we want to plot x, y at the x, y coordinates of 2,2. we also want to say that if digital read pin P1 is not on, we want to turn off all LED lights on the screen. Your code should appear as follows:
 
 ```blocks
 if (pins.digitalReadPin(DigitalPin.P1) == 1) {
-    led.plot(2, 2);
+    led.plot(4, 4);
 }
 else {
-    basic.clearScreen();
+    led.unplot(4, 4);
 }
 basic.forever(() => {
     if (input.buttonIsPressed(Button.A)) {
@@ -108,7 +99,3 @@ Your telegraph is ready!
 * Connect the first micro:bit to your computer using your USB cable and put the telegraph script on it.
 * Connect the second micro:bit to your computer using your USB cable and run the telegraph script on it.
 * The first person and second person take turns pressing button A to play the telegraph game!
-
-### ~button /projects/radio
-NEXT: Radio
-### ~

docs/projects/timing-gates.md

@@ -0,0 +1,231 @@
+# Timing gates
+
+### ~avatar
+
+This project explains the principles of timing gates using household materials.
+
+### ~
+
+## Timing gates
+
+The two gates are connected to the micro:bit and can detect a car passing through.
+
+![](/static/mb/projects/timing-gates/sketchgates.jpg "Sketch of the gates")
+
+As the car passes through the gate ``0``, it sends an event to the micro:bit through the [on pin pressed](/reference/input/on-pin-pressed) block.
+The micro:bit records the time in a variable ``t0``.
+
+![](/static/mb/projects/timing-gates/sketchgate1.jpg "Sketch first gate")
+
+As the car passes through the gate ``1``, it sends an event to the micro:bit through the [on pin pressed](/reference/input/on-pin-pressed) block.
+The micro:bit records the time in a variable ``t1``.
+
+![](/static/mb/projects/timing-gates/sketchgate2.jpg "Sketch first gate")
+
+The rest is a bit of math and physics. The time taken to cross the gates is computed as the difference of ``t1 - t0``.
+By dividing the distance between the gates by the duration, we get the speed of the car!
+
+![](/static/mb/projects/timing-gates/sketchmath.jpg "Sketch math")
+
+
+## Materials
+
+* Carboard
+* Aluminum fail
+* Double-side tape (carpet tape)
+* 4 crocodile clips
+* A micro:bit board and USB cable
+
+![](/static/mb/projects/timing-gates/materials.jpg "Materials")
+
+## blocks
+
+```cards
+basic.showLeds(`
+        . . . . .
+        . . . . .
+        . . # . .
+        . . . . .
+        . . . . .
+        `)
+input.onPinPressed(TouchPin.P0, () => {})
+let t = 0
+input.runningTime()
+t - 1
+control.eventTimestamp();
+basic.showNumber(0)
+```
+
+## Building the gate
+
+The sensor is made by tapping two strips of fail on the cardboard as close as possible.
+
+Add two strips of double-sided tape on the cardboard. Remove the protective film.
+
+![](/static/mb/projects/timing-gates/tape.jpg "Double sided tape")
+
+Lay the Aluminum foil on the double-sided tape. Press firmly on the tape to get a good bonding of the foil.
+
+![](/static/mb/projects/timing-gates/stickfoil.jpg "Foil sensor")
+
+Strip the out foil around and between the tape strips. Make sure both foil strips don't touch each other.
+
+![](/static/mb/projects/timing-gates/spreadfoil.jpg "Foil taped")
+
+Connect a crocodile strip to each foil strip.
+
+![](/static/mb/projects/timing-gates/connectsensor.jpg "Connecting sensor")
+
+Connect the crocodile plugs to the ``GND`` and ``P0`` pins on the micro:bit.
+
+![](/static/mb/projects/timing-gates/connectcrocs.jpg "Connecting the micro:bit")
+
+The gate is ready to use! Your circuit should look like the picture below:
+
+![](/static/mb/projects/timing-gates/sensordone.jpg "A single gate")
+
+
+## Detecting the car with code
+
+The micro:bit provides an event [on pin pressed](/reference/pins/on-pin-pressed) 
+that is raised when a circuit between ``GND`` and a pin is detected. The circuit conductor could be a wire or even your body!
+We will attach a foil to the bottom of the car. When it passes over the gate, it connect both foil strips, close the circuit and trigger the event. 
+
+Open the [code editor](/) and start a new project and add the following blocks. Notice that we are using pin ``P0`` here. 
+
+```blocks
+basic.showLeds(`
+        . . . . .
+        . . . . .
+        . . # . .
+        . . . . .
+        . . . . .
+        `)
+input.onPinPressed(TouchPin.P0, () => {
+    basic.showLeds(`
+        # . . . .
+        # . . . .
+        # . . . .
+        # . . . .
+        # . . . .
+        `)
+})
+```
+
+Testing the code with our finger, we see a LED column turn on when pressing both strips.
+
+https://youtu.be/zi_-NAmdDpY
+
+## Upgrading the car
+
+In this lesson, we picked a random toy car and tapped foil to the bottom. 
+As the car goes through the gate, it will connect both sides of the gate and trigger it. Make sure to add enough foil to get a good connection on the ground.
+
+![](/static/mb/projects/timing-gates/carfoil.jpg "Attaching foil to the car")
+
+By moving the car (slowly) through the gate, you will see that it triggers the ``on pin pressed`` event.
+
+https://youtu.be/M3DIUvDPlIA
+
+### ~hint
+
+It does not work always! Sometimes the foil does not touch long enough both strip to be detected. This is due to the poor quality of our sensor.
+To fix this, you would have to consider using better sensors based on IR or Hall effect.
+
+### ~
+
+## Adding the second gate
+
+Repeat the same process with tape and foil to build the first gate.
+
+![](/static/mb/projects/timing-gates/sensor2.jpg "Double foil sensors")
+
+Connect the crocodile plugs to the ``GND`` and ``P1`` pins on the micro:bit.
+
+![](/static/mb/projects/timing-gates/sensormicrobit2.jpg "Sensor and microbit")
+
+## Detecting the second gate
+
+Since the second gate is connected to pin ``P1``, we add a second [on pin pressed](/reference/pins/on-pin-pressed) event
+that display 2 columns of LEDs.
+
+```blocks
+basic.showLeds(`
+        . . . . .
+        . . . . .
+        . . # . .
+        . . . . .
+        . . . . .
+        `)
+input.onPinPressed(TouchPin.P0, () => {
+    basic.showLeds(`
+        # . . . .
+        # . . . .
+        # . . . .
+        # . . . .
+        # . . . .
+        `)
+})
+input.onPinPressed(TouchPin.P1, () => {
+    basic.showLeds(`
+        # . . . #
+        # . . . #
+        # . . . #
+        # . . . #
+        # . . . #
+        `)
+})
+```
+Strolling the car over both gates, you can see how the first gate triggers then the second.
+
+https://youtu.be/N4bWQcu6yWs
+
+## Computing time
+
+The micro:bit has a clock that measures time precisely. It measures how many seconds the micro:bit has been on. 
+We will record the time where each gate is tripped in variables ``t0`` and ``t1``. 
+We take the different between ``t1`` and ``t0`` to compute the duration between the gates.
+
+```blocks
+let t0 = 0;
+let t1 = 0;
+basic.showLeds(`
+        . . . . .
+        . . . . .
+        . . # . .
+        . . . . .
+        . . . . .
+        `)
+input.onPinPressed(TouchPin.P0, () => {
+    t0 = control.eventTimestamp();
+    basic.showLeds(`
+        # . . . .
+        # . . . .
+        # . . . .
+        # . . . .
+        # . . . .
+        `)
+})
+input.onPinPressed(TouchPin.P1, () => {
+    t1 = control.eventTimestamp();
+    basic.showLeds(`
+        # . . . #
+        # . . . #
+        # . . . #
+        # . . . #
+        # . . . #
+        `)
+    let d = t1 - t0
+    basic.showNumber(d)
+})
+```
+
+https://youtu.be/piyym_ux1EM
+
+## Computing velocity
+
+Measure the distance between the gates and apply Newton's laws to compute the velocity of the car.
+
+    v = d / t
+
+We'll let you try to code this one on your own!

docs/raspberry-pi.md

@@ -0,0 +1,20 @@
+# Raspberry Pi and Raspbian
+
+It is possible to run the web editor or [command line interface](/cli) from Raspbian on Raspberry Pi 2 or 3 
+with [Raspbian Jessie with Pixel](https://www.raspberrypi.org/downloads/raspbian/).
+
+## Web editor
+
+Starting with **Raspbian Pixel**, Raspbian comes with Chromium. Simply open [](https://codethemicrobit.com).
+
+## Command line
+
+The PXT command line also works on Raspbian and allows to run a local server and/or edit programs from any text editor.
+
+* Node.JS 6.0 needs installed
+
+To install all the tools, 
+
+```
+curl -s https://raw.githubusercontent.com/Microsoft/pxt-rpi/master/install.sh | sh -
+```

docs/reference.md

@@ -10,6 +10,10 @@ input.onButtonPressed(Button.A, () => {
 music.playTone(0, 0);
 led.plot(0, 0);
 radio.sendNumber(0);
+```
+## Advanced
+
+```namespaces
 game.addScore(1);
 images.createImage(`
 . . . . .
@@ -24,7 +28,8 @@ control.inBackground(() => {
     
 });
 ```
-## Advanced
+
+## Bluetooth
   
 ```namespaces
 devices.tellCameraTo(MesCameraEvent.TakePhoto);

docs/share.md

@@ -0,0 +1,88 @@
+# Sharing your project
+
+Once you've made your project, you can save it the cloud, share it, or embed it on another website.
+
+* Click **More...**, then **Embed Project**:
+
+![Asks to embed](/static/embed/publish.png)
+
+* Click **Publish project**. This will make the project publicly available
+* You will then see this information:
+
+![Embedding information](/static/embed/embed-info.png)
+
+## Sharing the URL
+
+You can share the URL for the project ([https://codethemicrobit.com/httuftrbtg](https://codethemicrobit.com/httuftrbtg) above) with other people, and they will be able to visit that page to see your project, download it, or edit it:
+
+![Project page](/static/embed/project-page.png)
+
+## Embedding into a blog or web site
+
+Rather than just sharing the link, you can also embed the project so that your visitors can use the simulator, edit blocks or code, or download the project without having to leave your site.
+
+### General instructions
+
+Select the kind of embedding you would like.
+
+* **Screenshot** - a lightweight screenshot of the blocks that links to the snippet
+* **Editor** - embedded editor with minimal UI
+* **Simulator** - embedded simulator only
+* **Command line** - specific instructions to unpack the project using the [command line](/cli) tools
+
+Copy the HTML for embedding the page from the publish dialog. It will look like the following:
+
+Open the HTML editor for your blog or website and paste it with your content
+
+### Wordpress
+
+[wordpress.com][] blogs do not support embedding content from most websites, so you will need to link to your project instead. Alternatively, if you have a Wordpress VIP account you can follow [these instructions][wordpress-vip] to embed an `iframe` into your blog. The URL that you need to add is like `https://codethemicrobit.com/?sandbox=1#pub:httuftrbtg`, but replace `httuftrbtg` with your project's unique identifier.
+
+If you self host a Wordpress blog you can install the [iframe-plugin][] and then write the following in your blog-post (again, replacing the `httuftrbtg` with your project's identifier):
+
+```
+[iframe src="https://codethemicrobit.com/?sandbox=1#pub:httuftrbtg"]
+```
+
+### Blogger
+
+* Create a new post
+* Click the 'HTML' button next to 'Compose' and paste in the HTML
+
+![Blogger](/static/embed/blogger.png)
+
+### Squarespace
+
+[Squarespace][] allows you to embed HTML code inside a blog post or page. In the editor, click to add a new block:
+
+![Squarespace block insertion](/static/embed/squarespace-insert.png)
+
+Scroll to **More** and select **Code**. Paste the embed HTML and click **Apply**:
+
+![Squarespace code insertion](/static/embed/squarespace-code.png)
+
+### Google Sites
+
+Google Sites doesn't currently [support iframes in custom HTML][google-sites-iframes], so you'll have to insert a link to your project's URL instead.
+
+### Office Sway
+
+[Microsoft Office Sway][sway] only allows iframes from [certain websites][sway-restricted], so you'll need to insert a link to your project instead.
+### Embedding in Markdown documents
+
+[Markdown][] is a popular text format supported by many blog editors. As Markdown supports embedded HTML, you should be able to paste the HTML into the document, although some sites may prevent you from doing this.
+
+### ~hint
+
+**Developers:** This page supports OEmbed as well 
+
+### ~
+
+[wordpress.com]: https://wordpress.com
+[wordpress-vip]: https://vip.wordpress.com/documentation/embedding-rich-media-from-around-the-web-with-protected-embeds/#scripts-iframes-and-objects
+[iframe-plugin]: https://wordpress.org/plugins/iframe/
+[squarespace]: https://squarespace.com
+[google-sites-iframes]: https://support.google.com/sites/answer/2500646?hl=en
+[sway]: https://sway.com/my
+[sway-restricted]: https://support.office.com/en-us/article/Embed-content-in-your-Sway-1e1ab12a-f961-4a26-8afc-77a15f892b1d
+[Markdown]: https://daringfireball.net/projects/markdown/

docs/static/Calliopeminieditor.svg

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="179.9" height="32.4" viewBox="0 0 179.9 32.4">
+  <path fill="#495260" d="M33.1 11.2h-8.5V5.8c0-2.3 1.9-4.2 4.2-4.2 2.3 0 4.2 1.9 4.2 4.2v5.4z"/>
+  <path fill="#7F96A1" d="M25.8 3.6H32v7.6h-6.2z"/>
+  <path fill="#845B32" d="M12.2 7.2V18h12.5V7.2c0-3.4-2.8-6.2-6.2-6.2s-6.3 2.8-6.3 6.2z"/>
+  <path fill="#26A7AA" d="M28.9 31.4H8.7c-6.3 0-9-8-4-11.8L16 11.2h17.1v16c0 2.3-1.9 4.2-4.2 4.2z"/>
+  <path fill="#43C9C9" d="M15.2 17.7l-8.8.7 10.7-8"/>
+  <path fill="#F6F4E7" d="M14.8 15.1l2.3-4.7 1.5 4.7m0 0l1.4-4.7 2.3 4.7"/>
+  <path fill="#BDD1CF" d="M21.9 17.7h-6.7l-.4-2.6h7.5"/>
+  <path fill="#F6F4E7" d="M26.8 31.4c-.6-4.6-1.9-10.2-4.8-13.7h-6.8c-3 3.5-4.2 9.1-4.8 13.7h16.4z"/>
+  <path fill="#FFCD9A" d="M18.6 10.5c-1.4 0-2.6-1.2-2.6-2.6V5h5.1v2.9c0 1.5-1.1 2.6-2.5 2.6z"/>
+  <path fill="#BDD1CF" d="M15.4 31.4V17.7c2.2 5.1 4.9 11.3 8.2 13.7h-8.2z"/>
+  <path fill="#FFCD9A" d="M17.1 10.4l1.5 4.7 1.4-4.7"/>
+  <path fill="#43C9C9" d="M25.8 11.2h7.3v9.4"/>
+  <path fill="#BCD1CF" d="M52.3 15.1h-1.6l-.2-1.4c-.2-.2-.5-.4-.8-.5s-.7-.2-1.2-.2c-.9 0-1.7.3-2.2 1s-.8 1.6-.8 2.7v.4c0 1.1.3 2 .8 2.7.5.7 1.2 1 2.1 1 .4 0 .8-.1 1.2-.2.4-.1.6-.3.8-.5l.2-1.4h1.6v2.1c-.4.5-1 .9-1.7 1.2-.7.3-1.4.5-2.3.5-1.5 0-2.6-.5-3.6-1.5s-1.4-2.3-1.4-3.9v-.4c0-1.6.5-2.9 1.4-3.9s2.1-1.5 3.6-1.5c.8 0 1.6.2 2.3.5.7.3 1.2.7 1.7 1.2v2.1zm1.5 5.9l.8-.1 3.3-9.4h2.2l3.3 9.4.8.1v1.3h-3.7V21l.8-.1-.5-1.5h-3.5l-.5 1.5.8.1v1.3h-3.7V21zm3.9-3.2h2.5L59 14l-1.3 3.8zm7.8 4.5V21l1.2-.2V13l-1.2-.2v-1.3H70v1.3l-1.2.2v7.6h3.1l.1-1.4h1.7v3h-8.2zm9.5 0V21l1.2-.2V13l-1.2-.2v-1.3h4.6v1.3l-1.3.2v7.6h3.1l.1-1.4h1.7v3H75zm9.5-9.5v-1.3H89v1.3l-1.1.2v7.8l1.1.2v1.3h-4.5V21l1.2-.2V13l-1.2-.2zm15.9 4.2c0 1.6-.5 2.9-1.4 3.9-.9 1-2.1 1.6-3.6 1.6s-2.6-.5-3.5-1.6-1.4-2.3-1.4-3.9v-.2c0-1.6.4-2.9 1.3-3.9s2.1-1.6 3.5-1.6c1.5 0 2.7.5 3.6 1.6s1.4 2.4 1.4 3.9v.2zm-2.2-.2c0-1.1-.2-2-.7-2.7s-1.2-1-2.1-1-1.6.3-2 1-.7 1.6-.7 2.7v.2c0 1.1.2 2.1.7 2.8.5.7 1.1 1 2 1 .9 0 1.6-.3 2.1-1s.7-1.6.7-2.8v-.2zm8.8-5.3c1.2 0 2.2.3 2.9 1S111 14 111 15s-.4 1.9-1.1 2.5c-.7.6-1.7.9-2.9.9h-1.8v2.4l1.2.2v1.3h-4.5V21l1.2-.2V13l-1.2-.2v-1.3h5.1zm-1.8 5.2h1.8c.6 0 1.1-.2 1.4-.5s.5-.8.5-1.3-.2-1-.5-1.3c-.3-.3-.8-.5-1.4-.5h-1.8v3.6zm14.1.9h-3.7v3.1h3.5l.1-1.3h1.7v3h-8.6V21l1.2-.2V13l-1.2-.2v-1.3h8.6v3h-1.7l-.1-1.3h-3.5v2.7h3.7v1.7z"/>
+  <path fill="#FFF" d="M134.3 11.6l.1 1.1c.2-.4.5-.7.9-1 .4-.2.8-.4 1.3-.4s.8.1 1.1.3c.3.2.5.5.7.8.2-.3.5-.6.8-.8.3-.2.7-.3 1.2-.3.4 0 .7.1 1 .2.3.1.5.3.8.6.2.3.4.6.5 1 .1.4.2.9.2 1.4v7.8h-2.2v-7.9c0-.4-.1-.7-.3-.9-.2-.2-.4-.2-.7-.2-.3 0-.5.1-.6.2s-.3.3-.3.5v8.3h-2.2v-7.9c0-.4-.1-.7-.3-.9-.2-.2-.4-.3-.7-.3-.3 0-.5.1-.7.2-.2.1-.3.3-.4.5v8.3h-2.2V11.6h2zm11.3 0h5.7v8.8h3.2v2h-8.9v-2h3.3v-6.8h-3.3v-2zm3.1-2.8c0-.4.1-.7.4-.9.2-.2.6-.4 1-.4s.8.1 1 .4c.2.2.4.5.4.9s-.1.7-.4.9c-.2.2-.6.4-1 .4s-.8-.1-1-.4c-.2-.2-.4-.5-.4-.9zm10.7 2.8l.1 1.5c.4-.5.9-1 1.4-1.2.6-.3 1.2-.4 1.8-.4.5 0 1 .1 1.5.2.5.2.8.4 1.2.7.3.3.6.8.8 1.3.2.5.3 1.2.3 1.9v6.7h-2.4v-6.7c0-.4-.1-.8-.2-1.1-.1-.3-.2-.5-.4-.7-.2-.2-.4-.3-.7-.4-.3-.1-.6-.1-.9-.1-.5 0-1 .1-1.4.3-.4.2-.7.5-.9.9v7.7h-2.4V11.6h2.2zm10.6 0h5.7v8.8h3.2v2H170v-2h3.3v-6.8H170v-2zm3.1-2.8c0-.4.1-.7.4-.9.2-.2.6-.4 1-.4s.8.1 1 .4c.2.2.4.5.4.9s-.1.7-.4.9c-.2.2-.6.4-1 .4s-.8-.1-1-.4c-.3-.2-.4-.5-.4-.9z"/>
+</svg>

docs/static/Logo_Calliope_Woman.svg

@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Ebene_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 175.49999 172.4"
+   enable-background="new 0 0 841.9 595.3"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="Logo_Calliope_Woman.svg"
+   width="175.5"
+   height="172.39999"><metadata
+     id="metadata5011"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs5009" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
+     id="namedview5007"
+     showgrid="false"
+     inkscape:zoom="0.34208337"
+     inkscape:cx="420.95001"
+     inkscape:cy="297.64999"
+     inkscape:window-x="-8"
+     inkscape:window-y="156"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Ebene_1" /><g
+     id="g4955"
+     transform="translate(-260.90025,-204.1)"><g
+       id="g4957"><defs
+         id="defs4959"><rect
+           id="SVGID_7_"
+           x="193.10001"
+           y="204.10001"
+           width="318.29999"
+           height="256.29999" /></defs><clipPath
+         id="SVGID_1_"><use
+           xlink:href="#SVGID_7_"
+           overflow="visible"
+           id="use4963"
+           style="overflow:visible"
+           x="0"
+           y="0"
+           width="100%"
+           height="100%" /></clipPath></g><g
+       id="g4965"><defs
+         id="defs4967"><rect
+           id="SVGID_9_"
+           x="193.10001"
+           y="204.10001"
+           width="318.29999"
+           height="256.29999" /></defs><clipPath
+         id="SVGID_2_"><use
+           xlink:href="#SVGID_9_"
+           overflow="visible"
+           id="use4971"
+           style="overflow:visible"
+           x="0"
+           y="0"
+           width="100%"
+           height="100%" /></clipPath></g><g
+       id="g4973"><defs
+         id="defs4975"><rect
+           id="SVGID_11_"
+           x="193.10001"
+           y="204.10001"
+           width="318.29999"
+           height="256.29999" /></defs><clipPath
+         id="SVGID_3_"><use
+           xlink:href="#SVGID_11_"
+           overflow="visible"
+           id="use4979"
+           style="overflow:visible"
+           x="0"
+           y="0"
+           width="100%"
+           height="100%" /></clipPath><path
+         clip-path="url(#SVGID_3_)"
+         d="m 436.4,262 -47.9,0 0,-46 c 0,-4.7 3.8,-8.4 8.4,-8.4 l 31,0 c 4.7,0 8.4,3.8 8.4,8.4 l 0,46 z"
+         id="path4981"
+         inkscape:connector-curvature="0"
+         style="fill:#4a5261" /></g><rect
+       x="394.79999"
+       y="218.7"
+       width="35.099998"
+       height="43.200001"
+       id="rect4983"
+       style="fill:#8096a1" /><path
+       d="m 317.6,239.5 0,61 71,0.2 c 0,0 0,-57.3 0,-61 0,-19.5 -16.1,-35.6 -35.6,-35.6 -19.6,0 -35.4,15.8 -35.4,35.4"
+       id="path4985"
+       inkscape:connector-curvature="0"
+       style="fill:#855c33" /><path
+       d="m 412.4,376.5 -114.2,0 c -35.6,0 -50.9,-45.2 -22.6,-66.8 l 63.8,-47.8 96.9,0 0,90.7 c 0.1,13.2 -10.6,23.9 -23.9,23.9"
+       id="path4987"
+       inkscape:connector-curvature="0"
+       style="fill:#26a6ab" /><polygon
+       points="345.7,257.3 334.8,298.8 285.1,302.5 "
+       id="polygon4989"
+       style="fill:#42c9c9" /><polygon
+       points="354,283.8 332.5,283.8 345.7,257.3 "
+       id="polygon4991"
+       style="fill:#f7f5e8" /><polygon
+       points="375.4,283.8 354,283.8 362.2,257.3 "
+       id="polygon4993"
+       style="fill:#f7f5e8" /><polygon
+       points="373.1,298.8 334.8,298.8 332.5,283.8 375.4,283.8 "
+       id="polygon4995"
+       style="fill:#bdd1cf" /><path
+       d="m 400.6,376.5 c -3.5,-26.2 -10.6,-58 -27.3,-77.7 l -0.2,0 -19,0 -19,0 -0.2,0 c -16.7,19.8 -23.8,51.5 -27.3,77.7 l 93,0 z"
+       id="path4997"
+       inkscape:connector-curvature="0"
+       style="fill:#f7f5e8" /><path
+       d="m 357,258 -6.1,0 c -6.4,0 -11.5,-5.2 -11.5,-11.5 l 0,-19.7 29.2,0 0,19.7 c -0.1,6.3 -5.3,11.5 -11.6,11.5"
+       id="path4999"
+       inkscape:connector-curvature="0"
+       style="fill:#ffcc99" /><path
+       d="m 335.8,376.5 0,-77.7 c 12.4,29.1 27.7,64.3 46.5,77.7 l -46.5,0 z"
+       id="path5001"
+       inkscape:connector-curvature="0"
+       style="fill:#bdd1cf" /><polygon
+       points="362.2,257.3 345.7,257.3 354,283.8 "
+       id="polygon5003"
+       style="fill:#ffcc99" /><polygon
+       points="436.4,315.3 394.8,262 436.4,262 "
+       id="polygon5005"
+       style="fill:#42c9c9" /></g></svg>