0.2.172

# Conflicts:
#	package.json

.gitignore

@@ -6,9 +6,11 @@ typings
 tmp
 temp
 projects/**
-win10/app/bin
-win10/app/bld
-win10/*.opendb
+clients/win10/app/bin
+clients/win10/app/bld
+clients/win10/*.opendb
+clients/**/bin/**
+clients/**/obj/**
 
 *.user
 *.sw?

README.md

@@ -13,6 +13,7 @@ PXT ([Microsoft Programming Experience Toolkit](https://github.com/Microsoft/pxt
 
 The following commands are a 1-time setup after synching the repo on your machine.
 
+* clone this repo to your computer
 * install the PXT command line
 ```
 npm install -g pxt

clients/win10/app/package.appxmanifest

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="39122940-ab16-4cd4-a0ce-79a3eb863ecf" Version="0.1.4.0" Publisher="CN=jhalleux" />
+  <Identity Name="39122940-ab16-4cd4-a0ce-79a3eb863ecf" Version="0.1.5.0" Publisher="CN=jhalleux" />
   <mp:PhoneIdentity PhoneProductId="39122940-ab16-4cd4-a0ce-79a3eb863ecf" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
-    <DisplayName>codemicrobitapp</DisplayName>
+    <DisplayName>codethemicrobit</DisplayName>
     <PublisherDisplayName>Microsoft</PublisherDisplayName>
     <Logo>images\storelogo.png</Logo>
   </Properties>
@@ -17,9 +17,11 @@
     <Application Id="App" StartPage="https://m.pxt.io/">
       <uap:ApplicationContentUriRules>
         <uap:Rule Match="https://m.pxt.io/" Type="include" WindowsRuntimeAccess="all" />
+        <uap:Rule Match="https://codemicrobit.com/" Type="include" WindowsRuntimeAccess="all" />
+        <uap:Rule Match="https://codethemicrobit.com/" Type="include" WindowsRuntimeAccess="all" />
       </uap:ApplicationContentUriRules>
-      <uap:VisualElements DisplayName="m.pxt.io" Description="Code editors for the BBC micro:bit" BackgroundColor="white" Square150x150Logo="images\Square150x150Logo.png" Square44x44Logo="images\Square44x44Logo.png">
-        <uap:DefaultTile Wide310x150Logo="images\Wide310x150Logo.png" ShortName="m.pxt.io">
+      <uap:VisualElements DisplayName="codethemicrobit" Description="Code editors for the BBC micro:bit" BackgroundColor="white" Square150x150Logo="images\Square150x150Logo.png" Square44x44Logo="images\Square44x44Logo.png">
+        <uap:DefaultTile Wide310x150Logo="images\Wide310x150Logo.png" ShortName="code the micro:bit">
         </uap:DefaultTile>
         <uap:SplashScreen Image="images\splashscreen.png" />
       </uap:VisualElements>
@@ -27,7 +29,6 @@
         <uap:Extension Category="windows.fileTypeAssociation">
           <uap:FileTypeAssociation Name="microbithex">
             <uap:DisplayName>BBC micro:bit binary file</uap:DisplayName>
-            <uap:InfoTip>.hex file created with m.pxt.io or microbit.co.uk</uap:InfoTip>
             <uap:SupportedFileTypes>
               <uap:FileType ContentType="application/x-microbit-hex">.hex</uap:FileType>
             </uap:SupportedFileTypes>

clients/winuploader/CodeTheMicroBit.Loader.sln

@@ -0,0 +1,22 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25123.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeTheMicrobit.Uploader", "Microbit.Uploader\CodeTheMicrobit.Uploader.csproj", "{7DC6CA45-FD75-44BC-805E-708C812CD4BF}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

clients/winuploader/Microbit.Uploader/App.config

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <startup>
+    <supportedRuntime version="v4.0"/>
+    <supportedRuntime version="v2.0.50727"/>
+  </startup>
+</configuration>

clients/winuploader/Microbit.Uploader/CodeTheMicrobit.Uploader.csproj

@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{7DC6CA45-FD75-44BC-805E-708C812CD4BF}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Microsoft.MicroBit</RootNamespace>
+    <AssemblyName>Microbit.Uploader</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>
+    </ApplicationIcon>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>false</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <DelaySign>false</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup />
+  <ItemGroup>
+    <Reference Include="Microsoft.VisualBasic" />
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Deployment" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Management" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Settings.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Settings.Designer.cs">
+      <DependentUpon>Settings.cs</DependentUpon>
+    </Compile>
+    <Compile Include="GlobalSuppressions.cs" />
+    <Compile Include="KnownFolders.cs" />
+    <Compile Include="LicenseDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="LicenseDialog.Designer.cs">
+      <DependentUpon>LicenseDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="MainForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="MainForm.Designer.cs">
+      <DependentUpon>MainForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SingleInstanceAppHelper.cs" />
+    <Compile Include="SingleInstanceAppStarter.cs" />
+    <EmbeddedResource Include="LicenseDialog.resx">
+      <DependentUpon>LicenseDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MainForm.resx">
+      <DependentUpon>MainForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <EmbeddedResource Include="Settings.resx">
+      <DependentUpon>Settings.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="MSFT_logo_png.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+    <None Include="Resources\MSR-LA - 2576.rtf" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="favicon.ico" />
+    <EmbeddedResource Include="microbit.red.png" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

clients/winuploader/Microbit.Uploader/KnownFolders.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Management;
+using System.Runtime.InteropServices;
+using System.Security;
+
+namespace Microsoft.MicroBit
+{
+    /// <summary>
+    /// Class containing methods to retrieve specific file system paths.
+    /// </summary>
+    internal static class KnownFoldersNativeMethods
+    {
+        [SecurityCritical]
+        [SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate")]
+        public static string GetDownloadPath()
+        {
+            IntPtr outPath;
+            int result = SHGetKnownFolderPath(new Guid("{374DE290-123F-4565-9164-39C4925E467B}"), 0x00004000, new IntPtr(0), out outPath);
+            if (result >= 0)
+                return Marshal.PtrToStringUni(outPath);
+            else return null;
+        }
+
+        [SuppressMessage("Microsoft.Security", "CA5122:PInvokesShouldNotBeSafeCriticalFxCopRule")]
+        [DllImport("Shell32.dll")]
+        [SecurityCritical]
+        private static extern int SHGetKnownFolderPath(
+            [MarshalAs(UnmanagedType.LPStruct)]Guid rfid, uint dwFlags, IntPtr hToken,
+            out IntPtr ppszPath);
+    }
+
+}

clients/winuploader/Microbit.Uploader/LicenseDialog.Designer.cs

@@ -0,0 +1,93 @@
+namespace Microsoft.MicroBit
+{
+    partial class LicenseDialog
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.textBox = new System.Windows.Forms.RichTextBox();
+            this.acceptButton = new System.Windows.Forms.Button();
+            this.exitButton = new System.Windows.Forms.Button();
+            this.SuspendLayout();
+            // 
+            // textBox
+            // 
+            this.textBox.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.textBox.Location = new System.Drawing.Point(13, 13);
+            this.textBox.Name = "textBox";
+            this.textBox.ReadOnly = true;
+            this.textBox.Size = new System.Drawing.Size(465, 438);
+            this.textBox.TabIndex = 0;
+            this.textBox.Text = "";
+            // 
+            // acceptButton
+            // 
+            this.acceptButton.Location = new System.Drawing.Point(322, 457);
+            this.acceptButton.Name = "acceptButton";
+            this.acceptButton.Size = new System.Drawing.Size(75, 23);
+            this.acceptButton.TabIndex = 1;
+            this.acceptButton.Text = "Accept";
+            this.acceptButton.UseVisualStyleBackColor = true;
+            this.acceptButton.Click += new System.EventHandler(this.acceptButton_Click);
+            // 
+            // exitButton
+            // 
+            this.exitButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.exitButton.Location = new System.Drawing.Point(403, 457);
+            this.exitButton.Name = "exitButton";
+            this.exitButton.Size = new System.Drawing.Size(75, 23);
+            this.exitButton.TabIndex = 2;
+            this.exitButton.Text = "Exit";
+            this.exitButton.UseVisualStyleBackColor = true;
+            this.exitButton.Click += new System.EventHandler(this.exitButton_Click);
+            // 
+            // LicenseDialog
+            // 
+            this.AcceptButton = this.acceptButton;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.exitButton;
+            this.ClientSize = new System.Drawing.Size(490, 492);
+            this.ControlBox = false;
+            this.Controls.Add(this.exitButton);
+            this.Controls.Add(this.acceptButton);
+            this.Controls.Add(this.textBox);
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "LicenseDialog";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "code the micro:bit uploader Terms Of Use";
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.RichTextBox textBox;
+        private System.Windows.Forms.Button acceptButton;
+        private System.Windows.Forms.Button exitButton;
+    }
+}

clients/winuploader/Microbit.Uploader/LicenseDialog.cs

@@ -0,0 +1,32 @@
+using Microsoft.MicroBit.Properties;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace Microsoft.MicroBit
+{
+    public partial class LicenseDialog : Form
+    {
+        public LicenseDialog()
+        {
+            InitializeComponent();
+            this.textBox.Rtf = Resources.MSR_LA___2576;
+        }
+
+        private void acceptButton_Click(object sender, EventArgs e)
+        {
+            this.DialogResult = DialogResult.Yes;
+            this.Close();
+        }
+
+        private void exitButton_Click(object sender, EventArgs e)
+        {
+            this.DialogResult = DialogResult.No;
+            this.Close();
+        }
+    }
+}

clients/winuploader/Microbit.Uploader/LicenseDialog.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

clients/winuploader/Microbit.Uploader/MainForm.Designer.cs

@@ -0,0 +1,172 @@
+namespace Microsoft.MicroBit
+{
+    partial class MainForm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
+            this.statusLabel = new System.Windows.Forms.Label();
+            this.backgroundPictureBox = new System.Windows.Forms.PictureBox();
+            this.trayIcon = new System.Windows.Forms.NotifyIcon(this.components);
+            this.versionLabel = new System.Windows.Forms.LinkLabel();
+            this.label1 = new System.Windows.Forms.Label();
+            this.SettingsLabel = new System.Windows.Forms.LinkLabel();
+            this.pictureBox1 = new System.Windows.Forms.PictureBox();
+            this.linkLabel1 = new System.Windows.Forms.LinkLabel();
+            ((System.ComponentModel.ISupportInitialize)(this.backgroundPictureBox)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // statusLabel
+            // 
+            this.statusLabel.BackColor = System.Drawing.SystemColors.Window;
+            this.statusLabel.Font = new System.Drawing.Font("Consolas", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.statusLabel.Location = new System.Drawing.Point(11, 30);
+            this.statusLabel.Name = "statusLabel";
+            this.statusLabel.Size = new System.Drawing.Size(364, 23);
+            this.statusLabel.TabIndex = 1;
+            this.statusLabel.Text = "loading...";
+            // 
+            // backgroundPictureBox
+            // 
+            this.backgroundPictureBox.BackColor = System.Drawing.Color.White;
+            this.backgroundPictureBox.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.backgroundPictureBox.Image = global::Microsoft.MicroBit.Properties.Resources.MSFT_logo_png;
+            this.backgroundPictureBox.InitialImage = null;
+            this.backgroundPictureBox.Location = new System.Drawing.Point(226, 91);
+            this.backgroundPictureBox.Name = "backgroundPictureBox";
+            this.backgroundPictureBox.Size = new System.Drawing.Size(149, 52);
+            this.backgroundPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+            this.backgroundPictureBox.TabIndex = 0;
+            this.backgroundPictureBox.TabStop = false;
+            this.backgroundPictureBox.Click += new System.EventHandler(this.backgroundPictureBox_Click);
+            // 
+            // trayIcon
+            // 
+            this.trayIcon.Icon = ((System.Drawing.Icon)(resources.GetObject("trayIcon.Icon")));
+            this.trayIcon.Visible = true;
+            this.trayIcon.Click += new System.EventHandler(this.trayIcon_Click);
+            // 
+            // versionLabel
+            // 
+            this.versionLabel.AutoSize = true;
+            this.versionLabel.Location = new System.Drawing.Point(12, 121);
+            this.versionLabel.Name = "versionLabel";
+            this.versionLabel.Size = new System.Drawing.Size(28, 13);
+            this.versionLabel.TabIndex = 2;
+            this.versionLabel.TabStop = true;
+            this.versionLabel.Text = "v0.9";
+            this.versionLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.versionLabel_LinkClicked);
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.label1.Location = new System.Drawing.Point(12, 103);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(169, 15);
+            this.label1.TabIndex = 3;
+            this.label1.Text = "Automatic upload of .hex files.";
+            // 
+            // SettingsLabel
+            // 
+            this.SettingsLabel.AutoSize = true;
+            this.SettingsLabel.Location = new System.Drawing.Point(151, 121);
+            this.SettingsLabel.Name = "SettingsLabel";
+            this.SettingsLabel.Size = new System.Drawing.Size(43, 13);
+            this.SettingsLabel.TabIndex = 4;
+            this.SettingsLabel.TabStop = true;
+            this.SettingsLabel.Text = "settings";
+            this.SettingsLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.SettingsLabel_LinkClicked);
+            // 
+            // pictureBox1
+            // 
+            this.pictureBox1.BackColor = System.Drawing.Color.White;
+            this.pictureBox1.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.pictureBox1.Image = global::Microsoft.MicroBit.Properties.Resources.microbit_red;
+            this.pictureBox1.InitialImage = null;
+            this.pictureBox1.Location = new System.Drawing.Point(226, 6);
+            this.pictureBox1.Name = "pictureBox1";
+            this.pictureBox1.Size = new System.Drawing.Size(149, 79);
+            this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+            this.pictureBox1.TabIndex = 5;
+            this.pictureBox1.TabStop = false;
+            // 
+            // linkLabel1
+            // 
+            this.linkLabel1.AutoSize = true;
+            this.linkLabel1.Location = new System.Drawing.Point(62, 121);
+            this.linkLabel1.Name = "linkLabel1";
+            this.linkLabel1.Size = new System.Drawing.Size(60, 13);
+            this.linkLabel1.TabIndex = 6;
+            this.linkLabel1.TabStop = true;
+            this.linkLabel1.Text = "open editor";
+            this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
+            // 
+            // MainForm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.White;
+            this.ClientSize = new System.Drawing.Size(388, 143);
+            this.Controls.Add(this.linkLabel1);
+            this.Controls.Add(this.pictureBox1);
+            this.Controls.Add(this.SettingsLabel);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.versionLabel);
+            this.Controls.Add(this.statusLabel);
+            this.Controls.Add(this.backgroundPictureBox);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.MaximizeBox = false;
+            this.Name = "MainForm";
+            this.ShowInTaskbar = false;
+            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "code the micro:bit uploader";
+            this.Load += new System.EventHandler(this.MainForm_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.backgroundPictureBox)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.PictureBox backgroundPictureBox;
+        private System.Windows.Forms.Label statusLabel;
+        private System.Windows.Forms.NotifyIcon trayIcon;
+        private System.Windows.Forms.LinkLabel versionLabel;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.LinkLabel SettingsLabel;
+        private System.Windows.Forms.PictureBox pictureBox1;
+        private System.Windows.Forms.LinkLabel linkLabel1;
+    }
+}
+

clients/winuploader/Microbit.Uploader/MainForm.cs

@@ -0,0 +1,266 @@
+using Microsoft.Win32;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Drawing;
+using System.IO;
+using System.Security;
+using System.Threading;
+using System.Windows.Forms;
+
+namespace Microsoft.MicroBit
+{
+    internal partial class MainForm : Form
+    {
+        FileSystemWatcher watcher;
+        private string customcopypath = "";
+
+        public MainForm()
+        {
+            InitializeComponent();
+            var v = typeof(MainForm).Assembly.GetName().Version;
+            this.versionLabel.Text = "v" + v.Major + "." + v.Minor;
+        }
+
+        private void MainForm_Load(object sender, EventArgs e)
+        {
+            this.initializeFileWatch();
+            customcopypath = (string)Application.UserAppDataRegistry.GetValue("CustomDirectory", "");
+            this.openEditor();
+        }
+
+        private void openEditor()
+        {
+            // lanch editor
+            try { Process.Start("https://codethemicrobit.com"); } catch (Exception) { }
+        }
+
+        private void initializeFileWatch()
+        {
+            if (!checkTOU()) return;
+
+            var downloads = KnownFoldersNativeMethods.GetDownloadPath();
+            if (downloads == null)
+            {
+                this.updateStatus("oops, can't find the `Downloads` folder");
+                return;
+            }
+
+            this.watcher = new FileSystemWatcher(downloads);
+            this.watcher.Renamed += (sender, e) => this.handleFileEvent(e);
+            this.watcher.Created += (sender, e) => this.handleFileEvent(e);
+            this.watcher.EnableRaisingEvents = true;
+
+            this.waitingForHexFileStatus();
+        }
+
+        private void waitingForHexFileStatus()
+        {
+            this.updateStatus("waiting for .hex file...");
+            this.trayIcon.ShowBalloonTip(3000, "ready...", "waiting for .hex file...", ToolTipIcon.None);
+        }
+
+        static bool checkTOU()
+        {
+            var v = (int)Application.UserAppDataRegistry.GetValue("TermOfUse", 0);
+            if (v != 1)
+            {
+                using (var f = new LicenseDialog())
+                {
+                    var r = f.ShowDialog();
+                    if (r != DialogResult.Yes)
+                    {
+                        Application.Exit();
+                        return false;
+                    }
+                }
+                Application.UserAppDataRegistry.SetValue("TermOfUse", 1, RegistryValueKind.DWord);
+            }
+
+            return true;
+        }
+
+        delegate void Callback();
+
+        private void updateStatus(string value)
+        {
+            Callback a = (Callback)(() =>
+            {
+                this.statusLabel.Text = value;
+                this.trayIcon.Text = value;
+            });
+            this.Invoke(a);
+        }
+
+        void handleFileEvent(FileSystemEventArgs e)
+        {
+            this.handleFile(e.FullPath);
+        }
+
+        volatile int copying;
+        void handleFile(string fullPath)
+        {
+            try
+            {
+                // In case this is data-url download, at least Chrome will not rename file, but instead write to it
+                // directly. This mean we may catch it in the act. Let's leave it some time to finish writing.
+                Thread.Sleep(500);
+
+                var info = new System.IO.FileInfo(fullPath);
+                Trace.WriteLine("download: " + info.FullName);
+
+                if (info.Extension != ".hex") return;
+
+                var infoName = info.Name;
+                Trace.WriteLine("download name: " + info.Name);
+                if (!infoName.StartsWith("microbit-", StringComparison.OrdinalIgnoreCase)) return;
+                if (info.Name.EndsWith(".uploaded.hex", StringComparison.OrdinalIgnoreCase)) return;
+                if (info.Length > 1000000) return; // make sure we don't try to copy large files
+
+
+                // already copying?
+                if (Interlocked.Exchange(ref this.copying, 1) == 1)
+                    return;
+
+                try
+                {
+
+                    var driveletters = getMicrobitDrives();
+                    List<String> drives = new List<String>();
+                    foreach (var d in driveletters)
+                    {
+                        drives.Add(d.RootDirectory.FullName);
+                    }
+                    if (!String.IsNullOrEmpty(customcopypath) && Directory.Exists(customcopypath))
+                    {
+                        drives.Add(customcopypath);
+                    }
+                    if (drives.Count == 0)
+                    {
+                        this.updateStatus("no board found");
+                        this.trayIcon.ShowBalloonTip(3000, "cancelled uploading...", "no board found", ToolTipIcon.None);
+                        return;
+                    }
+
+                    this.updateStatus("uploading .hex file");
+                    this.trayIcon.ShowBalloonTip(3000, "uploading...", "uploading .hex file", ToolTipIcon.None);
+
+                    // copy to all boards
+                    copyFirmware(info.FullName, drives);
+
+                    // move away hex file
+                    var temp = System.IO.Path.ChangeExtension(info.FullName, ".uploaded.hex");
+                    try
+                    {
+                        File.Copy(info.FullName, temp, true);
+                        File.Delete(info.FullName);
+                    }
+                    catch (IOException) { }
+                    catch (NotSupportedException) { }
+                    catch (UnauthorizedAccessException) { }
+                    catch (ArgumentException) { }
+
+                    // update ui
+                    this.updateStatus("uploading done");
+                    this.waitingForHexFileStatus();
+                }
+                finally
+                {
+                    Interlocked.Exchange(ref this.copying, 0);
+                }
+            }
+            catch (IOException) { }
+            catch (NotSupportedException) { }
+            catch (UnauthorizedAccessException) { }
+            catch (ArgumentException) { }
+        }
+
+        static void copyFirmware(string file, List<string> drives)
+        {
+            var waitHandles = new List<WaitHandle>();
+            foreach (var drive in drives)
+            {
+                var ev = new AutoResetEvent(false);
+                waitHandles.Add(ev);
+                ThreadPool.QueueUserWorkItem((state) =>
+                {
+                    try
+                    {
+                        var trg = System.IO.Path.Combine(drive, "firmware.hex");
+                        File.Copy(file, trg, true);
+                    }
+                    catch (IOException) { }
+                    catch (NotSupportedException) { }
+                    catch (UnauthorizedAccessException) { }
+                    catch (ArgumentException) { }
+                    ev.Set();
+                }, ev);
+            }
+
+            //waits for all the threads (waitHandles) to call the .Set() method
+            //and inform that the execution has finished.
+            WaitHandle.WaitAll(waitHandles.ToArray());
+        }
+
+        static DriveInfo[] getMicrobitDrives()
+        {
+            var drives = System.IO.DriveInfo.GetDrives();
+            var r = new System.Collections.Generic.List<DriveInfo>();
+            foreach (var di in drives)
+            {
+                var label = getVolumeLabel(di);
+                if (label.StartsWith("MICROBIT", StringComparison.Ordinal))
+                    r.Add(di);
+            }
+            return r.ToArray();
+        }
+
+        static string getVolumeLabel(DriveInfo di)
+        {
+            try { return di.VolumeLabel; }
+            catch (IOException) { }
+            catch (SecurityException) { }
+            catch (UnauthorizedAccessException) { }
+            return "";
+        }
+
+        private void trayIcon_Click(object sender, EventArgs e)
+        {
+            this.WindowState = FormWindowState.Minimized;
+            this.WindowState = FormWindowState.Normal;
+            this.Show();
+            this.Activate();
+        }
+
+        private void versionLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+        {
+            try
+            {
+                Process.Start("https://codethemicrobit.com/uploader");
+            }
+            catch (IOException) { }
+        }
+
+        private void backgroundPictureBox_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                Process.Start("https://codethemicrobit.com");
+            }
+            catch (IOException) { }
+        }
+
+        private void SettingsLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+        {
+            var settings = new Settings(customcopypath);
+            settings.ShowDialog();
+            customcopypath = settings.CustomCopyPath;
+            Application.UserAppDataRegistry.SetValue("CustomDirectory", customcopypath, RegistryValueKind.String);
+        }
+
+        private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+        {
+            this.openEditor();
+        }
+    }
+}

clients/winuploader/Microbit.Uploader/MainForm.resx

@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="trayIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="trayIcon.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEAEBAAAAAAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAAMIOAADCDgAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAN6bIZTOkxoUtj62FL5W1hTWpzYUvlbWFLY+thTKgwoUxnb+FLY6shS6TsoUzpMaFL5a1hS2P
+        rYUxnb6FNZ2+ZTCTsvkriaf/KYKe/yuIpf8uk7L/K4il/ymBnP8tjqz/K4qn/yiBnP8qhaL/KoWh/yqG
+        o/8ogJv/JXeQ/yqDnvkRMjz/Di02/wofJv8MJS3/Di02/wskLP8HGB3/Di43/w0qM/8HFxz/CyMr/w4s
+        Nv8MJi7/CiAm/w4sNv8RMTv/BQsN/wUQE/8BAgL/AQQF/wYRFP8EBgf/AgIA/xAYJv8TGy3/AgIA/wMF
+        Bv8HEhX/AQUG/wECAv8FEBT/BQsN/wYFD/8LByT/AQAC/wAAAP8CAgL/AwMD/woKEv8LCxT/DAwY/woK
+        Ev8DAwT/AgIC/wAAAP8AAAD/AAAA/wICAv8JCA//IBs//wwMEP8AAAD/AgIC/wQEBv8bGzf/BgYK/wQE
+        Bf8bGzj/BgYJ/wMDA/8AAAD/CgoK/xEREf8HBwf/Li4u/1FRUf9ERET/AQEA/wwMGf8UFCj/BAQE/wMD
+        Av8DAwL/BAQE/xAQIP8RESL/AAAA/z8/P/9SUlH/NTU1/y4uLv9QUFD/QUFB/wEBAP8LCxf/EhIk/wIC
+        Af8JCRH/CwsV/wICAf8PDx3/Dw8f/wAAAP89PT3/UVFQ/zQ0M/8FBQX/DAwM/wgICP8AAAD/CwsW/xIS
+        JP8FBQb/Dg4b/xERIv8FBQb/Dw8d/w8PHv8AAAD/CAgK/xwXO/8KCRT/BAMI/wAAAP8AAAD/AAAA/wIC
+        Av8EBAX/HR06/wgIEP8GBgv/HR07/wYGCf8DAwL/AAAA/wAAAP8JBh3/BwUS/y0fhf8FBBD/AAAA/wAA
+        AP8AAAD/AAAA/xIOMv8fFVz/HhVa/xQPOP8AAQD/AAAA/wAAAP8AAAD/AAAA/wICAv9UO/v/MiKX/wUD
+        D/8FAw7/AwIK/wAAAP8RCzP/IBZi/yAWYP8TDTr/AAAA/wAAAP8AAAD/AAAA/wAAAP8CAgL/VTz/+FQ6
+        /P8yI5j/IBZg/ywehf8MCCX/BAMN/wUEEP8GBBH/AQED/wAAAP8AAAD/AAAA/wAAAP8AAAD/AgIC9Vc+
+        /2BVOv9+Ujj0fTwptH5ONul9OCapfRUOPn4AAAB+AAAAfQAAAH4AAAB+AAAAfQAAAH4AAAB+AAAAfgQE
+        BFkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAA//8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAA//8AAA==
+</value>
+  </data>
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEAEBAAAAAAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAAMIOAADCDgAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAN6bIZTOkxoUtj62FL5W1hTWpzYUvlbWFLY+thTKgwoUxnb+FLY6shS6TsoUzpMaFL5a1hS2P
+        rYUxnb6FNZ2+ZTCTsvkriaf/KYKe/yuIpf8uk7L/K4il/ymBnP8tjqz/K4qn/yiBnP8qhaL/KoWh/yqG
+        o/8ogJv/JXeQ/yqDnvkRMjz/Di02/wofJv8MJS3/Di02/wskLP8HGB3/Di43/w0qM/8HFxz/CyMr/w4s
+        Nv8MJi7/CiAm/w4sNv8RMTv/BQsN/wUQE/8BAgL/AQQF/wYRFP8EBgf/AgIA/xAYJv8TGy3/AgIA/wMF
+        Bv8HEhX/AQUG/wECAv8FEBT/BQsN/wYFD/8LByT/AQAC/wAAAP8CAgL/AwMD/woKEv8LCxT/DAwY/woK
+        Ev8DAwT/AgIC/wAAAP8AAAD/AAAA/wICAv8JCA//IBs//wwMEP8AAAD/AgIC/wQEBv8bGzf/BgYK/wQE
+        Bf8bGzj/BgYJ/wMDA/8AAAD/CgoK/xEREf8HBwf/Li4u/1FRUf9ERET/AQEA/wwMGf8UFCj/BAQE/wMD
+        Av8DAwL/BAQE/xAQIP8RESL/AAAA/z8/P/9SUlH/NTU1/y4uLv9QUFD/QUFB/wEBAP8LCxf/EhIk/wIC
+        Af8JCRH/CwsV/wICAf8PDx3/Dw8f/wAAAP89PT3/UVFQ/zQ0M/8FBQX/DAwM/wgICP8AAAD/CwsW/xIS
+        JP8FBQb/Dg4b/xERIv8FBQb/Dw8d/w8PHv8AAAD/CAgK/xwXO/8KCRT/BAMI/wAAAP8AAAD/AAAA/wIC
+        Av8EBAX/HR06/wgIEP8GBgv/HR07/wYGCf8DAwL/AAAA/wAAAP8JBh3/BwUS/y0fhf8FBBD/AAAA/wAA
+        AP8AAAD/AAAA/xIOMv8fFVz/HhVa/xQPOP8AAQD/AAAA/wAAAP8AAAD/AAAA/wICAv9UO/v/MiKX/wUD
+        D/8FAw7/AwIK/wAAAP8RCzP/IBZi/yAWYP8TDTr/AAAA/wAAAP8AAAD/AAAA/wAAAP8CAgL/VTz/+FQ6
+        /P8yI5j/IBZg/ywehf8MCCX/BAMN/wUEEP8GBBH/AQED/wAAAP8AAAD/AAAA/wAAAP8AAAD/AgIC9Vc+
+        /2BVOv9+Ujj0fTwptH5ONul9OCapfRUOPn4AAAB+AAAAfQAAAH4AAAB+AAAAfQAAAH4AAAB+AAAAfgQE
+        BFkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAA//8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAA//8AAA==
+</value>
+  </data>
+</root>

clients/winuploader/Microbit.Uploader/Program.cs

@@ -0,0 +1,30 @@
+using Microsoft.VisualBasic.ApplicationServices;
+using System;
+using System.Windows.Forms;
+
+namespace Microsoft.MicroBit
+{
+    static class Program
+    {
+        /// <summary>
+        /// The main entry point for the application.
+        /// </summary>
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]
+        [STAThread]
+        static void Main()
+        {
+            Application.EnableVisualStyles();
+            Application.SetCompatibleTextRenderingDefault(false);
+            SingleInstanceAppStarter.Start(new MainForm(), StartNewInstance);
+        }
+
+        // The handler when attempting to start another instance of this application
+        // We can customize the logic here for which form to activate in different 
+        // conditions. Like in this sample, we will be selectively activate the LoginForm
+        // or MainForm based on the login state of the user.
+        static void StartNewInstance(object sender, StartupNextInstanceEventArgs e)
+        {
+            e.BringToForeground = true;
+        }
+    }
+}

clients/winuploader/Microbit.Uploader/Properties/AssemblyInfo.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Code The micro:bit Uploader")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("MicrosoftMicrobitUploader")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2016")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("7dc6ca45-fd75-44bc-805e-708c812cd4bf")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("0.9.0.0")]
+[assembly: AssemblyFileVersion("0.9.0.0")]
+[assembly: CLSCompliant(true)]
+[assembly: NeutralResourcesLanguage("en-US")]

clients/winuploader/Microbit.Uploader/Properties/Resources.Designer.cs

@@ -0,0 +1,93 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Microsoft.MicroBit.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.MicroBit.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap microbit_red {
+            get {
+                object obj = ResourceManager.GetObject("microbit_red", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap MSFT_logo_png {
+            get {
+                object obj = ResourceManager.GetObject("MSFT_logo_png", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to {\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff0\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang1033\deflangfe1033\themelang1033\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f1\fbidi \fswiss\fcharset0\fprq2{\*\panose 020b0604020202020204}Arial;}
+        ///{\f2\fbidi \fmodern\fcharset0\fprq1{\*\panose 02070309020205020404}Courier New;}{\f3\fbidi \froman\fcharset2\fprq2{\*\panose 05050102010706020507}Symbol;}{\f10\fbidi \fnil\fcharset2\fp [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string MSR_LA___2576 {
+            get {
+                return ResourceManager.GetString("MSR_LA___2576", resourceCulture);
+            }
+        }
+    }
+}

clients/winuploader/Microbit.Uploader/Properties/Resources.resx

@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="MSR_LA___2576" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\MSR-LA - 2576.rtf;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="MSFT_logo_png" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\MSFT_logo_png.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="microbit_red" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\microbit.red.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+</root>

clients/winuploader/Microbit.Uploader/Resources/MSR-LA - 2576.rtf

@@ -0,0 +1 @@
+TBD

clients/winuploader/Microbit.Uploader/Settings.Designer.cs

@@ -0,0 +1,76 @@
+namespace Microsoft.MicroBit
+{
+    partial class Settings
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.textBox1 = new System.Windows.Forms.TextBox();
+            this.label1 = new System.Windows.Forms.Label();
+            this.SuspendLayout();
+            // 
+            // textBox1
+            // 
+            this.textBox1.Location = new System.Drawing.Point(107, 12);
+            this.textBox1.Name = "textBox1";
+            this.textBox1.Size = new System.Drawing.Size(100, 20);
+            this.textBox1.TabIndex = 0;
+            this.textBox1.TextChanged += new System.EventHandler(this.textBox1_TextChanged);
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(34, 15);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(67, 13);
+            this.label1.TabIndex = 1;
+            this.label1.Text = "Custom Path";
+            // 
+            // Settings
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(246, 48);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.textBox1);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "Settings";
+            this.ShowIcon = false;
+            this.Text = "Settings";
+            this.Load += new System.EventHandler(this.Settings_Load);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.TextBox textBox1;
+        private System.Windows.Forms.Label label1;
+    }
+}

clients/winuploader/Microbit.Uploader/Settings.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Security.AccessControl;
+using System.Text;
+using System.Windows.Forms;
+
+namespace Microsoft.MicroBit
+{
+    public partial class Settings : Form
+    {
+        public string CustomCopyPath;
+        public Settings(string currentpath)
+        {
+            InitializeComponent();
+            CustomCopyPath = currentpath;
+
+        }
+
+        private void Settings_Load(object sender, EventArgs e)
+        {
+            textBox1.Text = CustomCopyPath;
+        }
+
+        private void label1_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void textBox1_TextChanged(object sender, EventArgs e)
+        {
+            CustomCopyPath = textBox1.Text;
+        }
+    }
+}

clients/winuploader/Microbit.Uploader/Settings.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

clients/winuploader/Microbit.Uploader/SingleInstanceAppHelper.cs

@@ -0,0 +1,39 @@
+/****************************** Module Header ******************************\
+* Module Name:  SingleInstanceAppHelper.cs
+* Project:      CSWinFormSingleInstanceApp
+* Copyright (c) Microsoft Corporation.
+* 
+* The  sample demonstrates how to achieve the goal that only 
+* one instance of the application is allowed in Windows Forms application..
+* 
+* This source is subject to the Microsoft Public License.
+* See http://www.microsoft.com/en-us/openness/resources/licenses.aspx#MPL.
+* All other rights reserved.
+* 
+* THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, 
+* EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED 
+* WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.
+\***************************************************************************/
+
+using System;
+using Microsoft.VisualBasic.ApplicationServices;
+using System.Windows.Forms;
+
+namespace Microsoft.MicroBit
+{
+    // We need to add Microsoft.VisualBasic reference to use
+    // WindowsFormsApplicationBase type.
+    class SingleInstanceApp : WindowsFormsApplicationBase 
+    {
+        public SingleInstanceApp()
+        {
+        }
+        public SingleInstanceApp(Form f)
+        {
+            // Set IsSingleInstance property to true to make the application 
+            base.IsSingleInstance = true;
+            // Set MainForm of the application.
+            this.MainForm = f;
+        }
+    }
+}

clients/winuploader/Microbit.Uploader/SingleInstanceAppStarter.cs

@@ -0,0 +1,39 @@
+/****************************** Module Header ******************************\
+* Module Name:  SingleInstanceAppStarter.cs
+* Project:      CSWinFormSingleInstanceApp
+* Copyright (c) Microsoft Corporation.
+* 
+* The  sample demonstrates how to achieve the goal that only 
+* one instance of the application is allowed in Windows Forms application..
+* 
+* This source is subject to the Microsoft Public License.
+* See http://www.microsoft.com/en-us/openness/resources/licenses.aspx#MPL.
+* All other rights reserved.
+* 
+* THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, 
+* EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED 
+* WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.
+\***************************************************************************/
+
+using System;
+using System.Windows.Forms;
+using Microsoft.VisualBasic.ApplicationServices;
+
+namespace Microsoft.MicroBit
+{
+    internal static class SingleInstanceAppStarter
+    {
+        static SingleInstanceApp app = null;
+
+        // Construct SingleInstanceApp object, and invoke its run method.
+        public static void Start(Form f, StartupNextInstanceEventHandler handler)
+        {
+            if (app == null && f != null)
+                app = new SingleInstanceApp(f);
+
+            // Wire up StartupNextInstance event handler.
+            app.StartupNextInstance += handler;
+            app.Run(Environment.GetCommandLineArgs());
+        }
+    }
+}

docs/about.md

@@ -29,24 +29,29 @@ The BBC micro:bit was made possible by many [partners](https://www.microbit.co.u
 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. 
 
-## Blocks or JavaScript
+## Hardware: The Device
 
-The student can program the BBC micro:bit using [visual blocks](http://www.github.com/Google/blockly) or JavaScript.
+Learn about about the [hardware components](/device) of the micro:bit to make the most of it!
+
+## Programming: Blocks or JavaScript
+
+The student can program the BBC micro:bit using [Blocks](/blocks) or [JavaScript](/javascript), via the [micro:bit APIs](/reference):
 
 ```blocks
-basic.showString("BBC micro:bit!");
+basic.showString("Hi!");
 ```
 
-## Compile and Flash
+## Compile and Flash: Your Program!
 
-When a user has her code ready, she can connect her BBC micro:bit to a computer via a USB cable, so it appears as a mounted drive.
+When a user has her code ready, she can connect her BBC micro:bit to a computer via a USB cable, so it appears as a mounted drive (named MICROBIT). 
 
-Compilation to the ARM thumb machine code happens in the browser.
+Compilation to ARM thumb machine code from [Blocks](/blocks) or [JavaScript](/javascript) happens in the browser.
 
 The student is prompted to save the ARM binary program to a file, which she then simply drags to the micro:bit mounted drive, 
 which flashes the micro:bit device with the new program.
 
 ## Simulator: Test Your Code
+
 Before a student compiles her code for the micro:bit, she can run it 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.
 
@@ -54,5 +59,10 @@ The simulator has support for the LED screen, buttons, as well as compass, accel
 
 The [C++ BBC 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, 
 as well as a set of helper functions (such as displaying a number/image/string on the LED screen). 
-The JavaScript micro:bit library mirrors the functions of the C++ library. 
+
+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
+
+The editor for the BBC micro:bit is [open source](/open-source) on GitHub. Contributors are welcome!

docs/blocks.md

@@ -0,0 +1,8 @@
+# Blocks language
+
+```namespaces
+for (let i = 0;i<5;++i) {}
+if (true){}
+let x = 0;
+Math.random(5);
+```

docs/blocks/logic/boolean.md

@@ -2,8 +2,6 @@
 
 true or false.
 
-### @parent blocks/language
-
 A Boolean has one of two possible values: `true`; `false`.  Boolean (logical) operators (*and*, *or*, *not*) take Boolean inputs and yields a Boolean value. Comparison operators on other types ([numbers](/reference/types/number), [strings](/reference/types/string) yields a Boolean value.
 
 The following blocks represent the true and false Boolean values, which can be plugged in anywhere a Boolean value is expected:
@@ -32,7 +30,7 @@ The next six blocks represent comparison operators that yield a Boolean value. M
 42 >= 0;
 ```
 
-Boolean values and operators are often used with an [if](/reference/logic/if) or [while](/reference/loops/while) statement to determine which code will execute next. For example:
+Boolean values and operators are often used with an [if](/blocks/logic/if) or [while](/blocks/loops/while) statement to determine which code will execute next. For example:
 
 ### Functions that return a Boolean
 
@@ -98,11 +96,7 @@ if(x < 5) {
 
 See the documentation on [Numbers](/reference/types/number) for more information on comparing two Numbers. You can also [compare strings](/reference/types/string-functions) using the `equals` function.
 
-### Lessons
-
-[rotation animation](/lessons/rotation-animation), [love meter](/lessons/love-meter), [zoomer](/lessons/zoomer)
-
 ### See also
 
-[if](/reference/logic/if), [while](/reference/loops/while), [number](/reference/types/number)
+[if](/blocks/logic/if), [while](/blocks/loops/while), [number](/reference/types/number)
 

docs/blocks/logic/if.md

@@ -0,0 +1,28 @@
+# If
+
+### @parent blocks/language
+ 
+
+Conditionally run code depending on whether a [Boolean](/blocks/logic/boolean) condition is true or false.
+
+```blocks
+if(true) {
+}
+```
+
+Click on the dark blue gear icon (see above) to add an *else* or *if* to the current block.
+
+### Example: adjusting screen brightness
+
+```blocks
+if(input.lightLevel()<100){
+    led.setBrightness(255);
+}
+```
+
+If the [light level](/reference/input/light-level) is `< 100`, this code sets the brightness to `255`:
+
+### See also
+
+[while loop](/blocks/loops/while), [for](/blocks/loops/for), [boolean](/blocks/logic/boolean)
+

docs/blocks/loops.md

@@ -2,7 +2,6 @@
 
 ```cards
 for(let i = 0;i<5;i++) {}
-for(let i = 1;i<5;i++) {}
 while(true) {}
-basic.forever(() => {})
+basic.forever(() => {});
 ```

docs/blocks/loops/for.md

@@ -14,11 +14,7 @@ basic.showNumber(i)
 }
 ```
 
-### Lessons
-
-[looper](/lessons/looper)
-
 ### See also
 
-[repeat](/reference/loops/repeat), [while](/reference/loops/while), [if](/reference/logic/if), [show number](/reference/basic/show-number)
+[repeat](/blocks/loops/repeat), [while](/blocks/loops/while), [if](/blocks/logic/if), [show number](/reference/basic/show-number)
 

docs/blocks/loops/repeat.md

@@ -0,0 +1,12 @@
+# Repeat
+
+Run part of the program the number of times you say.
+
+### Block Editor
+
+![](/static/mb/blocks/contents-0.png)
+
+### See also
+
+[for](/blocks/loops/for), [while](/blocks/loops/while), [if](/blocks/logic/if), [show number](/reference/basic/show-number)
+

docs/blocks/loops/while.md

@@ -1,16 +1,13 @@
 # While
 
-### @parent blocks/language
- 
-
-Repeat code while a [Boolean](/reference/types/boolean) `condition` is true.
+Repeat code while a [Boolean](/blocks/logic/boolean) `condition` is true.
 
 ```blocks
 while(true) {
 }
 ```
 
-The while loop has a *condition* that evaluates to a [Boolean](/reference/types/boolean) value. After the `do` keyword, add the code that you want to run while the `condition` is `true`. The while loop concludes with `end while`.
+The while loop has a *condition* that evaluates to a [Boolean](/blocks/logic/boolean) value. After the `do` keyword, add the code that you want to run while the `condition` is `true`. The while loop concludes with `end while`.
 
 The condition is tested before any code runs. Which means that if the condition is false, the code inside the loop doesn't execute.
 
@@ -26,11 +23,7 @@ while(index >= 0) {
 }
 ```
 
-### Lessons
-
-[rotation animation](/lessons/rotation-animation)
-
 ### See also
 
-[on button pressed](/reference/input/on-button-pressed), [for](/reference/loops/for), [if](/reference/logic/if), [forever](/reference/basic/forever)
+[on button pressed](/reference/input/on-button-pressed), [for](/blocks/loops/for), [if](/blocks/logic/if), [forever](/reference/basic/forever)
 

docs/blocks/math/math.md

@@ -1,15 +1,9 @@
-# Math Library
-
-Functions in the math library.
+# Math functions
 
 ### @parent blocks/language
 
 The math library includes math related functions that you can use with [Numbers](/reference/types/number).
 
-* In the [Block editor](/blocks/editor), click **maths** on the left to see the available blocks
-
-The functions available in Block Editor are:
-
 ### abs
 
 math `->` abs (x : [Number](/reference/types/number)) *returns* [Number](/reference/types/number)
@@ -42,11 +36,7 @@ returns a random [Number](/reference/types/number) between 0 and the parameter *
 
 ![](/static/mb/blocks/math-3.png)
 
-### Lessons
-
-[love meter](/lessons/love-meter)
-
 ### See also
 
-[Block Editor documentation](/blocks/contents), [Number](/reference/types/number)
+[Number](/reference/types/number)
 

docs/blocks/variables.md

@@ -1,6 +1,6 @@
 ## Variables
 
-[Assign](/reference/variables/assign) (set) a variable's value
+[Assign](/blocks/variables/assign) (set) a variable's value
 
 ```blocks
 let x = 0;
@@ -13,7 +13,7 @@ let x = 0;
 x;
 ```
 
-[Change](/reference/variables/change-var) a variable's value
+[Change](/blocks/variables/change-var) a variable's value
 
 ```blocks
 let x = 0;

docs/blocks/variables/assign.md

@@ -1,6 +1,6 @@
 # Assignment Operator
 
-Use an equals sign to make a [variable](/reference/variables/var) store the [number](/reference/types/number) 
+Use an equals sign to make a [variable](/blocks/variables/var) store the [number](/reference/types/number) 
 or [string](/reference/types/string) you say.
 
 When you use the equals sign to store something in a variable, the equals sign is called
@@ -30,11 +30,7 @@ You can use the assignment operator with variables of
 every [type](/reference/types). A *type* is which kind of thing
 a variable can store, like a number or string.
 
-### Lessons
-
-[rotation animation](/lessons/rotation-animation)
-
 ### See also
 
-[variable](/reference/variables/var), [types](/reference/types)
+[variable](/blocks/variables/var), [types](/reference/types)
 

docs/blocks/variables/change-var.md

@@ -0,0 +1,40 @@
+# Change Value
+
+Set the value for local and global variables.
+
+### @parent blocks/change-value
+
+Change the value of a variable
+
+```blocks
+let x = 0
+x += 1
+```
+
+### Declare a variable
+
+Use the assignment operator to set the value of a [variable](/blocks/variables/var). Change the value of a variable from 0 to 1 using the change item block. Like this:
+
+```blocks
+let x = 0
+x += 1
+```
+
+### Example
+
+Use the assignment operator to set the value of a [variable](/blocks/variables/var). Change the value of a variable from 0 to 1 using the change item block. Then display the new value of the variable on the LED screen. Like this:
+
+```blocks
+let x = 0;
+x += 1;
+basic.showNumber(x);
+```
+
+### Notes
+
+* You can use the assignment operator with variables of each of the supported [types](/reference/types).
+
+### See also
+
+[variable](/blocks/variables/var), [types](/reference/types)
+

docs/blocks/variables/var.md

@@ -13,7 +13,7 @@ A variable is a place where you can store and retrieve data. Variables have a na
 ### Var statement
 
 Use the Block Editor variable statement to create a variable 
-and the [assignment operator](/reference/variables/assign) 
+and the [assignment operator](/blocks/variables/assign) 
 to store something in the variable.
 
 For example, this code stores the number `2` in the `x` variable:
@@ -27,7 +27,7 @@ Here's how to define a variable in the Block Editor:
 
 2. Change the default variable name if you like.
 
-3. Drag a block type on the right-side of the [assignment operator](/reference/variables/assign) and click the down arrow to change the variable name.
+3. Drag a block type on the right-side of the [assignment operator](/blocks/variables/assign) and click the down arrow to change the variable name.
 
 A variable is created for the number returned by the [brightness](/reference/led/brightness) function.
 
@@ -81,11 +81,7 @@ if (led.brightness() > 128) {
 
 * You can use the default variable names if you'd like, however, it's best to use descriptive variable names. To change a variable name in the editor, select the down arrow next to the variable and then click "new variable".
 
-### Lessons
-
-[glowing pendulum](/lessons/glowing-pendulum), [love meter](/lessons/love-meter), [temperature](/lessons/temperature), [zoomer](/lessons/zoomer)
-
 ### See also
 
-[types](/reference/types), [assignment operator](/reference/variables/assign)
+[types](/reference/types), [assignment operator](/blocks/variables/assign)
 

docs/device.md

@@ -15,12 +15,14 @@ It flashes yellow when the system wants to tell the user that something has happ
 ### Buttons
 
 Buttons A and B are a form of input.  When you press a button, it completes an electrical circuit. 
-The micro:bit can detect either of its two buttons being pressed and un-pressed and be programmed 
-to act on that or send the information to another device.
+The micro:bit can detect either of its two buttons being pressed/released and be programmed 
+to act on these events.
 
 Button R on the back of the micro:bit is a system button. It has different uses. 
 When you have downloaded and run your code onto your micro:bit, press Button R to restart and run your program from the beginning.
 
+### USB connection
+
 When you plug in your micro:bit, it should appear as MICROBIT. 
 If you accidentally hold down the reset button as you’re plugging in your micro:bit, 
 the micro:bit will appear as a MAINTENANCE drive instead of MICROBIT. This is known as maintenance mode.**
@@ -43,7 +45,7 @@ This data can be used by the micro:bit in a program or be sent to another device
 
 ### Accelerometer
 
-There is a an accelerometer on your micro:bit which detects changes in the micro:bit’s speed. 
+There is an accelerometer on your micro:bit which detects changes in the micro:bit’s speed. 
 It converts analogue information into digital form that can be used in micro:bit programs. 
 Output is in milli-g. The device will also detect a small number of standard actions e.g. shake, tilt and free-fall.
 
@@ -63,7 +65,7 @@ and about the error messages you might get [here](/device/error-codes).
 
 ### Powering your micro:bit
 
-When your micro:bit  is connected to your computer with the micro USB, it doesn’t need another power source.  
+When your micro:bit is connected to your computer with the micro USB, it doesn’t need another power source.  
 When your micro:bit isn’t connected to your computer, tablet or mobile, you will need 2 x AAA 1.5 V batteries to power it.
 
 The pins labelled 3V and GND are the power supply pins. 
@@ -75,7 +77,7 @@ The BBC micro:bit can send an receive data via [serial communication](/device/se
 
 ### Bluetooth Low Energy (BLE) Antenna
 
-You will see the label BLE ANNTENA on the back of your micro:bit. It is for a messaging service, 
+You will see the label BLE ANTENNA on the back of your micro:bit. It is for a messaging service, 
 so that devices can talk to each other. The micro:bit is a peripheral 
 device which can talk to a central device like a smart phone or tablet that has Bluetooth Low Energy (BLE). 
 The micro:bit can send signals and receive signals from a central device so another BLE device can 

docs/device/contents.md

@@ -1,7 +1,5 @@
 # micro:bit - the device
 
-The micro:bit device
-
 The micro:bit is a very capable device with many components:
 
 * [the USB connector](/device/usb)

docs/device/crocodile-clips.md

@@ -11,12 +11,6 @@ This example displays a random number every time the crocodile clip holds  `GND`
 
 ### Connecting Crocodile Clips
 
-
-
-### Lessons
-
-[love meter](/lessons/love-meter)
-
 ### 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)

docs/device/reactive.md

@@ -1,7 +1,5 @@
 # The micro:bit - a reactive system
 
-The micro:bit is a reactive system.
-
 ### Computing systems
 
 What sort of a *computing system* is the micro:bit?

docs/device/screen.md

@@ -3,40 +3,61 @@
 The micro:bit LED screen 
 
 ```sim
-basic.showString(" ");
+    basic.showLeds(`
+        # . # . #
+        . # . # .
+        # . # . #
+        . # . # .
+        # . # . #
+        `);
 ```
 
 The micro:bit LED screen consists of 25 red LED lights arranged in a 5X5 grid (5 LEDs across by 5 LEDs down).
+In the screen above, we created a checkerboard pattern using the LEDs.
 
 ### Which LED?
 
-You use ``x , y`` coordinates to specify a particular LED in the grid; where ``x`` is the horizontal position and ``y`` is the vertical position (0, 1, 2, 3, 4). To figure out the ``x``, ``y`` coordinates, position your micro:bit horizontally, like a credit card (see picture above).
+You use `(x ,y)` coordinates to specify a particular LED in the grid; 
+where `x` is the horizontal position (0,1,2,3,4) and `y` is the vertical position 
+(0, 1, 2, 3, 4). 
+
+To figure out the ``x``, ``y`` coordinates, position your micro:bit horizontally, like a credit card (see picture above).
 
 Here are the x, y coordinates for the LEDs in the 5X5 grid:
 
-`0, 0` `1, 0` `2, 0` `3, 0` `4, 0`
+`(0,0)` `(1,0)` `(2,0)` `(3,0)` `(4,0)`
 
-`0, 1` `1, 1` `2, 1` `3, 1` `4, 1`
+`(0,1)` `(1,1)` `(2,1)` `(3,1)` `(4,1)`
 
-`0, 2` `1, 2` `2, 2` `3, 2` `4, 2`
+`(0,2)` `(1,2)` `(2,2)` `(3,2)` `(4,2)`
 
-`0, 3` `1, 3` `2, 3` `3, 3` `4, 3`
+`(0,3)` `(1,3)` `(2,3)` `(3,3)` `(4,3)`
 
-`0, 4` `1, 4` `2, 4` `3, 4` `4, 4`
+`(0,4)` `(1,4)` `(2,4)` `(3,4)` `(4,4)`
 
-The x, y coordinates for the LED in the centre of the grid are `2, 2`. Starting from `0, 0` count over 2 columns and then down 2 rows.
+The x, y coordinates for the LED in the centre of the grid are `(2,2)`. Starting from `(0,0)` count over 2 columns and then down 2 rows.
+
+### Check your understanding
+
+Which LEDs are turned on in the checkboard pattern above? 
 
 ### Row, column - 1
 
-Since the row and column numbers start at 0, an easy way to figure out the x, y coordinates is to subtract 1 from the row and column number (when counting from 1). In other words, to specify the LED in the 4th column 5th row, subtract 1 from each number to get coordinates `3, 4`.
+Since the row and column numbers start at 0, an easy way to figure out the (x,y) coordinates 
+is to subtract 1 from the row and column number (when counting from 1). 
+In other words, to specify the LED in the 4th column 5th row, subtract 1 from each number to get coordinates `(3,4)`.
 
 ### Turn a LED on/off
 
 Use [plot](/reference/led/plot) and [unplot](/reference/led/unplot) to turn a LED on or off
 
 ```blocks
-led.plot(0,0)
-led.unplot(0,0)
+led.plot(0,0);
+led.plot(1,1);
+basic.pause(1000);
+led.unplot(0,0);
+basic.pause(1000);
+led.unplot(1,1);
 ```
 
 ### Is a LED on/off?

docs/device/serial.md

@@ -11,16 +11,35 @@ input.onButtonPressed(Button.A, () => {
 })
 ```
 
+Data is also automatically streamed to serial by the ** bar graph** block
+and picked up by the editor. This data can be streamed to the cloud as well.
+
+```blocks
+basic.forever(() => {
+   led.plotBarGraph(input.acceleration(Dimension.X), 0);
+});
+```
+
 ## How to read the micro:bit's serial output from your computer
 
 Unfortunately, using the serial library requires quite a bit of a setup.
 
+### BBC micro:bit Chrome Extension
+
+If you are using the Google Chrome browser, you can use our extension to get serial data streaming in the editor.
+
+* Install the [Extension for BBC micro:bit](https://chrome.google.com/webstore/detail/extension-for-bbc-microbi/cihhkhnngbjlhahcfmhekmbnnjcjdbge?hl=en-US) on the Chrome Web Store.
+* Restart Chrome and open the web editor.
+
 ### Windows
 
 You must install a device driver (for the computer to recognize the serial interface of the micro:bit); then, you must also install a terminal emulator (which is going to connect to the micro:bit and read its output). Here's how to do it:
 
 * Follow instructions at https://developer.mbed.org/handbook/Windows-serial-configuration in order to install the device driver
-* Install a terminal emulator; we recommend [Tera Term](https://ttssh2.osdn.jp/index.html.en). At the time of this writing, the latest version is 4.88 and can be downloaded [from here](http://en.osdn.jp/frs/redir.php?m=jaist&f=%2Fttssh2%2F63767%2Fteraterm-4.88.exe). Follow the instructions from the installer.
+
+#### Windows > Tera Term
+
+* Install the terminal emulator [Tera Term](https://ttssh2.osdn.jp/index.html.en). At the time of this writing, the latest version is 4.88 and can be downloaded [from here](http://en.osdn.jp/frs/redir.php?m=jaist&f=%2Fttssh2%2F63767%2Fteraterm-4.88.exe). Follow the instructions from the installer.
 
 Once both the driver and the terminal emulator are installed, plug in the micro:bit and wait until the device is fully setup. Then, open TeraTerm.
 
@@ -32,7 +51,7 @@ You should be good. Feel free to hit `Setup` > `Save Setup` in the menus to eras
 
 Please note that Windows will assign you a different COM port if you plug in another micro:bit. If you're juggling between micro:bits, you'll have to change the COM port every time.
 
-### Alternative Windows setup with Putty
+#### Windows > Putty
 
 If you prefer another terminal emulator (such as [PuTTY](http://www.putty.org/)), here are some instructions.
 

docs/device/usb.md

@@ -2,7 +2,8 @@
 
 How to compile, transfer, and run a script on your micro:bit.
 
-While you're writing and testing your Block Editor or Touch Develop scripts, you'll mostly be running scripts in your browser by clicking the `Run` button (see [run code in your browser](/device/simulator) for info about this).
+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).
 
 Once your masterpiece is complete, you can compile your script and run it on your micro:bit.
 

docs/docs.md

@@ -24,10 +24,10 @@ input.onButtonPressed(Button.B, () => {
 });
 ``` 
 
-* **[getting started](/getting-started)**   
-* Browse the [API reference](/reference)
-* Learn more about the [device](/device)
-* Get started with [lessons](/lessons)
+* **[getting started](/getting-started)**
+* Get started with [projects](/projects)
+* Browse the [micro:bit APIs](/reference)
+* Learn more about the [micro:bit device](/device)
 * Frequently Asked Question [faq](/faq)
 * Follow up with the [release notes](/release-notes)
 

docs/getting-started.md

@@ -4,15 +4,16 @@
 
 Are you ready to build cool BBC micro:bit programs?
 
-Here are some challenges for you.  Unscramble the blocks in the editor
+Here are some challenges for you. Arrange the blocks in the editor
 to make real programs that work!
 
 ## ~
 
 ### Happy face
 
-There are three blocks in the editor (the area to the left).
-They should look like this:
+Use the **Basic** drawer in the editor (to the left) 
+to drag out and arrange three blocks (two `show leds` and one `forever` block)
+to create this program:
 
 ```blocks
 basic.forever(() => {
@@ -33,7 +34,7 @@ basic.forever(() => {
 });
 ```
 
-When you run this program, you will see a smiley face, then a blank
+When you run this program (click the **Play** button) you will see a smiley face, then a blank
 screen, then a smiley again -- it never stops! (That's because of the
 ``forever`` block.)
 
@@ -69,7 +70,7 @@ Click **Compile** to move your program to the BBC micro:bit!
 
 ### Your turn!
 
-Pile up more ``show leds`` blocks to create your animation! Create an
+Pile up more ``show leds`` blocks to create an animation! Create an
 animation with at least 5 pictures.  What does this animation show?
 
 ```blocks
@@ -496,7 +497,7 @@ input.onButtonPressed(Button.B, () => {
 ```
 Click **Compile** to move your program to the BBC micro:bit!
 
-## Your turn!
 
-How else can you make your game better?
-Ever hear of [Rock Paper Scissors Spock Lizard](http://www.samkass.com/theories/RPSSL.html)?
+# Want to do more?
+
+There are [10 great projects](/projects) waiting for you.

docs/javascript.md

@@ -0,0 +1,75 @@
+# JavaScript
+
+You can write micro:bit programs in a subset of [TypeScript](https://www.typescriptlang.org), a superset of JavaScript.
+Many micro:bit programs, especially at the beginner's level, are just plain JavaScript. TypeScript introduces class-based 
+object-oriented programming, such as:
+
+```js
+class Greeter {
+    greeting: string;
+    constructor(message: string) {
+        this.greeting = message;
+    }
+    greet() {
+        return "Hello, " + this.greeting;
+    }
+}
+
+let greeter = new Greeter("world");
+basic.showString(greeter.greet())
+```
+
+This site is meant for teaching programming first, and JavaScript second. For this
+reason, we have stayed away from concepts that are specific to JavaScript (for
+example, prototype inheritance), and instead focused on ones common to most
+modern programming languages (for example, loops, lexically scoped variables,
+functions, classes, lambdas).
+
+We leverage TypeScript's [type inference](http://www.typescriptlang.org/docs/handbook/type-inference.html) so that
+students need not specify types when clear from context.
+
+## Supported language features
+
+* top-level code in the file: "Hello world!" really is just `basic.showString("Hello world!")`
+* [basic types](http://www.typescriptlang.org/docs/handbook/basic-types.html)
+* [variable declarations](http://www.typescriptlang.org/docs/handbook/variable-declarations.html): `let`, `const`, and `var`
+* [functions](http://www.typescriptlang.org/docs/handbook/functions.html) with lexical scoping and recursion
+
+### User-defined types and modules
+
+* [classes](http://www.typescriptlang.org/docs/handbook/classes.html) with fields, methods and constructors; `new` keyword
+* [enums](http://www.typescriptlang.org/docs/handbook/enums.html)
+* [namespaces](http://www.typescriptlang.org/docs/handbook/namespaces.html)  (a form of modules) 
+
+### Control-flow constructs
+
+* `if ... else if ... else` statements
+* `while` and `do ... while` loops
+* `for(;;)` loops (see below about `for ... in/of`)
+* `break/continue`; also with labeled loops
+* `switch` statement (on numbers only)
+* `debugger` statement for breakpoints
+
+### Expressions
+
+* conditional operator `? :`; lazy boolean operators
+* all arithmetic operators (including bitwise operators); note that in microcontroller targets
+  all arithmetic is performed on integers, also when simulating in the browser
+* strings (with a few common methods)
+* [string templates](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Template_literals) (`` `x is ${x}` ``)
+* arrow functions `() => ...`
+* array literals `[1, 2, 3]`
+
+
+## Unsupported language features
+
+We generally stay away from the more dynamic parts of JavaScript. 
+Things you may miss and we may implement:
+
+* exceptions (`throw`, `try ... catch`, `try ... finally`)
+* `for ... of` statements
+* object literals `{ foo: 1, bar: "two" }`
+* method-like properties (get/set accessors)
+* class inheritance
+
+If there is something you'd like to see, please file an issue at [GitHub](http://github.com/microsoft/pxt/issues).

docs/lessons.md

@@ -1,6 +1,5 @@
 # Lessons 
 
-
 ### @short Lessons
 
 ### ~column 
@@ -31,7 +30,6 @@
 * [Guess the Number](/lessons/guess-the-number),  guess a random number with pick number
 * [Counter](/lessons/counter), display a number with a variable
 * [Love Meter](/lessons/love-meter), create a love meter with on pin pressed
-* [Rock Paper Scissors](/lessons/rock-paper-scissors), create the classic game of rock paper scissors with if statement
 * [Truth or Dare](/lessons/truth-or-dare), a game that forces each player to reveal a secret or do something funny with if statement
 * [Spinner](/lessons/spinner), spin the arrow with multiple if statements
 * [Dice Roll](/lessons/dice-roll), spin with more if statements
@@ -44,17 +42,12 @@
 * [Zoomer](/lessons/zoomer), measure the force with acceleration
 * [Glowing Pendulum](/lessons/glowing-pendulum), construct a pendulum that glows using acceleration
 * [Classic Beatbox](/lessons/classic-beatbox), make a beatbox music player with variables
-* [Light Beatbox](/lessons/light-beatbox), make a beatbox music player with light level
 
 ### ~
 
 ### ~column 
 
 ## Maker
-* [The Watch](/lessons/the-watch), design and create The Watch
-* [Hack your Headphones](/lessons/hack-your-headphones), create music on the BBC micro:bit by hacking your headphones
-* [Banana Keyboard](/lessons/banana-keyboard), create music with fruits
-* [Telegraph](/lessons/telegraph), play the telegraph game between two BBC micro:bits
 * [Pogo](/lessons/pogo), create a pogo game to test your jumping abilities
 
 ## Science
@@ -70,5 +63,3 @@
 ### ~
 
 ### @section full
-
-The lessons promote computational thinking and computer science literacy.

docs/lessons/banana-keyboard.md

@@ -1,21 +0,0 @@
-# banana keyboard blocks lesson
-
-display beautiful images on the BBC micro:bit.
-
-## Topic
-
-Music
-
-## Quick Links
-
-* [activity](/lessons/banana-keyboard/activity)
-
-## 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). The connect fruit using pins P1 and GND.
-
-## Objectives
-
-* learn how to setup the BBC micro:bit with earphones to play music
-* learn how to setup the BBC micro:bit with fruit be the musical instrument
-

docs/lessons/counter.md

@@ -34,7 +34,7 @@ basic.showLeds(`
     `)
 ```
 
-* **variable**: [read more...](/reference/variables/var)
+* **variable**: [read more...](/blocks/variables)
 * **arithmetic operators**: [read more...](/reference/types/number)
 * **on button pressed** : [read more...](/reference/input/on-button-pressed)
 * **show number** : [read more...](/reference/basic/show-number)

docs/lessons/hack-your-headphones.md

@@ -1,20 +0,0 @@
-# hack your headphones lesson
-
-display beautiful images on the BBC micro:bit.
-
-## Topic
-
-Hack your headphone
-
-## Quick Links
-
-* [activity](/lessons/hack-your-headphones/activity)
-
-## 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, headphones (or speakers), as well as crocodile clips (or spring clips).
-
-## Objectives
-
-* learn how to setup the BBC micro:bit with headphones to play music
-

docs/lessons/headbands.md

@@ -42,19 +42,18 @@ Learn how to create a charades game with **collections**, ` create -> Collection
 ## Documentation
 
 * **collection**
-* **global variables** : [read more...](/reference/variables/globals.md)
-* **Boolean** : [read more...](/reference/types/boolean)
-* **on logo up** [read more...](/functions/on-logo-up)
-* **on screen down** [read more...](/functions/on-screen-down)
-* **on screen up** [read more...](/functions/on-screen-up)
+* **variables** : [read more...](/blocks/variables)
+* **Boolean** : [read more...](/blocks/logic/boolean)
+* **on logo up** [read more...](/reference/input/on-gesture)
+* **on screen down** [read more...](/reference/input/on-gesture)
+* **on screen up** [read more...](/reference/input/on-gesture)
 * **show string** : [read more...](/reference/basic/show-string)
-* **game library** : [read more...](/reference/game-library)
+* **game library** : [read more...](/reference/game)
 
 ## Resources
 
 * Activity: [tutorial](/lessons/headbands/activity)
-* Activity: [quiz](/lessons/headbands/quiz)
-* Extended Activity: [challenges](/lessons/headbands/challenges)
+* Quiz: [quiz](/lessons/headbands/quiz)
 
 ## Objectives
 
@@ -115,15 +114,6 @@ Computational Thinking Concept: AB = Abstraction; DE = Decomposition; AL = Algor
 * [tutorial](/lessons/headbands/activity)
 * [quiz](/lessons/headbands/quiz)
 
-## Extended Activity
-
-* time: 20 min.
-* [challenges](/lessons/headbands/challenges)
-
-## Homework
-
-* Extended Activity: [challenges](/lessons/headbands/challenges)
-
 ## Intended follow on
 
 Publish script to the classroom.

docs/lessons/light-beatbox.md

@@ -1,21 +0,0 @@
-# light beatbox 
-
-display beautiful images on the BBC micro:bit.
-
-## Topic
-
-Music
-
-## Quick Links
-
-* [activity](/lessons/light-beatbox/activity)
-
-## Prior learning/place of lesson in scheme of work
-
-Learn how to make a light beatbox music player using the light sensor. We will be learning how to code musical notes using light level, a local variable, conditionals, on button pressed as well as simple commands such as ring tone and rest.
-
-## Objectives
-
-* learn how to control the light sensor on the BBC micro:bit
-* learn how to code music on the BBC micro:bit
-

docs/lessons/rock-paper-scissors.md

@@ -1,62 +0,0 @@
-# rock paper scissors lesson
-
-A game against the BBC micro:bit.
-
-## Topic
-
-Local Variables
-
-## Quick Links
-
-* [activity](/lessons/rock-paper-scissors/activity)
-* [challenges](/lessons/rock-paper-scissors/challenges)
-
-## Class
-
-Year 7
-
-## Prior learning/place of lesson in scheme of work
-
-Learn how to create a **local variable**, `var t :=time` where you can store data, so that you can use it in your code. We will be learning how to create a classic rock paper scissors game using global variables, input on shake, local variables, math random as well as simple commands such as create image, show image, show string, and show number.
-
-## Documentation
-
-```cards
-input.onGesture(Gesture.Shake, () => {})
-Math.random(3)
-let x = 0
-basic.showLeds(`
-    . . . . .
-    . . . . .
-    . . # . .
-    . . . . .
-    . . . . .
-    `)
-```
-
-## Objectives
-
-* learn how to create a condition so the micro:bit will run code when it is shaken
-* learn how to create a local variable for a place where you can store data
-* learn how to create an image to show on the micro:bit's LED screen
-* learn how to show an image on the micro:bit's LED screen
-
-## Progression Pathways / Computational Thinking Framework
-
-#### Algorithms
-
-* Uses diagrams to express solutions.(AB)
-* Represents solutions using a structured notation (AL) (AB)
-
-#### Programming & Development
-
-* Creates programs that implement algorithms to achieve given goals (AL)
-*  Declares and assigns variables(AB)
-* Selects the appropriate data types(AL) (AB
-
-#### Data & Data Representation
-
-* Defines data types: real numbers and Boolean (AB)
-
-Computational Thinking Concept: AB = Abstraction; DE = Decomposition; AL = Algorithmic Thinking; EV = Evaluation; GE = Generalisation
-

docs/lessons/rock-paper-scissors/activity.md

@@ -1,121 +0,0 @@
-# rock paper scissors activity
-
-A classic game against the micro:bit.
-
-### ~avatar avatar
-
-
-
-Welcome! This tutorial will help you create a game of rock paper scissors with the micro:bit. Let's get started!
-
-### ~
-
-We want the micro:bit to choose rock, paper, or scissors when it is shaken. Let's begin by creating an on shake condition so the micro:bit will run code when it is shaken.
-
-
-```blocks
-
-input.onGesture(Gesture.Shake, () => {
-    
-})
-
-```
-
-Next, create a variable and store pick random number from 0 to 2.  On shake, a number will be randomly picked from 0-2. We will randomly display an image based on the random number returned.
-
-
-```blocks
-input.onGesture(Gesture.Shake, () => {
-    let img = Math.random(3)
-})
-
-```
-
-The micro:bit will look like it's showing 1 frame of the image by displaying the whole image when pick random is equal to 2. We can help the micro:bit randomly decide which image to use by pick random. The micro:bit will randomly pick the image to display with show LEDs and the pick random function.
-
-```blocks
-input.onGesture(Gesture.Shake, () => {
-    let img = Math.random(3)
-    if (img == 2) {
-        basic.showLeds(`
-            # # # # #
-            # . . . #
-            # . . . #
-            # . . . #
-            # # # # #
-            `)
-
-    }
-})
-
-
-```
-
-The micro:bit will look like it's showing 1 frame of the image by displaying the whole image when pick random is equal to 1. We can help the micro:bit randomly decide which image to use by pick random. The micro:bit will randomly pick the image to display with show LEDs and the pick random function.
-
-```blocks
-input.onGesture(Gesture.Shake, () => {
-    let img = Math.random(3)
-    if (img == 2) {
-        basic.showLeds(`
-            # # # # #
-            # . . . #
-            # . . . #
-            # . . . #
-            # # # # #
-            `)
-
-    } else if (img == 1) {
-        basic.showLeds(`
-            . . . . .
-            . # # # .
-            . # # # .
-            . # # # .
-            . . . . .
-            `)
-    }
-})
-```
-
-The micro:bit will look like it's showing 1 frame of the image by displaying the whole image when pick random is not equal to 2 and not equal to 1. We can help the micro:bit randomly decide which image to use by pick random. The micro:bit will randomly pick the image to display with show LEDs and the pick random function.
-
-
-```blocks
-input.onGesture(Gesture.Shake, () => {
-    let img = Math.random(3)
-    if (img == 2) {
-        basic.showLeds(`
-            # # # # #
-            # . . . #
-            # . . . #
-            # . . . #
-            # # # # #
-            `)
-
-    } else if (img == 1) {
-        basic.showLeds(`
-            . . . . .
-            . # # # .
-            . # # # .
-            . # # # .
-            . . . . .
-            `)
-    } else {
-        basic.showLeds(`
-            . . . # #
-            # # . # .
-            . . # . .
-            # # . # .
-            . . . # #
-            `)
-    }
-})
-
-```
-
-### ~avatar avatar
-
-Excellent, you're ready to continue with the [challenges](/lessons/rock-paper-scissors/challenges)!
-
-### ~
-

docs/lessons/rock-paper-scissors/challenges.md

@@ -1,133 +0,0 @@
-# rock paper scissors challenges
-
-Coding challenges for rock paper scissors. 
-
-## Before we get started
-
-Complete the following [guided activity](/lessons/rock-paper-scissors/activity) , your code should look like this:
-
-```blocks
-input.onGesture(Gesture.Shake, () => {
-    let img = Math.random(3)
-    if (img == 2) {
-        basic.showLeds(`
-            # # # # #
-            # . . . #
-            # . . . #
-            # . . . #
-            # # # # #
-            `)
-
-    } else if (img == 1) {
-        basic.showLeds(`
-            . . . . .
-            . # # # .
-            . # # # .
-            . # # # .
-            . . . . .
-            `)
-    } else {
-        basic.showLeds(`
-            . . . # #
-            # # . # .
-            . . # . .
-            # # . # .
-            . . . # #
-            `)
-    }
-})
-
-```
-
-### Challenge 1
-
-When the A button is pressed, increment the score by 1. You can select Game drawer then add change score by 1.
-
-```blocks
-input.onGesture(Gesture.Shake, () => {
-    let img = Math.random(2)
-    if (img == 2) {
-        basic.showLeds(`
-            # # # # #
-            # . . . #
-            # . . . #
-            # . . . #
-            # # # # #
-            `)
-
-    } else if (img == 1) {
-        basic.showLeds(`
-            . . . . .
-            . # # # .
-            . # # # .
-            . # # # .
-            . . . . .
-            `)
-    } else {
-        basic.showLeds(`
-            . . . # #
-            # # . # .
-            . . # . .
-            # # . # .
-            . . . # #
-            `)
-    }
-})
-input.onButtonPressed(Button.A, () => {
-    game.addScore(1)
-})
-
-```
-
-* Click *run* to execute your code in the simulator
-
-### Challenge 2
-
-After incrementing the score, display the total number of wins you have.
-
-
-```blocks
-input.onGesture(Gesture.Shake, () => {
-    let img = Math.random(2)
-    if (img == 2) {
-        basic.showLeds(`
-            # # # # #
-            # . . . #
-            # . . . #
-            # . . . #
-            # # # # #
-            `)
-
-    } else if (img == 1) {
-        basic.showLeds(`
-            . . . . .
-            . # # # .
-            . # # # .
-            . # # # .
-            . . . . .
-            `)
-    } else {
-        basic.showLeds(`
-            . . . # #
-            # # . # .
-            . . # . .
-            # # . # .
-            . . . # #
-            `)
-    }
-})
-input.onButtonPressed(Button.A, () => {
-    game.addScore(1)
-    basic.showString("WINS:")
-    basic.showNumber(game.score())
-})
-
-```
-
-* Run and compile the code to see if it works as expected.
-
-### Challenge 3
-
-You have successfully tracked and displayed the number of wins on the micro:bit! However, what about losses? Use the Game drawer to change score by -1 when button `B` is pressed.
-
-* Run and compile the code to see if it works as expected.

docs/lessons/rock-paper-scissors/quiz.md

@@ -1,74 +0,0 @@
-# rock paper scissors quiz
-
-shift an image horizontally across the display with offset.
-
-## Name
-
-## Directions
-
-Use this activity document to guide your work in the [rock paper scissors tutorial](/lessons/rock-paper-scissors/activity).
-
-Answer the questions while completing the tutorial. Pay attention to the dialogues!
-
-## 1. Describe what `offset` does? 
-
-<br/>
-
-## 2. Draw which LEDs are ON after running this code and the random number returned is 0
-
-```blocks
-let img = images.createImage(`
-. . . . . # # # # # . . . . #
-. # # # . # . . . # # # . # .
-. # # # . # . . . # . # # . .
-. # # # . # . . . # # # . # .
-. . . . . # # # # # . . . . #
-`)
-let offset = Math.random(3) * 5
-img.showImage(offset)
-```
-
-![](/static/mb/lessons/night-light-2.png)
-
-<br/>
-
-<br/>
-
-## 3. Draw which LEDs are ON after running this code with an offset of 5. This would occur if the random number returned is 1.
-
-```blocks
-let img_ = images.createImage(`
-. . . . . # # # # # . . . . #
-. # # # . # . . . # # # . # .
-. # # # . # . . . # . # # . .
-. # # # . # . . . # # # . # .
-. . . . . # # # # # . . . . #
-`)
-let offset_ = Math.random(3) * 5
-img.showImage(offset)
-```
-
-![](/static/mb/lessons/night-light-2.png)
-
-<br/>
-
-<br/>
-
-## 4. Draw which LEDs are ON after running this code with an offset of 10. This would occur if the random number returned is 2.
-
-```blocks
-let img_1 = images.createImage(`
-. . . . . # # # # # . . . . #
-. # # # . # . . . # # # . # .
-. # # # . # . . . # . # # . .
-. # # # . # . . . # # # . # .
-. . . . . # # # # # . . . . #
-`)
-let offset_1 = Math.random(3) * 5
-img.showImage(offset)
-```
-
-![](/static/mb/lessons/night-light-2.png)
-
-<br/>
-

docs/lessons/speed-button.md

@@ -22,10 +22,10 @@ Learn how to declare a **Boolean** variable, `var t:= true` `var f:=false` for o
 ## Documentation
 
 * **running time** : [read more...](/reference/input/running-time)
-* **global variable** : [read more...](/reference/variables/globals)
-* **Boolean** : [read more...](/reference/types/boolean)
+* **variable** : [read more...](/blocks/variables)
+* **Boolean** : [read more...](/blocks/logic/boolean)
 * **on button pressed** : [read more...](/reference/input/on-button-pressed)
-* **if** : [read more...](/reference/logic/if)
+* **if** : [read more...](/blocks/logic/if)
 * **show string** : [read more...](/reference/basic/show-string)
 
 ## Objectives

docs/lessons/stem.md

@@ -9,9 +9,9 @@ Overview of Blocks lessons for the BBC micro:bit.
 ## Science
 
 * [Night Light](/lessons/night-light), dim the LEDs with set brightness
-* [Hack your headphones](/lessons/hack-your-headphones), create music on the BBC micro:bit by hacking your headphones
-* [Banana Keyboard](/lessons/banana-keyboard), create music with fruits
-* [Telegraph](/lessons/telegraph), play the telegraph game between 2 BBC micro:bits
+* [Hack your headphones](/projects/hack-your-headphones), create music on the BBC micro:bit by hacking your headphones
+* [Banana Keyboard](/projects/banana-keyboard), create music with fruits
+* [Telegraph](/projects/telegraph), play the telegraph game between 2 BBC micro:bits
 * [Zoomer](/lessons/zoomer), measure the force with acceleration
 * [Glowing pendulum](/lessons/glowing-pendulum), construct a pendulum that glows using acceleration
 
@@ -38,7 +38,6 @@ Overview of Blocks lessons for the BBC micro:bit.
 
 ## Engineering
 
-* [The Watch](/lessons/the-watch), design and create The Watch
 * [Truth or dare](/lessons/truth-or-dare), a game that forces each player to reveal a secret or do something funny with if statement
 * [Spinner](/lessons/spinner), spin the arrow with multiple if statements
 * [Dice roll](/lessons/dice-roll), spin with more if statements

docs/lessons/telegraph.md

@@ -1,24 +0,0 @@
-# telegraph lesson
-
-display beautiful images on the BBC micro:bit.
-
-## Topic
-
-Telegraph
-
-## Quick Links
-
-* [activity](/lessons/telegraph/activity)
-* [challenges](/lessons/telegraph/challenges)
-
-
-## Prior learning/place of lesson in scheme of work
-
-Learn how to convert your BBC micro:bit into a telegraph using a second BBC micro:bit as well as pin P1, P2, 3V, GND, 
-and crocodile clips (or spring clips). The connect BBC micro:bit uses pins P1, P2, 3V, GND.
-
-## Objectives
-
-* learn how to setup the BBC micro:bit with crocodile clips
-* learn how to telegraph to another BBC micro:bit
-

docs/lessons/the-watch.md

@@ -1,23 +0,0 @@
-# the watch lesson
-
-display beautiful images on the BBC micro:bit.
-
-![](/static/mb/lessons/the-watch-0.png)
-
-## Topic
-
-The Watch
-
-## Quick Links
-
-* [activity](/lessons/the-watch/activity)
-
-
-
-## Prior learning/place of lesson in scheme of work
-
-Learn how to design the BBC micro:bit watch with household supplies.
-
-## Objectives
-
-* learn how to design and make the watch with the BBC micro:bit

docs/open-source.md

@@ -4,6 +4,6 @@ The editor is open source on GitHub under the MIT license. Contributions are wel
 
 ### Repos
 
+* [microsoft/pxt-microbit](https://github.com/Microsoft/pxt-microbit), PXT target for BBC micro:bit, also includes the documentation.
 * [microbit/pxt](https://github.com/Microsoft/pxt), programming experience toolkit (PXT)
-* [microsoft/pxt-microbit](https://github.com/Microsoft/pxt-microbit), PXT target for BBC micro:bit
 * [microsoft/pxt-microbit-core](https://github.com/Microsoft/pxt-microbit-core), Yotta module used to build the BBC micro:bit runtime

docs/projects.md

@@ -1,15 +1,55 @@
-# Projects 
+# Ten Projects
 
+### ~avatar avatar
 
-### @short Projects
-
-### ~column 
-
-## Beginner
-
-* [Rock Paper Scissors](/projects/rock-paper-scissors)
+Here are some cool projects that you can build with your micro:bit!
 
 ### ~
 
-### ~column 
+
+```codecard
+[{
+  "name": "Flashing Heart",
+  "url":"/projects/flashing-heart",
+  "imageUrl": "/static/mb/projects/a1-display.png"
+},{
+  "name": "Smiley Buttons",
+  "url":"/projects/smiley-buttons",
+  "imageUrl": "/static/mb/projects/a2-buttons.png"
+},{
+  "name": "Love Meter",
+  "url":"/projects/lover-meter",
+  "imageUrl":"/static/mb/projects/a3-pins.png"
+},{
+  "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"
+},{
+  "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": "Telegraph",
+  "url":"/projects/telegraph",
+  "imageUrl":"/static/mb/projects/a8-network.png"
+},{
+  "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"
+}]
+```
+
+