0.2.87

.gitattributes

@@ -12,6 +12,7 @@
 *.html text eol=lf
 *.py text eol=lf
 *.exp text eol=lf
+*.manifest text eol=lf
 
 # do not enforce text for everything - it causes issues with random binary files
 

.gitignore

@@ -1,8 +1,17 @@
 node_modules
-*.sw?
 built
-typings/
-tmp/
+typings
+tmp
+temp
+projects
+win10/app/bin
+win10/app/bld
+win10/*.opendb
+
+*.user
+*.sw?
 *.ts.new
 *.tgz
-temp/
+*.db
+*.suo
+*.log

.travis.yml

@@ -2,10 +2,10 @@ language: node_js
 node_js:
   - "5.7.0"
 script:
-  - "npm update"
-  - "node node_modules/kindscript/built/kind.js buildtarget"
-  - "node node_modules/kindscript/built/kind.js travis"  
-  - "node node_modules/kindscript/built/kind.js uploaddoc"
+  - "node node_modules/pxt-core/built/pxt.js travis"  
+  - "(cd libs/lang-test0; node ../../node_modules/pxt-core/built/pxt.js run)"
+  - "node node_modules/pxt-core/built/pxt.js uploaddoc"
+  - "(cd libs/hello; node ../../node_modules/pxt-core/built/pxt.js testconv ../../testconv.json)"
 sudo: false
 notifications:
   email:

.vscode/tasks.json

@@ -1,7 +1,7 @@
 {
 	"version": "0.1.0",
 	// Task runner is jake
-	"command": "kind",
+	"command": "pxt",
 	// Need to be executed in shell / cmd
 	"isShellCommand": true,
 	"showOutput": "always",

README.md

@@ -1,48 +1,26 @@
-# micro:bit target for KindScript
+# micro:bit target for PXT
 
-This target allow to program a [BBC micro:bit](https://www.microbit.co.uk/) using [KindScript](https://github.com/Microsoft/kindscript).
+This target allow to program a [BBC micro:bit](https://www.microbit.co.uk/) using 
+[Microsoft Programming Experience Toolkit](https://github.com/Microsoft/pxt).
 
-[![Build Status](https://travis-ci.org/Microsoft/kindscript-microbit.svg?branch=master)](https://travis-ci.org/Microsoft/kindscript-microbit)
+[![Build Status](https://travis-ci.org/Microsoft/pxt-microbit.svg?branch=master)](https://travis-ci.org/Microsoft/pxt-microbit)
 
 # Getting started
 
-> If you're making changes to kindscript repository itself, proceed to **Local installation** below.
+Please follow instructions at https://github.com/Microsoft/pxt#running-a-target-from-localhost 
 
-* Clone this repo and run
+## Universal Windows App
 
-```
-npm install
-```
+The Windows 10 app is a [Universal Windows Hosted Web App](https://microsoftedge.github.io/WebAppsDocs/en-US/win10/CreateHWA.htm)
+that wraps codemicrobit.com and provides additional features.
 
-* Install the `KindScript` tool and launch the local server:
+### Sideloading
 
-```
-npm install -g kindscript-cli
-kind serve
-```
-To re-build the `built/target.json` file, re-run `kind serve`.
+* Open Windows **settings** and search for **Developer options**
+* Enable the developer mode.
+* Find the latest build under ``win10/app/AppPackages/latest`` and run the ``Add-AppDevPackage.ps1`` PowerShell script (mouse right-click, then `run with PowerShell`)
 
+### Building
 
-## Local installation
-
-* Clone and build [KindScript](https://github.com/Microsoft/kindscript) in a `kindscript` folder.
-* Clone this repo  in a `kindscript-microbit` folder next to `kindscript`
-
-```
-npm install
-```
-* To build and deploy new changes
-
-```
-npm install -g kindscript-cli
-cd ../kindscript
-jake
-cd ../kindscript-microbit
-npm link ../kindscript
-```
-* run this command to build and launch a local editor
-
-```
-kind serve
-```
-* open `localhost:3232` to try your editor!
+* Install Visual Studio 2015 Update 2 or higher. Make sure the Windows 10 templates are installed.
+* open the ``win10/app.sln`` solution and launch the ``codemicrobit`` project.

cmds/cmds.ts

@@ -1,4 +1,4 @@
-/// <reference path="../node_modules/kindscript/built/kind.d.ts"/>
+/// <reference path="../node_modules/pxt-core/built/pxt.d.ts"/>
 
 import * as fs from 'fs';
 import * as path from 'path';
@@ -7,7 +7,7 @@ import * as child_process from 'child_process';
 let writeFileAsync: any = Promise.promisify(fs.writeFile)
 let execAsync: (cmd: string, options?: { cwd?: string }) => Promise<Buffer> = Promise.promisify(child_process.exec)
 
-export function deployCoreAsync(res: ts.ks.CompileResult) {
+export function deployCoreAsync(res: ts.pxt.CompileResult) {
     return getBitDrivesAsync()
         .then(drives => {
             if (drives.length == 0) {
@@ -40,4 +40,4 @@ function getBitDrivesAsync(): Promise<string[]> {
     } else {
         return Promise.resolve([])
     }
-}
+}

docs/about.md

@@ -1,3 +1,26 @@
+```sim
+basic.forever(() => {
+  basic.showString("Hi!");
+})
+input.onButtonPressed(Button.A, () => {
+    led.stopAnimation();
+    basic.showLeds(`
+. . . . .
+. # . # .
+. . . . .
+# . . . #
+. # # # .`);
+});
+input.onButtonPressed(Button.B, () => {
+    led.stopAnimation();
+    basic.showLeds(`
+. # . # .
+# . # . #
+# . . . #
+. # . # .
+. . # . .`);
+});
+``` 
 # About
 
 The [BBC micro:bit](https://www.microbit.co.uk) is a [pocket-size computer](/device) with a 5x5 display of 25 LEDs, Bluetooth and sensors that can be programmed by anyone.
@@ -27,28 +50,9 @@ which flashes the micro:bit device with the new program.
 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.
 
-```sim
-input.onButtonPressed(Button.A, () => {
-    basic.showLeds(`
-. . . . .
-. # . # .
-. . . . .
-# . . . #
-. # # # .`);
-});
-input.onGesture(Gesture.Shake, () => {
-    basic.showLeds(`
-. . . . .
-. # . # .
-. . . . .
-. # # # .
-# . . . #`);
-});
-``` 
-
 ## C++ Runtime
 
-The C++ BBC micro:bit library, created at [Lancaster University](http://www.lancaster.ac.uk/), provides access to the hardware functions of the micro:bit, 
+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. 
 When code is compiled to ARM machine code, the calls to JavaScript micro:bit functions are replaced with calls to the corresponding C++ functions.

docs/device.md

@@ -4,121 +4,84 @@ All the bits and pieces that make up your BBC micro:bit
 
 ![](/static/mb/device-0.png)
 
-### Lights
+### LED Screen and Status LED
 
-### What are the red lights on the front?
+The red lights are [LEDs](/device/screen) (light emitting diodes) and form a 5 x 5 LED Screen. 
+They can be set to on/off and the brightness can be controlled.
 
-The red lights are [LEDs](/microbit/device/screen) (light emitting diodes) and form a 5 x 5 grid. They can be set to on/off and the brightness can be controlled.
-
-### What is the yellow light on the back of the micro:bit?
-
-It is the status LED. It flashes yellow when the system wants to tell the user that something has happened.
+The yellow light on the back of the micro:bit is the status LED.
+It flashes yellow when the system wants to tell the user that something has happened.
 
 ### Buttons
 
-### What are the buttons for?
+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.
 
-Buttons A and B are a form of input. They detect when the button is being pressed. When you press one of the buttons, 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.
+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.
 
-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.
-
-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.**
+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.**
 
 To continue programming your micro:bit YOU MUST unplug your USB and reconnect it. Check that the drive now shows as MICROBIT.
 
-**Use with caution. If you click on the drive while it shows as MAINTENANCE, you can see which version of firmware you have running on your micro:bit. Firmware on your micro:bit should be up-to-date already. You can find the version of firmware in the 'version.txt' file on the micro:bit. Further information on the firmware can be found here:
+**Use with caution. If you click on the drive while it shows as MAINTENANCE, 
+you can see which version of firmware you have running on your micro:bit. 
+Firmware on your micro:bit should be up-to-date already. 
+You can find the version of firmware in the 'version.txt' file on the micro:bit. Further information on the firmware can be found here:
 
 https://developer.mbed.org/platforms/Microbit/#firmware
 
 ### Compass
 
-### Why is there a compass on the micro:bit?
-
-The compass can detect magnetic fields such as the Earth’s magnetic field. As the micro:bit has this compass, it is possible to detect the direction it is moving in. The micro:bit can detect where it is facing and movement in degrees. This data can be used by the micro:bit in a program or be sent to another device.
+The compass can detect magnetic fields such as the Earth’s magnetic field. 
+As the micro:bit has this compass, it is possible to detect the direction it is moving in. 
+The micro:bit can detect where it is facing and movement in degrees. 
+This data can be used by the micro:bit in a program or be sent to another device.
 
 ### Accelerometer
 
-### Why is there an accelerometer on the micro:bit?
+There is a 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.
 
-There is a 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.
+### Pins
 
-### PINS
-
-### What are the rings labelled 0, 1, 2 on the bottom edge of the micro:bit?
-
-These are labels for the input/output pins P0, P1, P2, which you can attach external sensors to such as thermometers or moisture detectors. The pins can be a form of input or output. You can read more about large and small pins [here](/microbit/device/pins).
+The pins can be a form of input or output. 
+There are labels for the input/output pins P0, P1, P2, which you can attach external sensors to such as thermometers or moisture detectors. 
+You can read more about large and small pins [here](/device/pins).
 
 ### How do I connect the micro:bit to my computer?
 
-It can be connected to your computer or device with a micro USB. Data can be sent and received between the micro:bit and the computer so programs can be downloaded from Windows and Macs onto the micro:bit via this USB data connection. You can read more information on how to run scripts on your micro:bit [here](/microbit/device/usb), and about the error messages you might get [here](/microbit/device/error-codes).
+Your micro:bit can be connected to your computer via a micro USB cable. 
+Data can be sent and received between the micro:bit and the computer so programs 
+can be downloaded from Windows, Macs and Chromebooks onto the micro:bit via this USB data connection. 
+You can read more information on how to run scripts on your micro:bit [here](/device/usb), 
+and about the error messages you might get [here](/device/error-codes).
 
-### Batteries
+### Powering your micro:bit
 
-### How do I power my 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 isn’t connected to your computer, tablet or mobile, you will need 2 x AAA 1.5 V batteries to power it.
 
-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. 
+You can attach an external device such as a motor to these and power it using the battery or USB.
 
-### 3V GND
+### Serial Communication
 
-### What are the rings labelled 3V and GND?
+The BBC micro:bit can send an receive data via [serial communication](/device/serial). The serial data can be transfered via USB or BlE.
 
-The pins labelled 3V and GND are the power supply pins. You can attach an external device such as a motor to these and power it using the battery or USB.
+### Bluetooth Low Energy (BLE) Antenna
 
-### What is a Bluetooth Low Energy Antenna?
-
-You will see this labelled BLE ANNTENA on the back of your micro:bit. It is for a messaging service, built for the Internet of Things 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 control the micro:bit or the micro:bit can control another BLE device.
-
-### What is Bluetooth Low Energy?
-
-Bluetooth wireless technology was developed as an alternative to data cables and allowed wireless communication between devices such as PCs, smartphones and tablets. Bluetooth® Smart or Bluetooth Low Energy is a power-friendly version of Bluetooth wireless technology.
-
-### What is the Internet of Things?
-
-The Internet of Things (IoT) was first talked about more than 15 years ago, when it was speculated that objects and people would be able to connect wirelessly over the internet.  Objects can be detected and controlled remotely, allowing greater integration between the physical and computer based world.  It will let you to remotely control your alarm system, thermostat or lights in your home. It has many applications in different fields including manufacturing, health and fitness, consumer electronics and the home.
+You will see the label BLE ANNTENA 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 
+control the micro:bit or the micro:bit can control another BLE device.
 
 ### Technical Information
 
-The micro:bit has been designed to be a bare-board micro controller for use by children aged 11-12. The device has been through extensive safety and compliance testing to the following standards:
-
-### Safety
-
-IEC 60950-1:2005 (Second Edition) + Am 1:2009 + Am 2:2013
-
-### EMC
-
-EN 55032: 2012
-
-EN 55024: 2010
-
-EN 55022:2010
-
-EN 301 489-1 V1.9.2 (2011-09)
-
-EN 301 489-17 V2.2.1 (2012-09)
-
-### Radio Spectrum
-
-ETSI EN 300 328 V1.9.1 (2015-02)
-
-EN 62479:2010
-
-### Chemical
-
-Restriction of Hazardous Substances (RoHS) 2011/65/EU Annex II article 4(1)
-
-EN71-3:2013 + A1:2014 - Migration of certain elements.
-
-Analysis of the 163 substances of very high concern (SVHC) on the Candidate List for authorization, concerning Regulation (EC) No. 1907/2006 as published on the European Chemicals Agency (ECHA) website.
-
-![](/static/mb/device-1.jpg)
-
-The micro:bit device features Bluetooth Low Energy radio. The radio on the device operates in the following frequencies:
-
-Frequency Range: 2402MHz to 2480MHz
-
-Bluetooth Version: V4.0 Bluetooth Low Energy
-
-### Declaration of Conformity
-
-The document can be downloaded by clicking here for the [Declaration of Conformity](https://microbit0.blob.core.windows.net/pub/hkeghjes/declaration-of-conformity.pdf)
-
+The micro:bit has been designed to be a bare-board micro controller for use by children aged 11-12. 
+More information is available at the [BBC web site](http://www.microbit.co.uk/device).

docs/device/contents.md

@@ -4,18 +4,18 @@ The micro:bit device #docs
 
 The micro:bit is a very capable device with many components:
 
-* [the USB connector](/microbit/device/usb)
-* [the LED screen](/microbit/device/screen)
+* [the USB connector](/device/usb)
+* [the LED screen](/device/screen)
 * [the buttons]
 * [the accelerometer]
 * [the compass]
-* [the pins](/microbit/device/pins)
+* [the pins](/device/pins)
 * [the battery plug]
 
 The micro:bit embodies many fundamental concepts in computer science. To learn more, read:
 
-* [the micro:bit - a reactive system](/microbit/device/reactive)
+* [the micro:bit - a reactive system](/device/reactive)
 
 Sometimes, your micro:bit may display an error code. For more information, see:
 
-* [the error codes](/microbit/device/error-codes)
+* [the error codes](/device/error-codes)

docs/device/crocodile-clips.md

@@ -1,8 +1,7 @@
 # crocodile clips
 
-The on pin pressed accessories. 
-
-Register an [event handler](/microbit/reference/event-handler) that will execute whenever the user attaches one side of the crocodile clip to the `GND` pin, then connects and disconnects the unattached side of the crocodile clip to pin `0`, `1`, or `2`.
+The large holes at the bottom of the board are designed to attach alligator/crocodile clips.
+Register an event that will execute whenever the user attaches one side of the crocodile clip to the `GND` pin, then connects and disconnects the unattached side of the crocodile clip to pin `0`, `1`, or `2`.
 
 ### Example: on pin pressed with random numbers
 
@@ -18,9 +17,9 @@ This example displays a random number every time the crocodile clip holds  `GND`
 
 ### Lessons
 
-[love meter](/microbit/lessons/love-meter)
+[love meter](/lessons/love-meter)
 
 ### See also
 
-[micro:bit pins](/microbit/device/pins), [pin is pressed](/microbit/reference/input/pin-is-pressed), [analog read pin](/microbit/reference/pins/analog-read-pin), [analog write pin](/microbit/reference/pins/analog-write-pin), [digital read pin](/microbit/reference/pins/digital-read-pin), [digital write pin](/microbit/reference/pins/digital-write-pin)
+[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/error-codes.md

@@ -13,5 +13,5 @@ Below is a list of error numbers and what they mean:
 
 ### See also
 
-[Run scripts on your micro:bit](/microbit/device/usb)
+[Run scripts on your micro:bit](/device/usb)
 

docs/device/reactive.md

@@ -18,7 +18,7 @@ The micro:bit is a *reactive system* – it reacts continuously to external even
 
 We want reactive systems to be responsive, which means to react in a timely manner to events. For example, when you play a computer game, it’s frustrating if you press a button to make a character jump, but it doesn’t immediately jump.  A delay in reacting, or lack of responsiveness , can be the difference between life and death, both in the real and virtual worlds.
 
-Let’s consider a simple example: you want to program your micro:bit to accurately count the number of times the A button has been pressed and continuously display the current count on the 5x5 [LED screen](/microbit/device/screen).   Because the LED screen is small, we can only display one digit of a number at a time on it. The [show number](/microbit/reference/basic/show-number) function will scroll the digits of a number across the screen so you can read it.
+Let’s consider a simple example: you want to program your micro:bit to accurately count the number of times the A button has been pressed and continuously display the current count on the 5x5 [LED screen](/device/screen).   Because the LED screen is small, we can only display one digit of a number at a time on it. The [show number](/reference/basic/show-number) function will scroll the digits of a number across the screen so you can read it.
 
 Let’s say that the current count is 42 and the number 42 is scrolling across the LED screen. This means there is some code executing to perform the scroll.  So, what should happen if you press the A button during the scroll?  It would be a bad idea to ignore the button press, so some code should record the occurrence of the button press. But we just said there already is code running in order to scroll the number 42!  If we wait until the code scrolling the 42 has finished to look for a button press, we will miss the button press.  We want to avoid this sort of unresponsiveness.
 
@@ -52,7 +52,7 @@ The first job of the scheduler is to allow multiple *subprograms* to be queued u
 
 ```
 export function countButtonPresses() {
-    input.onButtonPressed("A", () => {
+    input.onButtonPressed(Button.A, () => {
         count = count + 1
     })
     basic.forever(() => {
@@ -65,7 +65,7 @@ export function countButtonPresses() {
 The program above contains three statements that execute in order from top to bottom. The first statement
 
 ```
-input.onButtonPressed("A", () => {
+input.onButtonPressed(Button.A, () => {
     count = count + 1
 })
 ```
@@ -132,14 +132,14 @@ As a result, you can easily add a new capability to the micro:bit by just adding
 
 ```
 export function countButtonPressesWithReset() {
-    input.onButtonPressed("A", () => {
+    input.onButtonPressed(Button.A, () => {
         count = count + 1
     })
     basic.forever(() => {
         basic.showNumber(count, 150)
     })
     count = 0
-    input.onButtonPressed("B", () => {
+    input.onButtonPressed(Button.B, () => {
         count = 0
     })
 }

docs/device/screen.md

@@ -2,7 +2,9 @@
 
 The micro:bit LED screen 
 
-![](/static/mb/device/screen-0.png)
+```sim
+basic.showString(" ");
+```
 
 The micro:bit LED screen consists of 25 red LED lights arranged in a 5X5 grid (5 LEDs across by 5 LEDs down).
 
@@ -30,28 +32,38 @@ Since the row and column numbers start at 0, an easy way to figure out the x, y
 
 ### Turn a LED on/off
 
-Use [plot](/microbit/led/plot) and [unplot](/microbit/led/unplot) to turn a LED on or 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)
+```
 
 ### Is a LED on/off?
 
-Use the [point](/microbit/led/point) function to find out if a LED is on or off.
+Use the [point](/reference/led/point) function to find out if a LED is on or off.
+
+```blocks
+if(led.point(0,0)) {
+}
+```
 
 ### Display images, strings and numbers
 
-Instead of turning individual LEDs on or off, as above, you can display an [image](/microbit/reference/image/image) directly to the screen or show text/numbers on screen using the [show number](/microbit/reference/basic/show-number)/[show string](/microbit/reference/basic/show-string) function.
+Instead of turning individual LEDs on or off, as above, you can display an [image](/reference/images/image) directly to the screen or show text/numbers on screen using the [show number](/reference/basic/show-number)/[show string](/reference/basic/show-string) function.
 
 ### The display buffer
 
 The micro:bit runtime keeps an in-memory representation of the state of all 25 LEDS. This state is known as the "display buffer" and controls which LEDS are on and which are off. The plot/unplot/point functions access the display buffer directly. On the other hand, the functions that show an image, number or string overwrite the buffer completely. To illustrate, first try running this code sequence
 
-```
-basic.showString("d", 150)
+```blocks
+basic.showString("d")
 led.plot(0, 0)
 ```
 
 You will see the letter "d" displayed as well as the LED in position `0,0` lit up. Now try reversing the order of the two statements above:
 
-```
+```blocks
 led.plot(0, 0)
 basic.showString("d", 150)
 ```

docs/device/serial.md

@@ -0,0 +1,64 @@
+# Serial
+
+The [serial](/reference/serial) supports [serial communication](https://en.wikipedia.org/wiki/Serial_port) between the BBC micro:bit and another computer. Basically, this allows you to send data from the micro:bit to your own computer. This is very useful for debugging purposes: you can add `write line` statements in your code and see them display on your computer as the program executes.
+
+The code below shows a simple script that sends a line when the BBC micro:bit starts and another line each time the button ``A`` is pressed.
+
+```blocks
+serial.writeLine("started...")
+input.onButtonPressed(Button.A, () => {
+    serial.writeLine("A pressed")
+})
+```
+
+## How to read the micro:bit's serial output from your computer
+
+Unfortunately, using the serial library requires quite a bit of a setup.
+
+### 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.
+
+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.
+
+* Hit `File` > `New Connection`
+* Check "Serial"; in the dropdown menu, pick the COM port that says "mbed Serial Port". Hit `Ok`.
+* In the menus, hit `Setup` > `Serial Port` and set the baud rate to `115200`.
+
+You should be good. Feel free to hit `Setup` > `Save Setup` in the menus to erase the default configuration file with a new one so that you don't have to type in the settings again.
+
+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
+
+If you prefer another terminal emulator (such as [PuTTY](http://www.putty.org/)), here are some instructions.
+
+* Open Windows's [Device Manager](https://windows.microsoft.com/en-us/windows/open-device-manager); expand the section called "Ports (COM & LPT)"; write down the com number for "mbed Serial Port" (e.g. COM14)
+* Open PuTTY; on the main screen, use the following settings: Serial / COM14 / 115200. Replace COM14 with the COM port number you wrote down previously. Feel free to type in a name and hit "Save" to remember this configuration.
+
+![](/static/mb/serial-library-0.png)
+
+* (optional): in the "Terminal" section, check "implicit cr in every lf"
+
+![](/static/mb/serial-library-1.png)
+
+### Linux
+
+(Untested).
+
+* Plug in the micro:bit
+* Open a terminal
+* `dmesg | tail` will show you which `/dev/` node the micro:bit was assigned (e.g. `/dev/ttyUSB0`)
+* Then, do: `screen /dev/ttyUSB0 115200` (install the `screen` program if you don't have it). To exit, run `Ctrl-A` `Ctrl-D`.
+
+Alternative programs include minicom, etc.
+
+### Mac OS
+
+* Plug in the micro:bit
+* Open a terminal
+* `ls /dev/cu.*` will return to you a list of serial devices; one of them will look like `/dev/cu.usbmodem1422` (the exact number depends on your computer)
+* `screen /dev/cu.usbmodem1422 115200` will open up the micro:bit's serial output. To exit, hit `Ctrl-A` `Ctrl-D`.

docs/device/simulator.md

@@ -0,0 +1,25 @@
+# Simulator
+
+The JavaScript simulator allows to test and execute most BBC micro:bit programs in the browser.
+It allows to emulate sensor data or user interactions.
+
+```sim
+input.onButtonPressed(Button.A, () => {
+   basic.showString("A");
+});
+input.onButtonPressed(Button.B, () => {
+   basic.showString("B");
+});
+input.onPinPressed(TouchPin.P0, () => {
+   basic.showString("0");
+});
+input.onPinPressed(TouchPin.P1, () => {
+   basic.showString("1");
+});
+input.onPinPressed(TouchPin.P2, () => {
+   basic.showString("2");
+});
+input.temperature()
+input.compassHeading()
+input.lightLevel()
+```

docs/device/usb.md

@@ -1,8 +1,8 @@
 # Run Scripts on your micro:bit
 
-How to compile, transfer, and run a script on your micro:bit. #docs #USB #compile #transfer
+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](/microbit/js/simulator) for info about this).
+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).
 
 Once your masterpiece is complete, you can compile your script and run it on your micro:bit.
 
@@ -31,12 +31,6 @@ Windows
 Mac (picture bvabdbco)
 WARN: unknown picture: bvabdbco:5x3
 
-### ~hide
-
-If your computer doesn't recognise your micro:bit, please see [troubleshooting USB problems](/microbit/diagnosing-usb).
-
-### ~
-
 ## Step 2: Compile your script
 
 Next, compile your script:
@@ -133,5 +127,5 @@ Or it may appear that there are two hex files on your micro:bit so the micro:bit
 
 ### See also
 
-[Run code in a browser](/microbit/js/simulator)
+[Run code in a browser](/device/simulator)
 

docs/docs.md

@@ -2,6 +2,6 @@
 
 Welcome to the documentation.
 
-* Browse the [reference](/microbit/reference)
-* Learn more about the [device](/microbit/device)
-* Get started with [lessons](/microbit/lessons)
+* Browse the [reference](/reference)
+* Learn more about the [device](/device)
+* Get started with [lessons](/lessons)

docs/lessons.md

@@ -1,6 +1,5 @@
 # Lessons 
 
-Overview of lessons for the BBC micro:bit.
 
 ### @short Lessons
 
@@ -8,19 +7,19 @@ Overview of lessons for the BBC micro:bit.
 
 ## Beginner
 
-* [Beautiful Image](/microbit/lessons/beautiful-image), show a beautiful image with show LEDs
-* [Lucky 7](/microbit/lessons/lucky-7), show a number on the LED screen with show number
-* [Answering Machine](/microbit/lessons/answering-machine), show a text message with show string
-* [Game of Chance](/microbit/lessons/game-of-chance), show a text message with game over
-* [Smiley,](/microbit/lessons/smiley) smiley and frowney faces that transition on button pressed
-* [Magic Logo,](/microbit/lessons/magic-logo) show an image on logo up
-* [Snowflake Fall](/microbit/lessons/snowflake-fall), repeat a series of images with forever
-* [Screen Wipe](/microbit/lessons/screen-wipe), turn off the LEDs with clear screen
-* [Flashing Heart](/microbit/lessons/flashing-heart), display images with a pause
-* [Blink](/microbit/lessons/blink), turn an LED on and off with plot
-* [Night Light](/microbit/lessons/night-light), dim the LEDs with set brightness
-* [Game Counter](/microbit/lessons/game-counter), displays the player's score with score and add points to score
-* [Happy Birthday](/microbit/lessons/happy-birthday), create a popular song
+* [Beautiful Image](/lessons/beautiful-image), show a beautiful image with show LEDs
+* [Lucky 7](/lessons/lucky-7), show a number on the LED screen with show number
+* [Answering Machine](/lessons/answering-machine), show a text message with show string
+* [Game of Chance](/lessons/game-of-chance), show a text message with game over
+* [Smiley,](/lessons/smiley) smiley and frowney faces that transition on button pressed
+* [Magic Logo,](/lessons/magic-logo) show an image on logo up
+* [Snowflake Fall](/lessons/snowflake-fall), repeat a series of images with forever
+* [Screen Wipe](/lessons/screen-wipe), turn off the LEDs with clear screen
+* [Flashing Heart](/lessons/flashing-heart), display images with a pause
+* [Blink](/lessons/blink), turn an LED on and off with plot
+* [Night Light](/lessons/night-light), dim the LEDs with set brightness
+* [Game Counter](/lessons/game-counter), displays the player's score with score and add points to score
+* [Happy Birthday](/lessons/happy-birthday), create a popular song
 
 ### ~
 
@@ -28,44 +27,46 @@ Overview of lessons for the BBC micro:bit.
 
 ## Intermediate
 
-* [Magic 8](/microbit/lessons/magic-8), a fortune teller game with the BBC micro:bit
-* [Guess the Number](/microbit/lessons/guess-the-number),  guess a random number with pick number
-* [Counter](/microbit/lessons/counter), display a number with a variable
-* [Love Meter](/microbit/lessons/love-meter), create a love meter with on pin pressed
-* [Rock Paper Scissors](/microbit/lessons/rock-paper-scissors), create the classic game of rock paper scissors with if statement
-* [Truth or Dare](/microbit/lessons/truth-or-dare), a game that forces each player to reveal a secret or do something funny with if statement
-* [Spinner](/microbit/lessons/spinner), spin the arrow with multiple if statements
-* [Die Roll](/microbit/lessons/die-roll), spin with more if statements
-* [Looper](/microbit/lessons/looper), display a series of numbers with a for loop index
-* [Strobe Light](/microbit/lessons/strobe-light), develop shapes with a nested for loops
-* [Temperature](/microbit/lessons/temperature), get the ambient temperature (degree Celsius °C)
-* [Digi Yoyo](/microbit/lessons/digi-yoyo), create a counter with a while loop
-* [Rotation Animation](/microbit/lessons/rotation-animation), control an animation with a boolean variable
-* [Compass](/microbit/lessons/compass), displays the direction the BBC micro:bit is pointing with compass
-* [Zoomer](/microbit/lessons/zoomer), measure the force with acceleration
-* [Glowing Pendulum](/microbit/lessons/glowing-pendulum), construct a pendulum that glows using acceleration
-* [Classic Beatbox](/microbit/lessons/classic-beatbox), make a beatbox music player with variables
-* [Light Beatbox](/microbit/lessons/light-beatbox), make a beatbox music player with light level
+* [Magic 8](/lessons/magic-8), a fortune teller game with the BBC micro:bit
+* [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
+* [Die Roll](/lessons/die-roll), spin with more if statements
+* [Looper](/lessons/looper), display a series of numbers with a for loop index
+* [Strobe Light](/lessons/strobe-light), develop shapes with a nested for loops
+* [Temperature](/lessons/temperature), get the ambient temperature (degree Celsius °C)
+* [Digi Yoyo](/lessons/digi-yoyo), create a counter with a while loop
+* [Rotation Animation](/lessons/rotation-animation), control an animation with a boolean variable
+* [Compass](/lessons/compass), displays the direction the BBC micro:bit is pointing with compass
+* [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](/microbit/lessons/the-watch), design and create The Watch
-* [Hack your Headphones](/microbit/lessons/hack-your-headphones), create music on the BBC micro:bit by hacking your headphones
-* [Banana Keyboard](/microbit/lessons/banana-keyboard), create music with fruits
-* [Telegraph](/microbit/lessons/telegraph), play the telegraph game between two BBC micro:bits
-* [Ornament Chain](/microbit/lessons/ornament-chain), play the ornament chain game between two BBC micro:bits
+* [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
 
 ## Advanced
-
-* [Hero](/microbit/lessons/hero), reconstruct the classic arcade game pac man with the BBC micro:bit
-
+* [Charting](/lessons/charting), create a charting app between 2 BBC micro:bits
+* [Prank WiFi](/lessons/prank-wifi), create fake WiFi to trick your friends
+* [Speed Button](/lessons/speed-button), code a speed game with running time
+* [Headbands](/lessons/headbands), create a charades game with a collection of strings that hold the words
+* [Hero](/lessons/hero), reconstruct the classic arcade game pac man with the BBC micro:bit
+* [Catch the Egg](/lessons/catch-the-egg-game), catch falling eggs in a basket with an acceleration controller
 ### ~
 
 ### @section full
 
-The lessons promote computational thinking and computer science literacy[ read more...](/microbit/lessons/teach)
+The lessons promote computational thinking and computer science literacy[ read more...](/lessons/teach)
 

docs/lessons/answering-machine.md

@@ -10,14 +10,11 @@ Show String
 
 ## Quick Links
 
-* [activity](/microbit/lessons/answering-machine/activity)
-* [quiz](/microbit/lessons/answering-machine/quiz)
-* [quiz answers](/microbit/lessons/answering-machine/quiz-answers)
-* [challenges](/microbit/lessons/answering-machine/challenges)
+* [activity](/lessons/answering-machine/activity)
+* [quiz](/lessons/answering-machine/quiz)
+* [quiz answers](/lessons/answering-machine/quiz-answers)
+* [challenges](/lessons/answering-machine/challenges)
 
-## Class
-
-Year 7
 
 ## Prior learning / place of lesson in scheme of work
 
@@ -25,56 +22,17 @@ Learn how to creating a message with a **string**, `show string` to write your m
 
 ## Documentation
 
-* **show string** : [read more...](/microbit/reference/basic/show-string)
-* **on button pressed** : [read more...](/microbit/reference/input/on-button-pressed)
+```cards
+basic.showString('Hi!')
+input.onButtonPressed(Button.A, () => {})
+
+```
+
+
+* **on button pressed** : [read more...](/reference/input/on-button-pressed)
 
 ## Objectives
 
 * learn how to show a string on the LED screen one character at a time
 * learn how to use to register an event handler that will execute whenever an input button is pressed
 
-## Progression Pathways / Computational Thinking Framework
-
-#### Algorithms
-
-* Uses diagrams to express solutions.(AB)
-*  Uses logical reasoning to predict  outputs, showing an awareness of inputs (AL)
-* Represents solutions using a structured notation (AL) (AB)
-
-#### Programming & Development
-
-* Creates programs that implement algorithms to achieve given goals (AL)
-
-#### Hardware & Processing
-
-* Knows that computers collect data from various input devices, including sensors and application software (AB)
-
-#### Communication Networks
-
-* Demonstrates responsible use of technologies and online services, and knows a range of ways to report concerns (AL)
-
-#### Information Technology
-
-* Collects, organizes, and presents data and information in digital content (AB)
-* Makes appropriate improvements to solutions based on feedback received, and can comment on the success of the solution (EV)
-* Uses criteria to evaluate the quality of solutions, can identify improvements making some refinements to the solution, and future  solutions (EV)
-* Evaluates the appropriatness of digital devices, internet services and application software to achieve given goals (EV)
-* Recognises ethical issues surrounding the application of information technology beyond school.
-
-Computational Thinking Concept: AB = Abstraction; DE = Decomposition; AL = Algorithmic Thinking; EV = Evaluation; GE = Generalisation
-
-## Activity
-
-* time: 20 min.
-* [activity](/microbit/lessons/answering-machine/activity)
-* [quiz](/microbit/lessons/answering-machine/quiz)
-
-## Extended Activity
-
-* time: 20 min.
-* [challenges](/microbit/lessons/answering-machine/challenges)
-
-## Homework
-
-* Extended Activity: [challenges](/microbit/lessons/answering-machine/challenges)
-

docs/lessons/answering-machine/activity.md

@@ -18,7 +18,7 @@ basic.showString("ASK ME A QUESTION")
 
 ### ~avatar boothing
 
-Excellent, you're ready to continue with the [challenges](/microbit/lessons/answering-machine/challenges)!
+Excellent, you're ready to continue with the [challenges](/lessons/answering-machine/challenges)!
 
 ### ~
 

docs/lessons/answering-machine/challenges.md

@@ -4,7 +4,7 @@ Coding challenges for the answering machine tutorial.
 
 ## Before we get started
 
-Complete the [answering machine](/microbit/lessons/answering-machine/activity) activity and your code will look like this:
+Complete the [answering machine](/lessons/answering-machine/activity) activity and your code will look like this:
 
 ```blocks
 basic.showString("ASK ME A QUESTION")

docs/lessons/answering-machine/quiz-answers.md

@@ -1,8 +1,8 @@
 # answering machine blocks quiz answers
 
-Create an answering machine on the micro:bit. #LED #screen #show #math #docs #input
+Create an answering machine on the micro:bit.
 
-This is the answer key for the [answering machine quiz](/microbit/lessons/answering-machine/quiz).
+This is the answer key for the [answering machine quiz](/lessons/answering-machine/quiz).
 
 ## 1. Define what `show string` does?
 
@@ -32,5 +32,10 @@ basic.showString("Hi")
 
 ![](/static/mb/lessons/answering-machine-2.png)
 
-![](/static/mb/blocks/lessons/answering-machine-5.png)
+
+```blocks
+basic.showString("Z")
+
+```
+
 

docs/lessons/answering-machine/quiz.md

@@ -1,12 +1,12 @@
 # answering machine blocks quiz
 
-Create an answering machine on the micro:bit. #LED #screen #show #math #docs #input
+Create an answering machine on the micro:bit.
 
 ## Name
 
 ## Directions
 
-Use this activity document to guide your work in the [answering machine activity](/microbit/lessons/answering-machine/activity).
+Use this activity document to guide your work in the [answering machine activity](/lessons/answering-machine/activity).
 
 Answer the questions while completing the activity. Pay attention to the dialogues!
 

docs/lessons/banana-keyboard.md

@@ -1,6 +1,6 @@
 # banana keyboard blocks lesson
 
-display beautiful images on the BBC micro:bit #var #pause #docs
+display beautiful images on the BBC micro:bit.
 
 ## Topic
 
@@ -8,11 +8,7 @@ Music
 
 ## Quick Links
 
-* [activity](/microbit/lessons/banana-keyboard/activity)
-
-## Class
-
-Year 7
+* [activity](/lessons/banana-keyboard/activity)
 
 ## Prior learning/place of lesson in scheme of work
 

docs/lessons/banana-keyboard/activity.md

@@ -79,5 +79,22 @@ Your banana keyboard is ready!
 
 ### Step 10
 
-Connect your micro:bit to your computer using your USB cable and run the [banana keyboard](/microbit/lhpkbr) script on it. Tap your banana instrument to play sound against... the fruit!
+Connect your micro:bit to your computer using your USB cable and run this script:
+```blocks
+let sound = music.noteFrequency(Note.C);
+input.onPinPressed(TouchPin.P1, () => {
+    for (let i = 0; i < 5; i++) {
+        sound = sound + 25;
+        music.playTone(sound, music.beat(BeatFraction.Sixteenth));
+    }
+});
+```
 
+Tap your banana instrument to play sound against... the fruit!
+
+
+### ~avatar boothing
+
+Excellent, you're ready to continue with the [challenges](/lessons/banana-keyboard/challenges)!
+
+### ~

docs/lessons/banana-keyboard/challenges.md

@@ -6,8 +6,6 @@ control images with variables.
 
 Control images with variables. 
 
-To create a new script, go to the [Create Code](/microbit/create-code) page and tap *New Project* under *Block Editor*.
-
 Have you ever tried to making beat box sounds? Let's try making a beatbox with code!
 
 We will register an event handler on the fruit that will execute when two things occur: first, the alligator clip attaches to GND and the other side of the alligator clip is inserted into a banana. Let's start by adding a variable where you can store data. Then rename the variable to "sound". Then set the value of the variable to the note block `A` from the Music drawer. Modify your code so that your code looks like this.

docs/lessons/beatbox.md

@@ -1,62 +0,0 @@
-# beatbox blocks lesson
-
-display beautiful images on the BBC micro:bit #var #pause #docs
-
-## Topic
-
-Music
-
-## Quick Links
-
-* [activity](/microbit/lessons/beatbox/activity)
-* [challenges](/microbit/lessons/beatbox/challenges)
-
-## Class
-
-Year 7
-
-## Prior learning/place of lesson in scheme of work
-
-Learn how to make a beatbox music player using pins P1 and P2. We will be learning how to code musical notes using a local variable, for loop, on pin pressed as well as simple commands such as play and notes.
-
-## Objectives
-
-* learn how to code music on the BBC micro:bit
-
-## 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)
-* Selects the appropriate data types(AL) (AB
-
-#### Communication Networks
-
-* Demonstrates responsible use of technologies and online services, and knows a range of ways to report concerns Understands how search engines rank search results (AL)
-
-#### Information Technology
-
-* Collects, organizes, and presents data and information in digital content (AB)
-* Makes appropriate improvements to solutions based on feedback received, and can comment on the success of the solution (EV)
-
-Computational Thinking Concept: AB = Abstraction; DE = Decomposition; AL = Algorithmic Thinking; EV = Evaluation; GE = Generalisation
-
-## Activity
-
-* time: 20 min.
-* [activity](/microbit/lessons/beatbox/activity)
-
-## Extended Activity
-
-* time: 20 min.
-* [challenges](/microbit/lessons/beatbox/challenges)
-
-## Homework
-
-* Extended Activity: [challenges](/microbit/lessons/beatbox/challenges)
-

docs/lessons/beautiful-image.md

@@ -1,6 +1,6 @@
 # beautiful image lesson
 
-display beautiful images on the BBC micro:bit #var #pause #docs
+display beautiful images on the BBC micro:bit.
 
 ### @video td/videos/beautiful-image-0
 
@@ -10,12 +10,9 @@ Show LEDs
 
 ## Quick Links
 
-* [activity](/microbit/lessons/beautiful-image/activity)
-* [challenges](/microbit/lessons/beautiful-image/challenges)
+* [activity](/lessons/beautiful-image/activity)
+* [challenges](/lessons/beautiful-image/challenges)
 
-## Class
-
-Year 7
 
 ## Prior learning/place of lesson in scheme of work
 
@@ -23,50 +20,19 @@ Learn how to **show LEDs**,  to show an image on the BBC micro:bit's LED screen.
 
 ## Documentation
 
-* **show LEDs** : [read more...](/microbit/reference/basic/show-leds)
-* **pause** : [read more...](/microbit/reference/basic/pause)
+```cards
+basic.showLeds(`
+    . . . . .
+    . . . . .
+    . . # . .
+    . . . . .
+    . . . . .
+    `)
+basic.pause(100)
+```
 
 ## Objectives
 
 * learn how to display an image on the micro:bit's LED screen
 * learn how to pause your code for the specified number of milliseconds
 
-## Progression Pathways / Computational Thinking Framework
-
-#### Algorithms
-
-* Uses diagrams to express solutions.(AB)
-* Represents solutions using a structured notation (AL) (AB)
-*  Can identify similarities and differences in situations and can use these to solve problems (pattern recognition)(GE)
-
-#### Programming & Development
-
-* Creates programs that implement algorithms to achieve given goals (AL)
-*  Declares and assigns variables(AB)
-* Selects the appropriate data types(AL) (AB
-
-#### Communication Networks
-
-* Demonstrates responsible use of technologies and online services, and knows a range of ways to report concerns Understands how search engines rank search results (AL)
-
-#### Information Technology
-
-* Collects, organizes, and presents data and information in digital content (AB)
-* Makes appropriate improvements to solutions based on feedback received, and can comment on the success of the solution (EV)
-
-Computational Thinking Concept: AB = Abstraction; DE = Decomposition; AL = Algorithmic Thinking; EV = Evaluation; GE = Generalisation
-
-## Activity
-
-* time: 20 min.
-* [activity](/microbit/lessons/beautiful-image/activity)
-
-## Extended Activity
-
-* time: 20 min.
-* [challenges](/microbit/lessons/beautiful-image/challenges)
-
-## Homework
-
-* Extended Activity: [challenges](/microbit/lessons/beautiful-image/challenges)
-

docs/lessons/beautiful-image/activity.md

@@ -1,6 +1,6 @@
 # beautiful image blocks activity
 
-Generate and show a beautiful image. #docs #microbit
+Generate and show a beautiful image.
 
 ### ~avatar avatar
 
@@ -10,8 +10,6 @@ Let's learn how to show an image on the LED screen.
 
 ### ~
 
-To create a new script, go to the [Create Code](/microbit/create-code) page and tap *New Project* under the *Block Editor*.
-
 We will use *show LEDs* to draw an image on the LED screen. This function immediately writes on the screen.
 
 ```blocks
@@ -26,7 +24,7 @@ basic.showLeds(`
 
 ### ~avatar boothing
 
-Excellent, you're ready to continue with the [challenges](/microbit/lessons/beautiful-image/challenges)!
+Excellent, you're ready to continue with the [challenges](/lessons/beautiful-image/challenges)!
 
 ### ~
 

docs/lessons/beautiful-image/challenges.md

@@ -4,7 +4,7 @@ Coding challenges for the beautiful image tutorial.
 
 ## Before we get started
 
-Complete the [beautiful image](/microbit/lessons/beautiful-image/activity) activity and your code will look like this:
+Complete the [beautiful image](/lessons/beautiful-image/activity) activity and your code will look like this:
 
 ```blocks
 basic.showLeds(`

docs/lessons/blink.md

@@ -1,6 +1,6 @@
 # blink blocks lesson
 
-Learn how to create a blinking LED. #LED #screen  #plot #docs #lesson
+Learn how to create a blinking LED.
 
 ### @video td/videos/blink-0
 
@@ -10,41 +10,26 @@ Plot
 
 ## Quick links
 
-* [activity](/microbit/lessons/blink/activity)
-* [quiz](/microbit/lessons/blink/quiz)
-* [quiz answers](/microbit/lessons/blink/quiz-answers)
-* [challenges](/microbit/lessons/blink/challenges)
+* [activity](/lessons/blink/activity)
+* [quiz](/lessons/blink/quiz)
+* [quiz answers](/lessons/blink/quiz-answers)
+* [challenges](/lessons/blink/challenges)
 
-## Class
-
-Year 7
 
 ## Prior learning / place of lesson in scheme of work 
 
 Learn how to control a blinking LED. We will be learning how to create a blinking app using forever as well as simple commands, such as plot, unplot and pause.
 
-## What the teacher needs to know / QuickStart Computing Glossary
-
-**Program:** A stored set of instructions encoded in a language understood by the computer that does some form of computation, processing input and/or stored data to generate output.
-
-**Algorithm:** An unambiguous set of rules or a precise step-by-step guide to solve a problem or achieve a particular objective. The guided tutorial follows a algorithm and is a precise step-by-step guide to solve a problem
-
-**Loop:** A block of code repeated automatically under the program’s control. The blink program introduces Forever. The forever loop repeats code in the background forever.
-
-**Command:** An instruction for the computer to execute, written in a particular programming language.
 
 ## Documentation
 
-* **plot**: [read more...](/microbit/reference/led/plot)
-* **unplot**: [read more...](/microbit/reference/led/unplot)
-* **pause**: [read more...](/microbit/reference/basic/pause)
-* **forever**: [read more...](/microbit/reference/basic/forever)
+```cards
+led.plot(0, 0)
+led.unplot(0, 0)
+basic.pause(100)
+basic.forever(() => {})
+```
 
-## Resources
-
-* Activity: [activity](/microbit/lessons/blink/activity)
-* Activity: [quiz](/microbit/lessons/blink/quiz)
-* Extended Activity: [challenges](/microbit/lessons/blink/challenges)
 
 ## Objectives
 
@@ -52,41 +37,3 @@ Learn how to control a blinking LED. We will be learning how to create a blinkin
 * learn how to turn off LED lights on the LED screen
 * learn how to pause program execution for the specified number of milliseconds
 
-## Progression Pathways / Computational Thinking Framework
-
-#### Algorithms
-
-* Understands that iteration is the repetition of a process such as a loop. (AL)
-
-#### Programming & Development
-
-* Creates programs that implement algorithms to achieve given goals. (AL)
-
-#### Data & Data Representation
-
-* Understands the difference between data and information. (AB)
-* Defines data types: real numbers and Boolean. (AB)
-
-#### Information Technology
-
-*  Collects, organises and presents data and information in digital content. (AB)
-* Makes appropriate improvements to solutions based on feedback received, and can comment on the success of the solution. (EV)
-
-Computational Thinking Concept: AB = Abstraction; DE = Decomposition; AL = Algorithmic Thinking; EV = Evaluation; GE = Generalisation
-
-## Activity
-
-* time: 20 min.
-* [activity](/microbit/lessons/blink/activity)
-* [quiz](/microbit/lessons/blink/quiz)
-* [quiz answers](/microbit/lessons/blink/quiz-answers)
-
-## Extended Activity
-
-* time: 20 min.
-* [challenges](/microbit/lessons/blink/challenges)
-
-## Homework
-
-* Extended Activity: [challenges](/microbit/lessons/blink/challenges)
-

docs/lessons/blink/activity.md

@@ -6,8 +6,6 @@ Turn an LED on and off with forever
 
 ### @video td/videos/blink-0
 
-To create a new script, go to the [Create Code](/microbit/create-code) page and tap *New Project* under *Block Editor*.
-
 ### ~
 
 Have you ever tried to blink a flashlight at night? The concept is fairly simply: turn on the light, wait for a little, turn off the light, wait again, and repeat. That's exactly what we need to code to get a blinking LED.
@@ -50,7 +48,7 @@ basic.forever(() => {
 
 ### ~avatar boothing
 
-Excellent, you're ready to continue with the [challenges](/microbit/lessons/blink/challenges)!
+Excellent, you're ready to continue with the [challenges](/lessons/blink/challenges)!
 
 ### ~
 

docs/lessons/blink/challenges.md

@@ -4,7 +4,7 @@ Coding challenges for the blink tutorial
 
 ## Before we get started
 
-Complete the [blink](/microbit/lessons/blink/activity) activity and your code will look like this:
+Complete the [blink](/lessons/blink/activity) activity and your code will look like this:
 
 ```blocks
 basic.forever(() => {

docs/lessons/blink/quiz-answers.md

@@ -1,8 +1,8 @@
 # blink blocks quiz answers
 
-Learn how to create a blinking LED script. #LED #screen  #plot #docs
+Learn how to create a blinking LED script.
 
-This is the answer key for the [blink quiz](/microbit/lessons/blink/quiz).
+This is the answer key for the [blink quiz](/lessons/blink/quiz).
 
 ## 1. Describe what `plot` does?
 
@@ -10,7 +10,10 @@ Answers will vary. In general, plot refers to the code that turns on a specific
 
 ## 2. Draw which LED is ON after running this code
 
-![](/static/mb/blocks/lessons/blink-6.png)
+```blocks
+led.plot(2, 2)
+
+```
 
 ![](/static/mb/lessons/blink-0.png)
 
@@ -18,7 +21,10 @@ By default, the position of an LED on *Blink Tutorial* is set to the centre of t
 
 ## 3. Draw which LED is ON after running this code
 
-![](/static/mb/blocks/lessons/blink-7.png)
+```blocks
+led.plot(0, 0)
+
+```
 
 ![](/static/mb/lessons/blink-1.png)
 
@@ -29,7 +35,10 @@ This code turns on specific LED. Plot turns on the specified LED on the LED scre
 
 ## 4. Draw which LED is ON after running this code
 
-![](/static/mb/blocks/lessons/blink-8.png)
+```blocks
+led.plot(4, 4)
+
+```
 
 ![](/static/mb/lessons/blink-2.png)
 

docs/lessons/blink/quiz.md

@@ -1,34 +1,45 @@
 # blink blocks quiz
 
-Learn how to create a blinking LED script. #LED #screen  #plot #docs
+Learn how to create a blinking LED script.
 
 ## Name
 
 ## Directions
 
-Use this activity document to guide your work in the [blink activity](/microbit/lessons/blink/activity).
+Use this activity document to guide your work in the [blink activity](/lessons/blink/activity).
 
 Answer the questions while completing the tutorial. Pay attention to the dialogues!
 
 ## 1. Describe what `plot` does?
 
-<br/>
+
 
 ## 2. Draw which LED is ON after running this code
 
-![](/static/mb/blocks/lessons/blink-6.png)
+```blocks
+led.plot(2, 2)
+
+```
 
 ![](/static/mb/empty-microbit.png)
 
 ## 3. Draw which LED is ON after running this code
 
-![](/static/mb/blocks/lessons/blink-7.png)
+```blocks
+led.plot(0, 0)
+
+```
 
 ![](/static/mb/empty-microbit.png)
 
 ## 4. Draw which LED is ON after running this code
 
-![](/static/mb/blocks/lessons/blink-8.png)
+
+```blocks
+led.plot(4, 4)
+
+```
+
 
 ![](/static/mb/empty-microbit.png)
 

docs/lessons/bop-it/activity.md

@@ -4,15 +4,11 @@ a game similar to "Simon Says" with the BBC micro:bit. #docs
 
 ## Before we get started
 
-Complete the following guided tutorial:
+Complete the following guided tutorial. Your code should look like this:
 
-* [tutorial](/microbit/lessons/bop-it/tutorial)
-
-At the end of the tutorial, click `keep editing`. Your code should look like this:
-
-```
+```blocks
 newAction() // ***
-input.onButtonPressed("A", () => {
+input.onButtonPressed(Button.A, () => {
     if (action == 0) {
         game.addScore(1) // ***
         newAction() // ***
@@ -21,27 +17,27 @@ input.onButtonPressed("A", () => {
 input.onLogoDown(() => {
     if (action == 1) {
         game.addScore(1) // ***
-        newAction() // ***
+        newAction() 
     }
-}) // ***
+}) 
 input.onGesture(Gesture.Shake, () => {
     if (action == 2) {
-        game.addScore(1) // ***
-        newAction() // ***
+        game.addScore(1)
+        newAction()
     }
-}) // ***
-input.onButtonPressed("B", () => {
+}) 
+input.onButtonPressed(Button.B, () => {
     basic.showNumber(game.score(), 150) // ***
     basic.pause(2000) // ***
     newAction() // ***
-}) // ***
+}) 
 ```
 
 ### Challenge 1
 
 Now let's add some more types of instructions for the player to follow. Let's add `PRESS PIN 0`. Change the global variable `action` to `math->random(4)` so that we can add a new **IF** statement that checks if `action=3`. If it does, display instructions to press pin 0.
 
-```
+```blocks
 /**
  * {highlight}
  */
@@ -68,12 +64,12 @@ Now let's implement `PRESS PIN 0` in the main. Create a condition of `input->on
 
 ```
 // **. . .**
-input.onButtonPressed("B", () => {
+input.onButtonPressed(Button.B, () => {
     basic.showNumber(game.score(), 150) // ***
     basic.pause(2000) // ***
     newAction() // ***
 }) // ***
-input.onPinPressed("P0", () => {
+input.onPinPressed(TouchPin.P0, () => {
     if (action == 3) {
         game.addScore(1) // ***
         newAction() // ***

docs/lessons/bop-it/quiz-answers.md

@@ -1,12 +1,12 @@
 # bop it quiz answers
 
-a game where you have to keep up with the commands #math #random #docs
+a game where you have to keep up with the commands.
 
 ## Name
 
 ## Directions
 
-Use this activity document to guide your work in the [bop it tutorial](/microbit/lessons/bop-it/tutorial).
+Use this activity document to guide your work in the [bop it activity](/lessons/bop-it/activity).
 
 Answer the questions while completing the tutorial. Pay attention to the dialogues!
 
@@ -33,7 +33,7 @@ if (action == 0) {
 <br />
 
 ```
-input.onButtonPressed("A", () => {
+input.onButtonPressed(Button.A, () => {
     if (action == 0) {
         game.addScore(1)
     }

docs/lessons/bop-it/quiz.md

@@ -0,0 +1,38 @@
+# bop it quiz 
+
+a game where you have to keep up with the commands.
+
+## Name
+
+## Directions
+
+Use this activity document to guide your work in the [bop it activity](/lessons/bop-it/activity).
+
+Answer the questions while completing the tutorial. Pay attention to the dialogues!
+
+### 1. Write the code that will store the global variable named 'action' and returns a random number between 0 and 2
+
+<br/>
+
+### 2. Write the code that will display the string, "PUSH A" if the global variable called 'action' is equal to 0
+
+<br />
+
+### 3. Write the code that increments the score if button A is pressed when the global variable called 'action' is equal to 1
+
+<br />
+
+### 4. Write the code that will display the string "LOGO DOWN" if the global variable called 'action' is equal to 1
+
+<br />
+
+### 5. Write the code that increments the score if the BBC micro:bit logo is tilted down when the global variable called 'action' is equal to 1
+
+<br />
+
+### 6. Write the code that will display the string "SHAKE" if the global variable called 'action' is equal to 2
+
+<br />
+
+### 7. Write the code that increments the score if the BBC micro:bit is shaken when the global variable called 'action' is equal to 2
+

docs/lessons/buzzer.md

@@ -1,81 +0,0 @@
-# buzzer lesson 
-
-design a blinking image lesson #docs
-
-## Topic 
-
-Ring
-
-## Quick Links
-
-* [activity](/microbit/lessons/buzzer/activity)
-* [challenges](/microbit/lessons/buzzer/challenges)
-
-## Class
-
-Year 7
-
-## Prior learning / place of lesson in scheme of work
-
-Learn how to **ring** the buzzer to turn on the sound. We will be learning basic comments such as ring and clear screen.
-
-## Documentation
-
-* **ring** : [read more...](/microbit/reference/music/ring)
-* **clear screen** : [read more...](/microbit/reference/basic/clear-screen)
-* **on button pressed** : [read more...](/microbit/reference/input/on-button-pressed)
-
-## Objectives
-
-* learn how to ring the BBC micro:bit
-* learn how to clear the screen
-* learn how to run code when an input button is pressed
-
-## Progression Pathways / Computational Thinking Framework
-
-#### Algorithms
-
-* Designs solutions (algorithms) that use repetition and two-way  selection, ie if, then and else.(AL)
-* Uses diagrams to express solutions.(AB)
-*  Uses logical reasoning to predict  outputs, showing an awareness of inputs (AL)
-* Recognises that different algorithms exist for the same problem (AL) (GE)
-* Represents solutions using a structured notation (AL) (AB)
-
-#### Programming & Development
-
-* Creates programs that implement algorithms to achieve given goals (AL)
-* Selects the appropriate data types(AL) (AB
-
-#### Data & Data Representation
-
-* Understands the difference between data and information(AB)
-
-#### Hardware & Processing
-
-* Understands the difference between hardware and application software, and their roles within a computer system (AB)
-
-#### Communication Networks
-
-* Demonstrates responsible use of technologies and online services, and knows a range of ways to report concerns (AL)
-
-#### Information Technology
-
-* Collects, organizes, and presents data and information in digital content (AB)
-* Makes appropriate improvements to solutions based on feedback received, and can comment on the success of the solution (EV)
-
-Computational Thinking Concept: AB = Abstraction; DE = Decomposition; AL = Algorithmic Thinking; EV = Evaluation; GE = Generalisation
-
-## Activity
-
-* time: 20 min.
-* [activity](/microbit/lessons/buzzer/activity)
-
-## Extended Activity
-
-* time: 20 min.
-* [challenges](/microbit/lessons/buzzer/challenges)
-
-## Homework
-
-* Extended Activity: [challenges](/microbit/lessons/buzzer/challenges)
-

docs/lessons/catch-the-egg-game.md

@@ -0,0 +1,49 @@
+# catch the egg game lesson
+
+A game to catch eggs in a basket.
+
+### @video td/videos/catch-the-egg-game-0
+
+## Topic
+
+Variables
+
+## Quick Links
+
+* [activity](/lessons/catch-the-egg-game/activity)
+* [quiz](/lessons/catch-the-egg-game/quiz)
+* [quiz answers](/lessons/catch-the-egg-game/quiz-answers)
+
+## Prior learning/place of lesson in scheme of work
+
+Learn how to create a catch the egg game game with **plot**, `led->plot` , **unplot**, `led->unplot`, and **acceleration**  `input -> acceleration` to turn on and off LED lights on the LED screen. We will be learning how to create a catch the egg game app using global variables, forever loop, local variable, input acceleration, math min, math max, math random, math mod, if (conditionals), game library as well as simple commands, such as led plot, led unplot, and pause.
+
+## Documentation
+
+* **variables** : [read more...](/reference/variables/var)
+* **forever** : [read more...](/reference/basic/forever)
+* **unplot** : [read more...](/reference/led/unplot)
+* **plot** : [read more...](/reference/led/plot)
+* **if** : [read more...](/reference/logic/if)
+* **acceleration** : [read more...](/reference/input/acceleration)
+* **math minimum number** : [read more...](/reference/math)
+* **math maximum number** : [read more...](/reference/math)
+* **math random number** : [read more...](/reference/math)
+* **math modulus** : [read more...](/reference/math)
+* **show number** : [read more...](/reference/basic/show-number)
+* **pause** : [read more...](/reference/basic/pause)
+
+## Objectives
+
+* learn how to create a variable as a place where you can store data so that you can use it later in your code, accessible across functions and in nested code blocks
+* learn how to repeat code in the background forever
+* learn how to turn off a LED light on the LED screen
+* learn how to turn on a LED light on the LED screen
+* learn how to learn how to conditionally run code depending on whether a condition is true or not
+* learn how to learn how to get the acceleration value (g-force), in one of three specified dimensions
+* learn how to return the smaller of two numbers
+* learn how to return the larger of two numbers
+* learn how to return a random number
+* learn how to return the modulus
+* learn how to show a number of the BBC micro:bit screen
+* learn how to pause your code for the specified number of milliseconds

docs/lessons/catch-the-egg-game/activity.md

@@ -4,13 +4,9 @@ Coding challenges for catch the egg game.
 
 ## Before we get started
 
-Complete the following guided tutorial:
+Your starting code should look like this:
 
-* [tutorial](/microbit/lessons/catch-the-egg-game/tutorial)
-
-At the end of the tutorial, click `keep editing`. Your code should look like this:
-
-```
+```blocks
 let basketX = 2
 let eggX = 2
 let eggY = 0
@@ -20,7 +16,7 @@ basic.forever(() => {
     eggY = eggY + 1
     led.plot(eggX, eggY)
     basic.pause(300)
-    let accX = input.acceleration("x")
+    let accX = input.acceleration(Dimension.X)
     basketX = 2 + Math.min(2, Math.max(-2, accX / 200))
     led.plot(basketX, 4)
     if (eggY > 4) {
@@ -35,21 +31,13 @@ basic.forever(() => {
 
 ### Challenge 1
 
-Let's start by adding the **game** library.
-
-### ~
-
-### ~avatar avatar improvised
-
-### Challenge 2
-
 Let's use an **IF** statement to detect if the egg and the basket are lined up.
 
 Now that we know when an egg is caught, we can keep track of the score! We need to use the `add score` function built into the game library to add `1` point for every egg that is caught. However, let's not forget to `remove life` if an egg falls off the display before it's caught!
 
 ### ~
 
-```
+```blocks
 let basketX1 = 2
 let eggX1 = 2
 let eggY1 = 0
@@ -59,8 +47,8 @@ basic.forever(() => {
     eggY1 = eggY1 + 1
     led.plot(eggX1, eggY1)
     basic.pause(300)
-    let accX1 = input.acceleration("x")
-    basketX1 = 2 + Math.min(2, Math.max(-2, accX1 / 200))
+    let accX = input.acceleration(Dimension.X)
+    basketX1 = 2 + Math.min(2, Math.max(-2, accX / 200))
     led.plot(basketX1, 4)
     if (eggY1 > 4) {
         eggY1 = -1
@@ -68,9 +56,9 @@ basic.forever(() => {
     }
     if (eggY1 == 4) {
         if (basketX1 == eggX1) {
-            game.addScore(1) // ***
+            game.addScore(1) 
         } else {
-            game.removeLife(1) // ***
+            game.removeLife(1)
         }
     }
     basic.pause(300)
@@ -81,13 +69,13 @@ basic.forever(() => {
 
 ### ~avatar avatar encourage
 
-### Challenge 3
+### Challenge 2
 
 Catching eggs gets easier with practice so let's make the eggs fall faster every 5 catches. We can do this by tracking how long the egg pauses in each position while falling with a global variable called **falling pause**. Let's create this variable and set it to `300` initially. Don't forget to also create a condition that will be true every 5 catches.
 
 ### ~
 
-```
+```blocks
 let basketX2 = 2
 let eggX2 = 2
 let eggY2 = 0
@@ -98,7 +86,7 @@ basic.forever(() => {
     eggY2 = eggY2 + 1
     led.plot(eggX2, eggY2)
     basic.pause(300)
-    let accX2 = input.acceleration("x")
+    let accX2 = input.acceleration(Dimension.X)
     basketX2 = 2 + Math.min(2, Math.max(-2, accX2 / 200))
     led.plot(basketX2, 4)
     if (eggY2 > 4) {
@@ -108,7 +96,7 @@ basic.forever(() => {
     if (eggY2 == 4) {
         if (basketX2 == eggX2) {
             game.addScore(1)
-            if (math.mod(game.score(), 5) == 0) {
+            if (game.score() %5 == 0) {
             }
         } else {
             game.removeLife(1)
@@ -120,13 +108,13 @@ basic.forever(() => {
 
 ### ~avatar avatar surprised
 
-### Challenge 4
+### Challenge 3
 
 ### @video td/videos/catch-the-egg-game-4
 
 Let's make the egg fall faster by decreasing the amount of time it pauses in each position by decreasing **falling pause** by `25` every 5 catches. Now, instead of pausing for 300 milliseconds we can pause for the value of **falling pause**.
 
-```
+```blocks
 let basketX3 = 2
 let eggX3 = 2
 let eggY3 = 0
@@ -137,7 +125,7 @@ basic.forever(() => {
     eggY3 = eggY3 + 1
     led.plot(eggX3, eggY3)
     basic.pause(300)
-    let accX3 = input.acceleration("x")
+    let accX3 = input.acceleration(Dimension.X)
     basketX3 = 2 + Math.min(2, Math.max(-2, accX3 / 200))
     led.plot(basketX3, 4)
     if (eggY3 > 4) {
@@ -147,15 +135,16 @@ basic.forever(() => {
     if (eggY3 == 4) {
         if (basketX3 == eggX3) {
             game.addScore(1)
-            if (math.mod(game.score(), 5) == 0) {
+            if (game.score()% 5 == 0) {
                 fallingPause1 = fallingPause1 - 25 // ***
             }
         } else {
             game.removeLife(1)
         }
     }
-    basic.pause(fallingPause1) // ***
+    basic.pause(fallingPause1) 
 })
+
 ```
 
 Fantastic! Your game is now ready to show off.

docs/lessons/catch-the-egg-game/quiz-answers.md

@@ -6,7 +6,7 @@ Programming a game of catch the egg using the accelerometer
 
 ## Directions
 
-Use this activity document to guide your work in the [catch the egg tutorial](/microbit/lessons/catch-the-egg-game/tutorial)
+Use this activity document to guide your work in the [catch the egg activity](/lessons/catch-the-egg-game/activity)
 
 Answer the questions while completing the tutorial. Pay attention to the dialogues!
 
@@ -22,7 +22,10 @@ Answer the questions while completing the tutorial. Pay attention to the dialogu
 
 <br/>
 
-```
+```blocks
+let basketX = 2
+let eggX = 2
+let eggY = 0
 led.plot(eggX, eggY)
 led.plot(basketX, 4)
 ```
@@ -31,28 +34,22 @@ led.plot(basketX, 4)
 
 <br/>
 
-```
+```blocks
+let basketX = 2
+let eggX = 2
+let eggY = 0
 led.unplot(eggX, eggY)
 eggY = eggY + 1
 led.plot(eggX, eggY)
 ```
 
-## 4. Write the code that calculates 'basket x' given the variable 'acc x'.
+## 4. . Write the code that resets the egg after it has fallen past the bottom of the BBC micro:bit.
 
 <br/>
 
-```
-let accX = input.acceleration("x")
-basketX = 2 + Math.min(2, Math.max(-2, accX / 200))
-```
-
-Note: the first line of code in this answer is optional.
-
-## 5. Write the code that resets the egg after it has fallen past the bottom of the BBC micro:bit.
-
-<br/>
-
-```
+```blocks
+let eggX = 2
+let eggY = 0
 if (eggY > 4) {
     eggY = -1
     eggX = Math.random(5)

docs/lessons/catch-the-egg-game/quiz.md

@@ -6,11 +6,11 @@ Programming a game of catch the egg using the accelerometer.
 
 ## Directions
 
-Use this activity document to guide your work in the [catch the egg tutorial](/microbit/lessons/catch-the-egg-game/tutorial)
+Use this activity document to guide your work in the [catch the egg challenges](/lessons/catch-the-egg-game/activity)
 
 Answer the questions while completing the tutorial. Pay attention to the dialogues!
 
-## 1. Write the data type for the global variables 'basket' and 'egg'.
+## 1. Write the data type for the variables 'basket' and 'egg'.
 
 <br/>
 
@@ -24,11 +24,7 @@ Answer the questions while completing the tutorial. Pay attention to the dialogu
 
 <br/>
 
-## 4. Write the code that calculates 'basket x' given the variable 'acc x'.
-
-<br/>
-
-## 5. Write the code that resets the egg after it has fallen past the bottom of the BBC micro:bit.
+## 4. Write the code that resets the egg after it has fallen past the bottom of the BBC micro:bit.
 
 <br/>
 

docs/lessons/challenges.md

@@ -22,7 +22,7 @@ Create a timer that runs out after a certain amount of time (using the *count* l
 
 ## Graphics Challenges [3]
 
-Using the knowledge you have learnt from the [rendering graphics](/microbit/lessons/graphics) section, try creating an algorithm to draw these shapes. Before you write the code try to figure out how the BBC micro:bit will be thinking to plot these points. For example, with our diagonal line – “count up from 0 to 4 by 1, and plot points x=i and y=i”.
+Using the knowledge you have learnt from the [rendering graphics](/lessons/graphics) section, try creating an algorithm to draw these shapes. Before you write the code try to figure out how the BBC micro:bit will be thinking to plot these points. For example, with our diagonal line – “count up from 0 to 4 by 1, and plot points x=i and y=i”.
 
 * Another diagonal line
 * A square going around the board

docs/lessons/charting.md

@@ -1,6 +1,6 @@
 # charting lesson
 
-measure the acceleration on the micro:bit in the "z" direction #acceleration #var #docs #if #show
+Measure the acceleration on the micro:bit in the "z" direction.
 
 ## Topic
 
@@ -8,11 +8,8 @@ Acceleration
 
 ## Quick Links
 
-* [activity](/microbit/lessons/charting/activity)
+* [activity](/lessons/charting/activity)
 
-## Class
-
-Year 7
 
 ## Prior learning/place of lesson in scheme of work
 
@@ -20,12 +17,14 @@ Learn the functions of **on data received**, **send number** and **receive numbe
 
 ## Documentation
 
-* **forever** : [read more...](/microbit/reference/basic/forever)
-* **acceleration** : [read more...](/microbit/reference/input/acceleration)
-* **plot bar graph** : [read more...](/microbit/reference/led/plot-bar-graph)
-* **on data received** : [read more...](/microbit/reference/radio/on-data-received)
-* **send number** : [read more...](/microbit/reference/radio/send-number)
-* **receive number** : [read more...](/microbit/reference/radio/receive-number)
+```cards
+basic.showNumber(0)
+input.acceleration(Dimension.X)
+led.plotBarGraph(0, 1023)
+radio.onDataReceived(() => {})
+radio.sendNumber(0)
+radio.receiveNumber()
+```
 
 ## Objectives
 
@@ -35,24 +34,3 @@ Learn the functions of **on data received**, **send number** and **receive numbe
 * learn how to register code to run when a packet is received over radio
 * learn how to broadcast a number data packet to other micro:bits connected via radio
 * learn how to read the next radio packet as a number data packet
-
-## Progression Pathways / Computational Thinking Framework
-
-#### Algorithms
-
-*  Uses logical reasoning to predict  outputs, showing an awareness of inputs (AL)
-* Represents solutions using a structured notation (AL) (AB)
-*  Can identify similarities and differences in situations and can use these to solve problems (pattern recognition)(GE)
-
-#### Programming & Development
-
-* Creates programs that implement algorithms to achieve given goals (AL)
-* Uses a variable and relational operators within a loop to govern termination (AL) (GE)
-
-Computational Thinking Concept: AB = Abstraction; DE = Decomposition; AL = Algorithmic Thinking; EV = Evaluation; GE = Generalisation
-
-## Activity
-
-* time: 20 min.
-* [activity](/microbit/lessons/charting/activity)
-

docs/lessons/charting/activity.md

@@ -4,8 +4,6 @@ Measure the acceleration on the micro:bit in the "z" direction.
 
 ### ~avatar avatar
 
-To create a new script, go to the [Create Code](/microbit/create-code) page and tap `New Project` under `Block Editor`.
-
 ### ~
 
 Welcome! This activity will teach how to use the 1st micro:bit to chart the second micro:bit's acceleration in the "x" direction. Let's get started!
@@ -13,15 +11,17 @@ Welcome! This activity will teach how to use the 1st micro:bit to chart the seco
 Let's measure `acceleration (mg)` and then `send number`. `Acceleration` is measured in **milli-gravities**, so a value of -1000 is equivalent to -1g or -9.81m/s^2. We will be able to get the acceleration value (g-force), in the specified "x" dimension. `Send number` will broadcast a number data packet to other micro:bits connected via radio.
 
 ```blocks
-radio.sendNumber(input.acceleration(Dimension.X))
+radio.sendNumber(input.acceleration(Dimension.X));
 ```
 
 We want to display the acceleration forever. In order to do so, we need a `forever` loop. A forever loop will repeat code in the background forever.
 
 ```blocks
 basic.forever(() => {
-    radio.sendNumber(input.acceleration(Dimension.X))
-})
+    radio.sendNumber(input.acceleration(Dimension.X));
+});
+
+
 ```
 
 We want to register code to run when a packet is received over radio. We can implement this code by adding `on data received`.

docs/lessons/classic-beatbox.md

@@ -1,6 +1,6 @@
 # classic beatbox 
 
-display beautiful images on the BBC micro:bit #var #pause #docs
+display beautiful images on the BBC micro:bit.
 
 ## Topic
 
@@ -8,12 +8,10 @@ Music
 
 ## Quick Links
 
-* [activity](/microbit/lessons/classic-beatbox/activity)
-* [challenges](/microbit/lessons/classic-beatbox/challenges)
+* [activity](/lessons/classic-beatbox/activity)
+* [challenges](/lessons/classic-beatbox/challenges)
 
-## Class
 
-Year 7
 
 ## Prior learning/place of lesson in scheme of work
 
@@ -23,40 +21,3 @@ Learn how to make a beatbox music player using pins P1 and P2. We will be learni
 
 * learn how to code music on the BBC micro:bit
 
-## 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)
-* Selects the appropriate data types(AL) (AB
-
-#### Communication Networks
-
-* Demonstrates responsible use of technologies and online services, and knows a range of ways to report concerns Understands how search engines rank search results (AL)
-
-#### Information Technology
-
-* Collects, organizes, and presents data and information in digital content (AB)
-* Makes appropriate improvements to solutions based on feedback received, and can comment on the success of the solution (EV)
-
-Computational Thinking Concept: AB = Abstraction; DE = Decomposition; AL = Algorithmic Thinking; EV = Evaluation; GE = Generalisation
-
-## Activity
-
-* time: 20 min.
-* [activity](/microbit/lessons/classic-beatbox/activity)
-
-## Extended Activity
-
-* time: 20 min.
-* [challenges](/microbit/lessons/classic-beatbox/challenges)
-
-## Homework
-
-* Extended Activity: [challenges](/microbit/lessons/classic-beatbox/challenges)
-

docs/lessons/classic-beatbox/activity.md

@@ -2,8 +2,6 @@
 
 Control images with variables. 
 
-To create a new script, go to the [Create Code](/microbit/create-code) page and tap *New Project* under *Block Editor*.
-
 Have you ever tried to making beat box sounds? Let's try making a beatbox with code!
 
 Let's start by adding a variable where you can store data. Then rename the variable to "sound". Then set the value of the variable to the note block `A` from the Music drawer. Modify your code so that your code looks like this.
@@ -51,6 +49,6 @@ input.onPinPressed(TouchPin.P1, () => {
 
 ### ~avatar boothing
 
-Excellent, you're ready to continue with the [challenges](/microbit/lessons/classic-beatbox/challenges)!
+Excellent, you're ready to continue with the [challenges](/lessons/classic-beatbox/challenges)!
 
 ### ~

docs/lessons/classic-beatbox/challenges.md

@@ -4,7 +4,7 @@ Create sounds with variables.
 
 ## Before we get started
 
-Complete the [beatbox](/microbit/lessons/beatbox/activity) activity and your code will look like this:
+Complete the [beatbox](/lessons/classic-beatbox/activity) activity and your code will look like this:
 
 
 ```blocks

docs/lessons/compass.md

@@ -1,6 +1,6 @@
 # compass lesson
 
-create a die on the BBC micro:bit #button #pressed #math #random #var #string #if #docs
+create a die on the BBC micro:bit.
 
 ### @video td/videos/compass-0
 
@@ -10,12 +10,10 @@ If (Conditionals)
 
 ## Quick Links
 
-* [activity](/microbit/lessons/compass/activity)
-* [challenges](/microbit/lessons/compass/challenges)
-
-## Class
-
-Year 7
+* [activity](/lessons/compass/activity)
+* [challenges](/lessons/compass/challenges)
+* [quiz](/lessons/compass/quiz)
+* [quiz answers](/lessons/compass/quiz-answers)
 
 ## Prior learning/place of lesson in scheme of work
 
@@ -23,14 +21,20 @@ Learn how to use an if statements to run code run code depending on whether a co
 
 ## Documentation
 
-* **Compass Heading** : [read more...](/microbit/reference/input/compass-heading)
-* **Forever** : [read more...](/microbit/reference/basic/forever)
-* **Variables** : [read more...](/microbit/reference/variables/var)
-* **Assignment Operator** : [read more...](/microbit/reference/variables/assign)
-* **If** : [read more...](/microbit/reference/logic/if)
-* **Comparison Operator** : [read more...](/microbit/reference/types/number)
-* **Show String** : [read more...](/microbit/reference/basic/show-string)
-* **Show LEDs** : [read more...](/microbit/reference/basic/show-leds)
+```cards
+input.compassHeading()
+basic.forever(() => {})
+let x = 0
+if (true) {}
+basic.showString("Hello!")
+basic.showLeds(`
+    . . . . .
+    . . . . .
+    . . # . .
+    . . . . .
+    . . . . .
+    `)
+```
 
 ## Objectives
 
@@ -41,57 +45,3 @@ Learn how to use an if statements to run code run code depending on whether a co
 * learn how to return a random number
 * learn how to conditionally run code depending on whether a condition is true or not
 * learn how to show an image on the LED screen
-
-## Progression Pathways / Computational Thinking Framework
-
-#### Algorithms
-
-* Designs solutions (algorithms) that use repetition and two-way  selection, ie if, then and else.(AL)
-* Uses diagrams to express solutions.(AB)
-*  Uses logical reasoning to predict  outputs, showing an awareness of inputs (AL)
-*  Designs solutions  by decomposing a problem and creates a sub-solution for each of these parts. (DE) (AL) (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)
-* Understands the difference between, and appropriately uses if and if, then and else statements(AL)
-* Uses a range of operators and expressions e.g. Boolean, and applies them in the context of program control. (AL)
-* Selects the appropriate data types(AL) (AB
-
-#### Data & Data Representation
-
-* Understands the difference between data and information(AB)
-* Uses filters or can perform single criteria searches for information.(AL)
-* Performs more complex searches for information e.g. using Boolean and relational operators(AL) (GE) (EV)
-* Defines data types: real numbers and Boolean (AB)
-
-#### Hardware & Processing
-
-* Knows that computers collect data from various input devices, including sensors and application software (AB)
-* Demonstrates responsible use of technologies and online services, and knows a range of ways to report concerns Understands how search engines rank search results (AL)
-
-#### Information Technology
-
-* Collects, organizes, and presents data and information in digital content (AB)
-* Makes appropriate improvements to solutions based on feedback received, and can comment on the success of the solution (EV)
-* Makes judgements about digital content when evaluating and repurposing it for a given audience (EV) (GE)
-* Recognises ethical issues surrounding the application of information technology beyond school.
-
-Computational Thinking Concept: AB = Abstraction; DE = Decomposition; AL = Algorithmic Thinking; EV = Evaluation; GE = Generalisation
-
-## Activity
-
-* time: 20 min.
-* [activity](/microbit/lessons/compass/activity)
-
-## Extended Activity
-
-* time: 20 min.
-* [challenges](/microbit/lessons/compass/challenges)
-
-## Homework
-
-* Extended Activity: [challenges](/microbit/lessons/compass/challenges)
-

docs/lessons/compass/activity.md

@@ -28,9 +28,8 @@ basic.forever(() => {
 If `degrees` is less than `45`, then the compass heading is mostly pointing toward North. Display `N` on the micro:bit.
 
 ```blocks
- let degrees = 0;
 basic.forever(() => {
-    degrees = input.compassHeading();
+    let degrees = input.compassHeading();
     if (degrees < 45) {
         basic.showString("N");
     }
@@ -41,9 +40,8 @@ If `degrees` is less than 135, the micro:bit is mostly pointing East. Display `E
 
 
 ```blocks
- let degrees = null;
 basic.forever(() => {
-    degrees = input.compassHeading();
+    let degrees = input.compassHeading();
     if (degrees < 45) {
         basic.showString("N");
     }
@@ -57,9 +55,8 @@ If `degrees` is less than 225, the micro:bit is mostly pointing South. Display `
 
 
 ```blocks
- let degrees = null;
 basic.forever(() => {
-    degrees = input.compassHeading();
+    let degrees = input.compassHeading();
     if (degrees < 45) {
         basic.showString("N");
     }
@@ -76,9 +73,8 @@ basic.forever(() => {
 If none of these conditions returned true, then the micro:bit must be pointing West. Display `W` on the micro:bit.
 
 ```blocks
- let degrees = null;
 basic.forever(() => {
-    degrees = input.compassHeading();
+    let degrees = input.compassHeading();
     if (degrees < 45) {
         basic.showString("N");
     }
@@ -96,7 +92,7 @@ basic.forever(() => {
 
 ### ~avatar avatar
 
-Excellent, you're ready to continue with the [challenges](/microbit/lessons/compass/challenges)!
+Excellent, you're ready to continue with the [challenges](/lessons/compass/challenges)!
 
 ### ~
 

docs/lessons/compass/challenges.md

@@ -4,10 +4,10 @@ Display the direction that the micro:bit is facing using the compass
 
 ## Before we get started
 
-Complete the following [guided tutorial](/microbit/lessons/compass/activity), your code should look like this:
+Complete the following [guided tutorial](/lessons/compass/activity), your code should look like this:
 
 ```blocks
- let degrees = null;
+ let degrees = 0;
 basic.forever(() => {
     degrees = input.compassHeading();
     if (degrees < 45) {
@@ -30,7 +30,7 @@ basic.forever(() => {
 Instead of displaying `N` when the BBC micro:bit is pointing North, display a star to indicate the north star.
 
 ```blocks
- let degrees = null;
+ let degrees = 0;
 basic.forever(() => {
     degrees = input.compassHeading();
     if (degrees < 45) {
@@ -61,7 +61,7 @@ basic.forever(() => {
 Instead of displaying just `N`, `W`, `S`, or `E`, display the full word.
 
 ```blocks
- let degrees = null;
+ let degrees = 0;
 basic.forever(() => {
     degrees = input.compassHeading();
     if (degrees < 45) {

docs/lessons/compass/quiz-answers.md

@@ -6,7 +6,7 @@ Create an actual compass to show your direction: North, South, East, or West
 
 ## Directions
 
-Use this activity document to guide your work in the [compass tutorial](/microbit/lessons/compass/activity).
+Use this activity document to guide your work in the [compass tutorial](/lessons/compass/activity).
 
 Answer the questions while completing the tutorial. Pay attention to the dialogues!
 
@@ -14,41 +14,39 @@ Answer the questions while completing the tutorial. Pay attention to the dialogu
 
 Gets the compass heading of the micro:bit in degrees
 
-<br/>
 
 ## 2. Write the code that stores the compass heading into a local variable called 'degrees'. 
 
-<br/>
 
-```
+```blocks
 let degrees = input.compassHeading()
 ```
 
 ## 3. Write the 'If statement' that will check if the device is mostly pointing North. Display 'N' on the micro:bit 
 
-<br />
 
-```
+```blocks
+let degrees = input.compassHeading()
 if (degrees < 45) {
     basic.showString("N", 150)
 }
 ```
 
-## 3. Write the 'If statement' that will check if the device is mostly pointing East. Display 'E' on the micro:bit 
+## 4. Write the 'If statement' that will check if the device is mostly pointing East. Display 'E' on the micro:bit 
 
-<br />
 
-```
+```blocks
+let degrees = input.compassHeading()
 if (degrees < 135) {
     basic.showString("E", 150)
 }
 ```
 
-## 3. Write the 'If statement' that will check if the device is mostly pointing South. Display 'S' on the micro:bit 
+## 5. Write the 'If statement' that will check if the device is mostly pointing South. Display 'S' on the micro:bit 
 
-<br />
 
-```
+```blocks
+let degrees = input.compassHeading()
 if (degrees < 225) {
     basic.showString("S", 150)
 }

docs/lessons/compass/quiz.md

@@ -6,27 +6,21 @@ Create an actual compass to show your direction: North, South, East, or West
 
 ## Directions
 
-Use this activity document to guide your work in the [compass activity](/microbit/lessons/compass/activity).
+Use this activity document to guide your work in the [compass activity](/lessons/compass/activity).
 
 Answer the questions while completing the tutorial. Pay attention to the dialogues!
 
 ## 1. What is the purpose of the 'compass heading' block?
 
-<br/>
-
 ## 2. Write the code that stores the compass heading into a local variable called 'degrees'. 
 
-<br/>
 
 ## 3. Write the 'If statement' that will check if the device is mostly pointing North. Display 'N' on the micro:bit 
 
-<br />
 
-## 3. Write the 'If statement' that will check if the device is mostly pointing East. Display 'E' on the micro:bit 
+## 4. Write the 'If statement' that will check if the device is mostly pointing East. Display 'E' on the micro:bit 
 
-<br />
 
-## 3. Write the 'If statement' that will check if the device is mostly pointing South. Display 'S' on the micro:bit 
+## 5. Write the 'If statement' that will check if the device is mostly pointing South. Display 'S' on the micro:bit 
 
-<br />
 

docs/lessons/counter.md

@@ -1,6 +1,6 @@
 # counter lesson
 
-Learn how to create a counter with with on button pressed. #show #number #screen  #number #math #docs
+Learn how to create a counter with with on button pressed.
 
 ### @video td/videos/counter-0
 
@@ -10,12 +10,10 @@ Variables
 
 ## Quick Links
 
-* [activity](/microbit/lessons/counter/activity)
-* [challenges](/microbit/lessons/counter/challenges)
-
-## Class
-
-Year 7
+* [activity](/lessons/counter/activity)
+* [challenges](/lessons/counter/challenges)
+* [quiz](/lessons/counter/quiz)
+* [quiz answers](/lessons/counter/quiz-answers)
 
 ## Prior learning/place of lesson in scheme of work
 
@@ -23,10 +21,25 @@ Learn how to creating a **variable** to keep track of the current count. We will
 
 ## Documentation
 
-* **variable**: [read more...](/microbit/reference/variables/var)
-* **arithmetic operators**: [read more...](/microbit/reference/types/number)
-* **on button pressed** : [read more...](/microbit/reference/input/on-button-pressed)
-* **show number** : [read more...](/microbit/reference/basic/show-number)
+```cards
+input.compassHeading()
+basic.forever(() => {})
+let x = 0
+if (true) {}
+basic.showString("Hello!")
+basic.showLeds(`
+    . . . . .
+    . . . . .
+    . . # . .
+    . . . . .
+    . . . . .
+    `)
+```
+
+* **variable**: [read more...](/reference/variables/var)
+* **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)
 
 ## Objectives
 
@@ -35,41 +48,3 @@ Learn how to creating a **variable** to keep track of the current count. We will
 * learn how to run code when an input button is pressed
 * learn how to show a number on the LED screen, one digit at a time (scrolling from left to right)
 
-## Progression Pathways / Computational Thinking Framework
-
-#### Algorithms
-
-* Understands that iteration is the repetition of a process such as a loop. (AL)
-* 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)
-
-#### Data & Data Representation
-
-* Understands the difference between data and information. (AB)
-* Defines data types: real numbers and Boolean. (AB)
-
-#### Information Technology
-
-*  Collects, organises and presents data and information in digital content. (AB)
-* Makes appropriate improvements to solutions based on feedback received, and can comment on the success of the solution. (EV)
-
-Computational Thinking Concept: AB = Abstraction; DE = Decomposition; AL = Algorithmic Thinking; EV = Evaluation; GE = Generalisation
-
-## Activity
-
-* time: 20 min.
-* [activity](/microbit/lessons/counter/activity)
-
-## Extended Activity
-
-* time: 20 min.
-* [challenges](/microbit/lessons/counter/challenges)
-
-## Homework
-
-* Extended Activity: [challenges](/microbit/lessons/counter/challenges)
-

docs/lessons/counter/activity.md

@@ -39,7 +39,7 @@ input.onButtonPressed(Button.A, () => {
 
 ### ~avatar avatar
 
-Excellent, you're ready to continue with the [challenges](/microbit/lessons/counter/challenges)
+Excellent, you're ready to continue with the [challenges](/lessons/counter/challenges)
 
 ### ~
 

docs/lessons/counter/challenges.md

@@ -4,7 +4,7 @@ Coding challenges for the counter.
 
 ## Before we get started
 
-Complete the following [guided tutorial](/microbit/lessons/counter/activity) At the end of the tutorial, click **keep editing**. Your code should look like this:
+Complete the following [guided tutorial](/lessons/counter/activity) At the end of the tutorial, click **keep editing**. Your code should look like this:
 
 ```blocks
 let count = 0

docs/lessons/counter/quiz-answers.md

@@ -2,7 +2,7 @@
 
 Learn how to create a counter with the BBC micro:bit button. 
 
-This is the answer key for the [counter quiz](/microbit/lessons/counter/quiz).
+This is the answer key for the [counter quiz](/lessons/counter/quiz).
 
 ## 1. What is a variable?
 
@@ -10,7 +10,7 @@ Answers may vary but a variable is a place where you can store and retrieve data
 
 ## 2. Draw the stored value for the variable called count
 
-```
+```blocks
 let count = 0
 ```
 
@@ -22,11 +22,11 @@ We create a **variable**, `count` to keep track of the current count. The number
 
 ## 3. Draw which LEDs are ON after running this code and pressing button "A" once. Explain you chose to draw that number
 
-```
-let count_ = 0
-input.onButtonPressed("A", () => {
-    count_ = count_ + 1
-    basic.showNumber(count, 150)
+```blocks
+let count = 0
+input.onButtonPressed(Button.A, () => {
+    count = count + 1
+    basic.showNumber(count)
 })
 ```
 
@@ -38,11 +38,11 @@ We are only pressing on button pressed once. So the number to display on the mic
 
 ## 4. Draw which LEDs are ON after running this code and pressing button "A" three times. Explain you chose to draw that number
 
-```
-count_ = 0
-input.onButtonPressed("A", () => {
-    count_ = count_ + 1
-    basic.showNumber(count_, 100)
+```blocks
+let count = 0
+input.onButtonPressed(Button.A, () => {
+    count =  + 1
+    basic.showNumber(count)
 })
 ```
 

docs/lessons/counter/quiz.md

@@ -6,7 +6,7 @@ Learn how to create a counter with the BBC micro:bit button.
 
 ## Directions
 
-Use this activity document to guide your work in the [counter tutorial](/microbit/lessons/counter/activity).
+Use this activity document to guide your work in the [counter tutorial](/lessons/counter/activity).
 
 Answer the questions while completing the tutorial. Pay attention to the dialogues!
 
@@ -16,7 +16,7 @@ Answer the questions while completing the tutorial. Pay attention to the dialogu
 
 ## 2. Draw the stored value for the variable called count
 
-```
+```blocks
 let count = 0
 ```
 
@@ -26,11 +26,11 @@ let count = 0
 
 ## 3. Draw which LEDs are ON after running this code and pressing button "A" once. Explain you chose to draw that number
 
-```
-let count_ = 0
-input.onButtonPressed("A", () => {
-    count_ = count_ + 1
-    basic.showNumber(count_, 100)
+```blocks
+let counts = 0
+input.onButtonPressed(Button.A, () => {
+    counts = counts + 1
+    basic.showNumber(counts, 150)
 })
 ```
 
@@ -40,11 +40,11 @@ input.onButtonPressed("A", () => {
 
 ## 4. Draw which LEDs are ON after running this code and pressing button "A" three times. Explain you chose to draw that number
 
-```
-count_ = 0
-input.onButtonPressed("A", () => {
-    count_ = count_ + 1
-    basic.showNumber(count_, 100)
+```blocks
+let counting= 0
+input.onButtonPressed(Button.A, () => {
+    counting = counting + 1
+    basic.showNumber(counting, 100)
 })
 ```
 

docs/lessons/crocodile-clip/activity.md

@@ -1,41 +0,0 @@
-# crocodile clip activity 
-
-Use the crocodile clips 
-
-# micro:bit crocodile clip
-
-![](/static/mb/blocks/lessons/crocodile-clip-0.jpg)
-
-In this project, you will build a circuit with the micro:bit from crocodile clips. Project duration: 15 minutes.
-
-## Materials
-
-* micro:bit, battery holder and 2 AAA batteries
-* Crocodile clips
-
-## Steps
-
-### Step 1
-
-![](/static/mb/lessons/banana-keyboard-1.png)
-
-Using the 1st crocodile clip, connect the end of the crocodile clip onto GND pin on the micro:bit.
-
-### Step 2
-
-![](/static/mb/crocodile-clips-2.jpg)
-
-Using the 1st crocodile clip, connect the unattached end of the crocodile clip onto the 0 pin on the micro:bit.
-
-### Step 3
-
-![](/static/mb/blocks/lessons/crocodile-clip-0.jpg)
-
-Disconnect the end of the crocodile clip from the 0 pin of the micro:bit.
-
-Your circuit is complete!
-
-### Step 10
-
-Connect your micro:bit to your computer using your USB cable and run the [guess the number](/microbit/lhpkbr) script on it.
-

docs/lessons/die-roll.md

@@ -1,6 +1,6 @@
 # die roll lesson
 
-create a die on the BBC micro:bit #button #pressed #math #random #var #string #if #docs
+create a die on the BBC micro:bit.
 
 ### @video td/videos/die-roll-0
 
@@ -10,12 +10,10 @@ If (Conditionals)
 
 ## Quick Links
 
-* [activity](/microbit/lessons/die-roll/activity)
-* [challenges](/microbit/lessons/die-roll/challenges)
-
-## Class
-
-Year 7
+* [activity](/lessons/die-roll/activity)
+* [challenges](/lessons/die-roll/challenges)
+* [quiz](/lessons/die-roll/quiz)
+* [quiz answers](/lessons/die-roll/quiz-answers)
 
 ## Prior learning/place of lesson in scheme of work
 
@@ -23,12 +21,19 @@ Learn how to use an if statements to run code run code depending on whether a co
 
 ## Documentation
 
-* **Variables** : [read more...](/microbit/reference/variables/var)
-* **If** : [read more...](/microbit/blocks/if)
-* **On Shake** : [read more...](/microbit/reference/on-gesture)
-* **Assignment Operator** : [read more...](/microbit/reference/variables/assign)
-* **Pick Random** : [read more...](/microbit/blocks/math)
-* **Show LEDs** : [read more...](/microbit/reference/basic/show-leds)
+```cards
+input.onGesture(Gesture.Shake, () => {})
+let x = 0
+Math.random(3)
+if (true) {}
+basic.showLeds(`
+    . . . . .
+    . . . . .
+    . . # . .
+    . . . . .
+    . . . . .
+    `)
+```
 
 ## Objectives
 
@@ -39,57 +44,3 @@ Learn how to use an if statements to run code run code depending on whether a co
 * learn how to return a random number
 * learn how to conditionally run code depending on whether a condition is true or not
 * learn how to show an image on the LED screen
-
-## Progression Pathways / Computational Thinking Framework
-
-#### Algorithms
-
-* Designs solutions (algorithms) that use repetition and two-way  selection, ie if, then and else.(AL)
-* Uses diagrams to express solutions.(AB)
-*  Uses logical reasoning to predict  outputs, showing an awareness of inputs (AL)
-*  Designs solutions  by decomposing a problem and creates a sub-solution for each of these parts. (DE) (AL) (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)
-* Understands the difference between, and appropriately uses if and if, then and else statements(AL)
-* Uses a range of operators and expressions e.g. Boolean, and applies them in the context of program control. (AL)
-* Selects the appropriate data types(AL) (AB
-
-#### Data & Data Representation
-
-* Understands the difference between data and information(AB)
-* Uses filters or can perform single criteria searches for information.(AL)
-* Performs more complex searches for information e.g. using Boolean and relational operators(AL) (GE) (EV)
-* Defines data types: real numbers and Boolean (AB)
-
-#### Hardware & Processing
-
-* Knows that computers collect data from various input devices, including sensors and application software (AB)
-* Demonstrates responsible use of technologies and online services, and knows a range of ways to report concerns Understands how search engines rank search results (AL)
-
-#### Information Technology
-
-* Collects, organizes, and presents data and information in digital content (AB)
-* Makes appropriate improvements to solutions based on feedback received, and can comment on the success of the solution (EV)
-* Makes judgements about digital content when evaluating and repurposing it for a given audience (EV) (GE)
-* Recognises ethical issues surrounding the application of information technology beyond school.
-
-Computational Thinking Concept: AB = Abstraction; DE = Decomposition; AL = Algorithmic Thinking; EV = Evaluation; GE = Generalisation
-
-## Activity
-
-* time: 20 min.
-* [activity](/microbit/lessons/die-roll/activity)
-
-## Extended Activity
-
-* time: 20 min.
-* [challenges](/microbit/lessons/die-roll/challenges)
-
-## Homework
-
-* Extended Activity: [challenges](/microbit/lessons/die-roll/challenges)
-

docs/lessons/die-roll/activity.md

@@ -165,7 +165,7 @@ input.onGesture(Gesture.Shake, () => {
 
 ### ~avatar avatar
 
-Excellent, you're ready to continue with the [challenges](/microbit/lessons/die-roll/challenges)!
+Excellent, you're ready to continue with the [challenges](/lessons/die-roll/challenges)!
 
 ### ~
 

docs/lessons/die-roll/challenges.md

@@ -4,7 +4,7 @@ Create a die on the micro:bit.
 
 ## Before we get started
 
-Complete the following [guided tutorial](/microbit/lessons/die-roll/activity), your code should look like this:
+Complete the following [guided tutorial](/lessons/die-roll/activity), your code should look like this:
 
 ```blocks 
 input.onGesture(Gesture.Shake, () => {

docs/lessons/die-roll/quiz-answers.md

@@ -2,13 +2,13 @@
 
 Create a die when the BBC micro:bit is shaken 
 
-These are the answers to the [die roll quiz](/microbit/lessons/die-roll/quiz).
+These are the answers to the [die roll quiz](/lessons/die-roll/quiz).
 
 ## 1. Create a variable named 'roll' that will be randomly assigned to a number between 0 and 5.
 
 <br/>
 
-```
+```blocks
 let roll = Math.random(6)
 ```
 
@@ -18,9 +18,10 @@ let roll = Math.random(6)
 
 <br/>
 
-```
+```blocks
+let roll = Math.random(6)
 if (roll == 5) {
-    basic.plotImage(`
+    basic.showLeds(`
 . # . # .
 . . . . .
 . # . # .
@@ -36,9 +37,11 @@ if (roll == 5) {
 
 <br />
 
-```
+```blocks
+
+let roll = Math.random(6)
 if (roll == 5) {
-    basic.plotImage(`
+    basic.showLeds(`
 . # . # .
 . . . . .
 . # . # .
@@ -46,7 +49,7 @@ if (roll == 5) {
 . # . # .
 `)
 } else if (roll == 4) {
-    basic.plotImage(`
+    basic.showLeds(`
 . . . . .
 . # . # .
 . . # . .
@@ -64,9 +67,10 @@ Note: students are only required to write the bottom half of this answer, starti
 
 <br />
 
-```
+```blocks
+let roll = Math.random(6)
 if (roll == 4) {
-    basic.plotImage(`
+    basic.showLeds(`
 . . . . .
 . # . # .
 . . # . .
@@ -74,7 +78,7 @@ if (roll == 4) {
 . . . . .
 `)
 } else if (roll == 3) {
-    basic.plotImage(`
+    basic.showLeds(`
 . . . . .
 . # . # .
 . . . . .
@@ -92,9 +96,10 @@ Note: students are only required to write the bottom half of this answer, starti
 
 <br />
 
-```
+```blocks
+let roll = Math.random(6)
 if (roll == 3) {
-    basic.plotImage(`
+    basic.showLeds(`
 . . . . .
 . # . # .
 . . . . .
@@ -102,7 +107,7 @@ if (roll == 3) {
 . . . . .
 `)
 } else if (roll == 2) {
-    basic.plotImage(`
+    basic.showLeds(`
 # . . . .
 . . . . .
 . . # . .

docs/lessons/die-roll/quiz.md

@@ -6,7 +6,7 @@ Create a die when the BBC micro:bit is shaken
 
 ## Directions
 
-Use this activity document to guide your work in the [die roll tutorial](/microbit/lessons/die-roll/tutorial).
+Use this activity document to guide your work in the [die roll tutorial](/lessons/die-roll/activity).
 
 Answer the questions while completing the tutorial. Pay attention to the dialogues!
 

docs/lessons/digi-yoyo.md

@@ -1,6 +1,6 @@
 # digi yoyo lesson
 
-create a counter with a while loop #while #loop #counter #docs
+create a counter with a while loop.
 
 ### @video td/videos/digi-yoyo-0
 
@@ -10,12 +10,10 @@ While Loop
 
 ## Quick Links
 
-* [activity](/microbit/lessons/digi-yoyo/activity)
-* [challenges](/microbit/lessons/digi-yoyo/challenges)
-
-## Class
-
-Year 7
+* [activity](/lessons/digi-yoyo/activity)
+* [challenges](/lessons/digi-yoyo/challenges)
+* [quiz](/lessons/digi-yoyo/quiz)
+* [quiz answers](/lessons/digi-yoyo/quiz-answers)
 
 ## Prior learning/place of lesson in scheme of work
 
@@ -23,12 +21,12 @@ Learn how to creating a **while loop**, `while condition do` to repeat code whil
 
 ## Documentation
 
-* **variables** : [read more...](/microbit/reference/variables/var)
-* **assignment operator** : [read more...](/microbit/reference/variables/assign)
-* **while loop** : [read more...](/microbit/reference/loops/while)
-* **relational operator ** : [read more...](/microbit/reference/types/number)
-* **pause** : [read more...](/microbit/reference/basic/pause)
-* **show number** : [read more...](/microbit/reference/basic/show-number)
+```cards
+let x = 0
+basic.showNumber(0)
+while (true) {}
+basic.pause(20)
+```
 
 ## Objectives
 
@@ -39,50 +37,3 @@ Learn how to creating a **while loop**, `while condition do` to repeat code whil
 * learn how to pause your code for the specified number of milliseconds
 * learn how to show a number on the LED screen
 
-## Progression Pathways / Computational Thinking Framework
-
-#### Algorithms
-
-* Uses diagrams to express solutions.(AB)
-* Recognises that different solutions exist for the same problem (AL) (AB)  Understands that iteration is the repetition of a process such as a loop (AL)
-* Recognises that different algorithms exist for the same problem (AL) (GE)
-* Represents solutions using a structured notation (AL) (AB)
-*  Can identify similarities and differences in situations and can use these to solve problems (pattern recognition)(GE)
-
-#### Programming & Development
-
-* Creates programs that implement algorithms to achieve given goals (AL)
-*  Declares and assigns variables(AB)
-* Uses a variable and relational operators within a loop to govern termination (AL) (GE)
-* Selects the appropriate data types(AL) (AB
-
-#### Data & Data Representation
-
-* Uses filters or can perform single criteria searches for information.(AL)
-
-#### Communication Networks
-
-* Demonstrates responsible use of technologies and online services, and knows a range of ways to report concerns Understands how search engines rank search results (AL)
-
-#### Information Technology
-
-* Collects, organizes, and presents data and information in digital content (AB)
-* Makes appropriate improvements to solutions based on feedback received, and can comment on the success of the solution (EV)
-* Recognises ethical issues surrounding the application of information technology beyond school.
-
-Computational Thinking Concept: AB = Abstraction; DE = Decomposition; AL = Algorithmic Thinking; EV = Evaluation; GE = Generalisation
-
-## Activity
-
-* time: 20 min.
-* [activity](/microbit/lessons/digi-yoyo/activity)
-
-## Extended Activity
-
-* time: 20 min.
-* [challenges](/microbit/lessons/digi-yoyo/challenges)
-
-## Homework
-
-* Extended Activity: [challenges](/microbit/lessons/digi-yoyo/challenges)
-

docs/lessons/digi-yoyo/activity.md

@@ -18,7 +18,6 @@ let count = 0
 
 Add a while loop that will loop over and over until the variable `count` equals 10.
 
-![](/static/mb/blocks/lessons/digi-yoyo-1.jpg)
 
 ```blocks
 let count = 0
@@ -32,7 +31,7 @@ Let's add a pause. Then show the value of the the count.
 
 
 ```blocks
- let count = 0;
+let count = 0;
 while (count < 10) {
     basic.pause(100);
     basic.showNumber(count)
@@ -48,14 +47,14 @@ let count = 0
 while (count < 10) {
     basic.pause(100)
      basic.showNumber(count)
-    count == count + 1
+    count = count + (count - 1)
 }
 ```
 
 
 ### ~avatar avatar
 
-Excellent, you're ready to continue with the [challenges](/microbit/lessons/digi-yoyo/challenges)!
+Excellent, you're ready to continue with the [challenges](/lessons/digi-yoyo/challenges)!
 
 ### ~
 

docs/lessons/digi-yoyo/challenges.md

@@ -4,7 +4,7 @@ Coding challenges for the digi yoyo.
 
 ## Before we get started
 
-Complete the following [guided tutorial](/microbit/lessons/digi-yoyo/activity), your code should look like this:
+Complete the following [guided tutorial](/lessons/digi-yoyo/activity), your code should look like this:
 
 
 ```blocks
@@ -69,5 +69,7 @@ Now, we need `count` to decrease by one after the micro:bit has displayed the va
 We can do this by adding this line:
 
 ```blocks
-let count = count + (count - 1);
+let count = 0; 
+count = count + (count - 1);
+
 ```

docs/lessons/digi-yoyo/quiz-answers.md

@@ -2,7 +2,7 @@
 
 Answers for digi yoyo quiz. 
 
-This is the answer key for the [digi yoyo quiz](/microbit/lessons/digi-yoyo/quiz).
+This is the answer key for the [digi yoyo quiz](/lessons/digi-yoyo/quiz).
 
 ## 1. Describe what a "while loop" does?
 
@@ -16,7 +16,7 @@ A loop that repeats code while a condition is true.
 
 <br/>
 
-```
+```blocks
 let count = 0
 ```
 
@@ -26,7 +26,8 @@ let count = 0
 
 <br/>
 
-```
+```blocks
+let count = 0
 while (count < 5) {
     count = count + 1
 }

docs/lessons/digi-yoyo/quiz.md

@@ -6,7 +6,7 @@ Create a counter with a while loop
 
 ## Directions
 
-Use this activity document to guide your work in the [digi yoyo tutorial](/microbit/lessons/digi-yoyo/tutorial)
+Use this activity document to guide your work in the [digi yoyo tutorial](/lessons/digi-yoyo/activity)
 
 Answer the questions while completing the tutorial. Pay attention to the dialogues!
 

docs/lessons/flashing-heart.md

@@ -1,6 +1,6 @@
 # flashing heart blocks lesson
 
-Learn how to create LED images with a global variable. #LED #screen  #plot #docs
+Learn how to create LED images with a global variable.
 
 ### @video td/videos/flashing-heart-0
 
@@ -10,25 +10,28 @@ Pause
 
 ## Quick links
 
-* [activity](/microbit/lessons/flashing-heart/activity)
-* [quiz](/microbit/lessons/flashing-heart/quiz)
-* [quiz answers](/microbit/lessons/flashing-heart/quiz-answers)
-* [challenges](/microbit/lessons/flashing-heart/challenges)
-
-## Class
-
-Year 7
-
+* [activity](/lessons/flashing-heart/activity)
+* [quiz](/lessons/flashing-heart/quiz)
+* [quiz answers](/lessons/flashing-heart/quiz-answers)
+* [challenges](/lessons/flashing-heart/challenges)
 ## Prior learning/place of lesson in scheme of work
 
 Learn how to `show LEDs` by showing an image on the LED screen. We will be learning how to create a blinking app using a forever loop as well as simple commands, such as show LEDs, pause, and clear screen.
 
 ## Documentation
 
-* **forever**: [read more...](/microbit/reference/basic/forever)
-* **show LEDs** : [read more...](/microbit/reference/basic/show-leds)
-* **pause**: [read more...](/microbit/reference/basic/pause)
-* **clear screen**: [read more...](/microbit/reference/basic/clear-screen)
+```cards
+basic.forever(() => {})
+basic.showLeds(`
+    . . . . .
+    . . . . .
+    . . # . .
+    . . . . .
+    . . . . .
+    `)
+basic.pause(100)
+basic.clearScreen()
+```
 
 ## Objectives
 
@@ -36,43 +39,3 @@ Learn how to `show LEDs` by showing an image on the LED screen. We will be learn
 * learn how to show LEDs on the LED screen
 * learn how to pause your code for the specified number of milliseconds
 * learn how to turn off all the LED lights on the LED screen
-
-## Progression Pathways / Computational Thinking Framework
-
-#### Algorithms
-
-* Understands that iteration is the repetition of a process such as a loop. (AL)
-* 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)
-
-#### Data & Data Representation
-
-* Understands the difference between data and information. (AB)
-* Defines data types: real numbers and Boolean. (AB)
-
-#### Information Technology
-
-*  Collects, organises and presents data and information in digital content. (AB)
-* Makes appropriate improvements to solutions based on feedback received, and can comment on the success of the solution. (EV)
-
-Computational Thinking Concept: AB = Abstraction; DE = Decomposition; AL = Algorithmic Thinking; EV = Evaluation; GE = Generalisation
-
-## Exercise
-
-* time: 20 min.
-* [activity](/microbit/lessons/flashing-heart/activity)
-* [quiz](/microbit/lessons/flashing-heart/quiz)
-
-## Extended Activity
-
-* time: 20 min.
-* [challenges](/microbit/lessons/flashing-heart/challenges)
-
-## Homework
-
-* Extended Activity: [challenges](/microbit/lessons/flashing-heart/challenges)
-

docs/lessons/flashing-heart/activity.md

@@ -10,8 +10,6 @@ In this activity, you will learn how to blink an image on the LED screen.
 
 ### ~
 
-To create a new script, go to the [Create Code](/microbit/create-code) page and tap *New Project* under *Block Editor*.
-
 Let's start by adding code that plots a heart image on the screen using `show LEDs`. Once you are done coding, don't forget to run your code in the simulator or the micro:bit.
 
 
@@ -69,7 +67,7 @@ basic.forever(() => {
 
 ### ~avatar boothing
 
-Excellent, you're ready to continue with the [challenges](/microbit/lessons/flashing-heart/challenges)!
+Excellent, you're ready to continue with the [challenges](/lessons/flashing-heart/challenges)!
 
 ### ~
 

docs/lessons/flashing-heart/challenges.md

@@ -4,7 +4,7 @@ Coding challenges for the flashing heart tutorial.
 
 ## Before we get started
 
-Complete the [flashing heart](/microbit/lessons/flashing-heart/activity) activity and your code will look like this:
+Complete the [flashing heart](/lessons/flashing-heart/activity) activity and your code will look like this:
 
 ```blocks
 basic.forever(() => {

docs/lessons/flashing-heart/quiz-answers.md

@@ -2,7 +2,7 @@
 
 Learn how to create an image with a variable. 
 
-This is the answer key for the [flashing heart quiz](/microbit/lessons/flashing-heart/quiz).
+This is the answer key for the [flashing heart quiz](/lessons/flashing-heart/quiz).
 
 ## 1. Describe what pause does 
 
@@ -10,13 +10,15 @@ Pause program execution for the specified number of milliseconds.
 
 ## 2. Write the code that leaves an image on the screen for 1 second (1000 milliseconds) 
 
-<br/>
 
-![](/static/mb/blocks/lessons/flashing-heart-5.jpg)
+```blocks
+basic.pause(1000)
+```
 
 ## 3. Write the code that leaves an image on the screen for 1.5 seconds (1500 milliseconds) 
 
-![](/static/mb/blocks/lessons/flashing-heart-6.jpg)
+```blocks
+basic.pause(1500)
+```
 
-<br/>
 

docs/lessons/flashing-heart/quiz.md

@@ -6,25 +6,20 @@ Learn how to create a blinking image with a variable.
 
 ## Directions
 
-Use this activity document to guide your work in the [flashing heart activity](/microbit/lessons/flashing-heart/activity).
+Use this activity document to guide your work in the [flashing heart activity](/lessons/flashing-heart/activity).
 
 Answer the questions while completing the activity. Pay attention to the dialogues!
 
 ## 1. Describe what `pause` does?
 
-<br/>
 
-<br/>
 
 ## 2. Write the code that leaves an image on the screen for 1 second (1000 milliseconds) 
 
-<br/>
 
-<br/>
+
 
 ## 3. Write the code that leaves an image on the screen for 1.5 seconds (1500 milliseconds)
 
-<br/>
 
-<br/>
 

docs/lessons/game-counter.md

@@ -1,6 +1,6 @@
 # game counter lesson
 
-Learn how to create a counter with with on button pressed. #show #number #screen  #number #math #docs
+Learn how to create a counter with with on button pressed.
 
 ### @video td/videos/counter-0
 
@@ -10,12 +10,8 @@ Game Library
 
 ## Quick Links
 
-* [activity](/microbit/lessons/game-counter/activity)
-* [challenges](/microbit/lessons/game-counter/challenges)
-
-## Class
-
-Year 7
+* [activity](/lessons/game-counter/activity)
+* [challenges](/lessons/game-counter/challenges)
 
 ## Prior learning/place of lesson in scheme of work
 
@@ -23,51 +19,14 @@ Learn how to create game blocks to keep track of the current score. We will be l
 
 ## Documentation
 
-* **game library**: [read more...](/microbit/js/game-library)
-* **on button pressed** : [read more...](/microbit/reference/input/on-button-pressed)
-* **show number** : [read more...](/microbit/reference/basic/show-number)
+```cards
+game.addScore(1)
+input.onButtonPressed(Button.A, () => {})
+basic.showNumber(0)
+```
 
 ## Objectives
 
 * learn how arithmetic operators operate on numbers and return a number
 * learn how to run code when an input button is pressed
 * learn how to show a score on the LED screen
-
-## Progression Pathways / Computational Thinking Framework
-
-#### Algorithms
-
-* Understands that iteration is the repetition of a process such as a loop. (AL)
-* 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)
-
-#### Data & Data Representation
-
-* Understands the difference between data and information. (AB)
-* Defines data types: real numbers and Boolean. (AB)
-
-#### Information Technology
-
-*  Collects, organises and presents data and information in digital content. (AB)
-* Makes appropriate improvements to solutions based on feedback received, and can comment on the success of the solution. (EV)
-
-Computational Thinking Concept: AB = Abstraction; DE = Decomposition; AL = Algorithmic Thinking; EV = Evaluation; GE = Generalisation
-
-## Activity
-
-* time: 20 min.
-* [activity](/microbit/lessons/game-counter/activity)
-
-## Extended Activity
-
-* time: 20 min.
-* [challenges](/microbit/lessons/game-counter/challenges)
-
-## Homework
-
-* Extended Activity: [challenges](/microbit/lessons/game-counter/challenges)
-

docs/lessons/game-counter/activity.md

@@ -6,8 +6,6 @@ Turn an LED on and off with forever loop
 
 ### @video td/videos/counter-0
 
-To create a new script, go to the [Create Code](/microbit/create-code) page and tap *New Project* under *Block Editor*.
-
 ### ~
 
 Have you ever tried to create a game counter? The concept is fairly simply: increase the game `score` with `on button pressed` .
@@ -36,7 +34,7 @@ input.onButtonPressed(Button.A, () => {
 
 ### ~avatar boothing
 
-Excellent, you're ready to continue with the [challenges](/microbit/lessons/game-counter/challenges)!
+Excellent, you're ready to continue with the [challenges](/lessons/game-counter/challenges)!
 
 ### ~
 

docs/lessons/game-counter/challenges.md

@@ -4,7 +4,7 @@ Coding challenges for the game counter.
 
 ## Before we get started
 
-Complete the following [activity](/microbit/lessons/game-counter/activity) . Your code should look like this:
+Complete the following [activity](/lessons/game-counter/activity) . Your code should look like this:
 
 ```blocks
 input.onButtonPressed(Button.A, () => {

docs/lessons/game-of-chance.md

@@ -8,12 +8,8 @@ Game Library
 
 ## Quick Links
 
-* [activity](/microbit/lessons/game-of-chance/activity)
-* [challenges](/microbit/lessons/game-of-chance/challenges)
-
-## Class
-
-Year 7
+* [activity](/lessons/game-of-chance/activity)
+* [challenges](/lessons/game-of-chance/challenges)
 
 ## Prior learning / place of lesson in scheme of work
 
@@ -21,57 +17,15 @@ Learn how to creating a message with a **game over** to write your message. We w
 
 ## Documentation
 
-* **game library** : [read more...](/microbit/js/game-library)
-* **show string** : [read more...](/microbit/reference/basic/show-string)
-* **on button pressed** : [read more...](/microbit/reference/input/on-button-pressed)
+
+```cards
+game.gameOver()
+basic.showString("Hello!")
+input.onButtonPressed(Button.A, () => {})
+```
 
 ## Objectives
 
 * learn how to use the game library
 * learn how to show a string on the LED screen one character at a time
 * learn how to use to register an event handler that will execute whenever an input button is pressed
-
-## Progression Pathways / Computational Thinking Framework
-
-#### Algorithms
-
-* Uses diagrams to express solutions.(AB)
-*  Uses logical reasoning to predict  outputs, showing an awareness of inputs (AL)
-* Represents solutions using a structured notation (AL) (AB)
-
-#### Programming & Development
-
-* Creates programs that implement algorithms to achieve given goals (AL)
-
-#### Hardware & Processing
-
-* Knows that computers collect data from various input devices, including sensors and application software (AB)
-
-#### Communication Networks
-
-* Demonstrates responsible use of technologies and online services, and knows a range of ways to report concerns (AL)
-
-#### Information Technology
-
-* Collects, organizes, and presents data and information in digital content (AB)
-* Makes appropriate improvements to solutions based on feedback received, and can comment on the success of the solution (EV)
-* Uses criteria to evaluate the quality of solutions, can identify improvements making some refinements to the solution, and future  solutions (EV)
-* Evaluates the appropriatness of digital devices, internet services and application software to achieve given goals (EV)
-* Recognises ethical issues surrounding the application of information technology beyond school.
-
-Computational Thinking Concept: AB = Abstraction; DE = Decomposition; AL = Algorithmic Thinking; EV = Evaluation; GE = Generalisation
-
-## Activity
-
-* time: 20 min.
-* [activity](/microbit/lessons/game-of-chance/activity)
-
-## Extended Activity
-
-* time: 20 min.
-* [challenges](/microbit/lessons/game-of-chance/challenges)
-
-## Homework
-
-* Extended Activity: [challenges](/microbit/lessons/game-of-chance/challenges)
-

docs/lessons/game-of-chance/activity.md

@@ -10,7 +10,7 @@ basic.showString("SELECT A BUTTON")
 
 ### ~avatar boothing
 
-Excellent, you're ready to continue with the [challenges](/microbit/lessons/game-of-chance/challenges)!
+Excellent, you're ready to continue with the [challenges](/lessons/game-of-chance/challenges)!
 
 ### ~
 

docs/lessons/game-of-chance/challenges.md

@@ -4,7 +4,7 @@ Coding challenges for the answering machine tutorial.
 
 ## Before we get started
 
-Complete the [game of chance](/microbit/lessons/game-of-chance/activity) activity and your code will look like this:
+Complete the [game of chance](/lessons/game-of-chance/activity) activity and your code will look like this:
 
 ```blocks
 basic.showString("SELECT A BUTTON")

docs/lessons/glowing-pendulum.md

@@ -1,6 +1,6 @@
 # glowing pendulum blocks lesson
 
-construct a pendulum that glows using acceleration #var #acceleration #abs #brightness #plot #docs
+construct a pendulum that glows using acceleration.
 
 ## Topic
 
@@ -8,12 +8,10 @@ Acceleration
 
 ## Quick Links
 
-* [activity](/microbit/lessons/glowing-pendulum/activity)
-* [challenges](/microbit/lessons/glowing-pendulum/challenges)
-
-## Class
-
-Year 7
+* [activity](/lessons/glowing-pendulum/activity)
+* [challenges](/lessons/glowing-pendulum/challenges)
+* [quiz](/lessons/glowing-pendulum/quiz)
+* [quiz answers](/lessons/glowing-pendulum/quiz-answers)
 
 ## Prior learning/place of lesson in scheme of work
 
@@ -21,12 +19,20 @@ Learn how to get the acceleration **acceleration**, `acceleration` value (g-forc
 
 ## Documentation
 
-* **forever** : [read more...](/microbit/reference/basic/forever)
-* **local variable** : [read more...](/microbit/reference/variables/var)
-* **acceleration** : [read more...](/microbit/reference/input/acceleration)
-* **absolute value** : [read more...](/microbit/js/math)
-* **set brightness** : [read more...](/microbit/reference/led/set-brightness)
-* **show LEDs** : [read more...](/microbit/reference/basic/show-leds)
+```cards
+basic.forever(() => {})
+let x = 0
+input.acceleration(Dimension.X)
+Math.abs(0)
+led.setBrightness(255)
+basic.showLeds(`
+    . . . . .
+    . . . . .
+    . . # . .
+    . . . . .
+    . . . . .
+    `)
+```
 
 ## Objectives
 
@@ -37,49 +43,3 @@ Learn how to get the acceleration **acceleration**, `acceleration` value (g-forc
 * learn how to sets the brightness of the LED screen
 * learn how to turn on all the LED lights on the LED screen
 
-## Progression Pathways / Computational Thinking Framework
-
-#### Algorithms
-
-* Uses diagrams to express solutions.(AB)
-*  Uses logical reasoning to predict  outputs, showing an awareness of inputs (AL)
-* 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)
-* Uses a variable and relational operators within a loop to govern termination (AL) (GE)
-* Selects the appropriate data types(AL) (AB
-
-#### Data & Data Representation
-
-* Understands the difference between data and information(AB)
-* Uses filters or can perform single criteria searches for information.(AL)
-
-#### Hardware & Processing
-
-* Knows that computers collect data from various input devices, including sensors and application software (AB)
-
-#### Information Technology
-
-* Collects, organizes, and presents data and information in digital content (AB)
-* Makes appropriate improvements to solutions based on feedback received, and can comment on the success of the solution (EV)
-* Recognises ethical issues surrounding the application of information technology beyond school.
-
-Computational Thinking Concept: AB = Abstraction; DE = Decomposition; AL = Algorithmic Thinking; EV = Evaluation; GE = Generalisation
-
-## Activity
-
-* time: 20 min.
-* [activity](/microbit/lessons/glowing-pendulum/activity)
-
-## Extended Activity
-
-* time: 20 min.
-* [challenges](/microbit/lessons/glowing-pendulum/challenges)
-
-## Homework
-
-* Extended Activity: [challenges](/microbit/lessons/glowing-pendulum/challenges)
-

docs/lessons/glowing-pendulum/activity.md

@@ -2,8 +2,6 @@
 
 Construct a pendulum that glows using acceleration. 
 
-To create a new script, go to the [Create Code](/microbit/create-code) page and tap `New Project` under `Block Editor`.
-
 Welcome! This activity will teach how to construct a pendulum that glows using acceleration. Let's get started!
 
 Create a **forever** loop that will constantly display the appropriate brightness on the LED display.
@@ -51,7 +49,7 @@ Let's show what the brightness of the micro:bit is by turning all the LEDs on!
 
 ### ~avatar avatar
 
-Excellent, you're ready to continue with the [challenges](/microbit/lessons/glowing-pendulum/challenges)!
+Excellent, you're ready to continue with the [challenges](/lessons/glowing-pendulum/challenges)!
 
 ### ~
 

docs/lessons/glowing-pendulum/challenges.md

@@ -4,7 +4,7 @@ Coding challenges for the glowing pendulum tutorial.
 
 ## Before we get started
 
-Complete the following [glowing pendulum activity](/microbit/lessons/glowing-pendulum/activity) and your code should look like this:
+Complete the following [glowing pendulum activity](/lessons/glowing-pendulum/activity) and your code should look like this:
 
 ![](/static/mb/blocks/lessons/glowing-pendulum-5.png)
 

docs/lessons/glowing-pendulum/quiz-answers.md

@@ -1,12 +1,12 @@
 # glowing pendulum quiz answers
 
-construct a pendulum that glows using acceleration #LED #number #math #acceleration #docs
+construct a pendulum that glows using acceleration.
 
 ## Name
 
 ## Directions
 
-Use this activity document to guide your work in the [glowing pendulum tutorial](/microbit/lessons/glowing-pendulum/tutorial)
+Use this activity document to guide your work in the [glowing pendulum activity](/lessons/glowing-pendulum/activity)
 
 Answer the questions while completing the tutorial. Pay attention to the dialogues!
 
@@ -20,7 +20,7 @@ We are creating a forever loop to constantly display the appropriate brightness
 
 <br/>
 
-```
+```blocks
 let acceleration = input.acceleration("y")
 ```
 
@@ -28,17 +28,20 @@ let acceleration = input.acceleration("y")
 
 <br/>
 
-```
-acceleration = math.abs(acceleration)
+```blocks
+let acceleration = input.acceleration(Dimension.X)
+let accelerationAbsolute = Math.abs(acceleration)
 ```
 
-## 4. Write the code that uses the acceleration value from question #3 to set the brightness on the BBC micro:bit.
+## 4. Write the code to use the acceleration value from question 3 to set the brightness on the BBC micro:bit.
 
 <br/>
 
-```
-acceleration = acceleration / 4
-led.setBrightness(acceleration)
+```blocks
+let accelerationX = input.acceleration(Dimension.X)
+let accelerationAbsolute = Math.abs(accelerationX)
+let accelerationDivided = accelerationX / 4
+led.setBrightness(accelerationX)
 ```
 
 ## 5. Write the code that tuns all the LEDs on (as the image displays below)

docs/lessons/glowing-pendulum/quiz.md

@@ -1,12 +1,12 @@
 # glowing pendulum quiz
 
-construct a pendulum that glows using acceleration #LED #number #math #acceleration #docs
+construct a pendulum that glows using acceleration.
 
 ## Name
 
 ## Directions
 
-Use this activity document to guide your work in the [glowing pendulum tutorial](/microbit/lessons/glowing-pendulum/tutorial)
+Use this activity document to guide your work in the [glowing pendulum tutorial](/lessons/glowing-pendulum/activity)
 
 Answer the questions while completing the tutorial. Pay attention to the dialogues!
 
@@ -22,7 +22,7 @@ Answer the questions while completing the tutorial. Pay attention to the dialogu
 
 <br/>
 
-## 4. Write the code that uses the acceleration value from question #3 to set the brightness on the BBC micro:bit.
+## 4. Write the code to include acceleration value question 3 to set the brightness on the BBC micro:bit.
 
 <br/>
 

docs/lessons/glowing-sword.md

@@ -1,97 +0,0 @@
-# glowing sword blocks lesson
-
-make a glowing sword #image #docs
-
-### @video td/videos/glowing-sword-0
-
-## Topic
-
-Fade Out
-
-## Quick Links
-
-* [activity](/microbit/lessons/glowing-sword/activity)
-* [quiz](/microbit/lessons/glowing-sword/quiz)
-* [quiz answers](/microbit/lessons/glowing-sword/quiz-answers)
-* [challenges](/microbit/lessons/glowing-sword/challenges)
-
-## Class
-
-Year 7
-
-## Prior learning/place of lesson in scheme of work
-
-Learn how to manipulate an image through **fade out**, `fade out` to gradually decrease the LED screen brightness until the LED lights are turned off. We will be learning how to fade an image using simple commands, such as image create image, image show image, LED fade out, basic pause, and fade in.
-
-## What the teacher needs to know/QuickStart Computing Glossary
-
-* Algorithm: An unambiguous set of rules or a precise step-bystep guide to solve a problem or achieve a particular objective.
-* Computational thinking: Thinking about systems or problems in a way that allows computer systems to be used to model or solve these.
-* Hardware: The physical systems and components of digital devices; see also software.
-* Programmable toys: Robots designed for children to use, accepting input, storing short sequences of simple instructions and moving according to this stored program.
-* Script: A computer program typically executed one line at a time through an interpreter, such as the instructions for a Scratch character.
-* Sequence: To place program instructions in order, with each executed one after the other.
-* Simulation: Using a computer to model the state and behaviour of real-world (or imaginary) systems, including physical or social systems; an integral part of most computer games.
-
-## Documentation
-
-* **create image** : [read more...](/microbit/reference/images/create-image)
-* **show image** : [read more...](/microbit/reference/images/show-image)
-* **fade out** : [read more...](/microbit/reference/led/fade-out)
-* **pause** : [read more...](/microbit/reference/basic/pause)
-* **fade in** : [read more...](/microbit/reference/led/fade-in)
-
-## Resources
-
-* Activity: [activity](/microbit/lessons/glowing-sword/activity)
-* Activity: [quiz](/microbit/lessons/glowing-sword/quiz)
-* Extended Activity: [challenges](/microbit/lessons/glowing-sword/challenges)
-
-## Objectives
-
-* learn how to plot an image
-* learn how to gradually decrease the LED screen brightness until the LED lights are turned off
-* pause your code for the specified number of milliseconds
-* learn how to gradually increase the LED screen brightness until the LED lights are turned on
-
-## Links to the National Curriculum Programmes of Study for Computing
-
-## 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)
-* Selects the appropriate data types(AL) (AB)
-
-#### Information Technology
-
-* Collects, organizes, and presents data and information in digital content (AB)
-* Makes appropriate improvements to solutions based on feedback received, and can comment on the success of the solution (EV)
-* Recognises ethical issues surrounding the application of information technology beyond school.
-
-Computational Thinking Concept: AB = Abstraction; DE = Decomposition; AL = Algorithmic Thinking; EV = Evaluation; GE = Generalisation
-
-## Activity
-
-* time: 20 min.
-* [activity](/microbit/lessons/glowing-sword/activity)
-* [quiz](/microbit/lessons/lucky-7/quiz)
-
-## Extended Activity
-
-* time: 20 min.
-* [challenges](/microbit/lessons/glowing-sword/challenges)
-
-## Homework
-
-* Extended Activity: [challenges](/microbit/lessons/glowing-sword/challenges)
-
-## Intended follow on
-
-Publish script to the classroom.
-

docs/lessons/graphics.md

@@ -44,7 +44,7 @@ Try devising an algorithm for a diagonal line using the code above and the varia
 
 ![](/static/mb/blocks/lessons/graphics-3.png)
 
-We can create more complex algorithms for more complex shapes, too. See the [challenges](/microbit/lessons/challenges) section for additional graphical challenges and solutions.
+We can create more complex algorithms for more complex shapes, too. See the [challenges](/lessons/challenges) section for additional graphical challenges and solutions.
 
 ### Animations
 
@@ -52,7 +52,7 @@ Animations are changes happening at a certain rate. For example, we could add th
 
 We could create more complex animations, for example we could make our BBC micro:bit display an explosion or fireworks.
 
-See the [challenges](/microbit/lessons/challenges) section for some animation tasks.
+See the [challenges](/lessons/challenges) section for some animation tasks.
 
 ### Image variables
 

docs/lessons/guess-the-number.md

@@ -1,6 +1,6 @@
 # guess the number lesson
 
-Learn to create a random number with input from button A. #input #screen #math #docs
+Learn to create a random number with input from button A.
 
 ### @video td/videos/guess-the-number-0
 
@@ -10,12 +10,10 @@ Math - Pick Random
 
 ## Quick links
 
-* [activity](/microbit/lessons/guess-the-number/activity)
-* [challenges](/microbit/lessons/guess-the-number/challenges)
-
-## Class
-
-Year 7
+* [activity](/lessons/guess-the-number/activity)
+* [challenges](/lessons/guess-the-number/challenges)
+* [quiz](/lessons/guess-the-number/quiz)
+* [quiz answers](/lessons/guess-the-number/quiz-answers)
 
 ## Prior learning/place of lesson in scheme of work
 
@@ -23,12 +21,13 @@ Learn how to create numbers randomly by using the input of the BBC micro:bit. We
 
 ## Documentation
 
-* **on button pressed**: [read more...](/microbit/reference/input/on-button-pressed)
-* **local variable **: [read more...](/microbit/reference/variables/var)
-* **assignment operator**: [read more...](/microbit/reference/variables/assign)
-* **show number**: [read more...](/microbit/reference/basic/show-number)
-* **pick number**: [read more...](/microbit/blocks/math)
-* **clear screen**: [read more...](/microbit/reference/basic/clear-screen)
+```cards
+input.onButtonPressed(Button.A, () => {})
+let x = 0
+basic.showNumber(0)
+Math.random(3)
+basic.clearScreen()
+```
 
 ## Objectives
 
@@ -38,42 +37,3 @@ Learn how to create numbers randomly by using the input of the BBC micro:bit. We
 * learn how to returns a random number
 * learn how to show a number on the LED screen, one digit at a time (scrolling left to right)
 * learn how to turn off all the LED lights on the LED screen
-
-## Progression Pathways / Computational Thinking Framework
-
-#### Algorithms
-
-* Understands that iteration is the repetition of a process such as a loop. (AL)
-* 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)
-
-#### Data & Data Representation
-
-* Understands the difference between data and information. (AB)
-* Defines data types: real numbers and Boolean. (AB)
-
-#### Information Technology
-
-*  Collects, organises and presents data and information in digital content. (AB)
-* Makes appropriate improvements to solutions based on feedback received, and can comment on the success of the solution. (EV)
-
-Computational Thinking Concept: AB = Abstraction; DE = Decomposition; AL = Algorithmic Thinking; EV = Evaluation; GE = Generalisation
-
-## Activity
-
-* time: 20 min.
-* [activity](/microbit/lessons/guess-the-number/activity)
-
-## Extended Activity
-
-* time: 20 min.
-* [challenges](/microbit/lessons/guess-the-number/challenges)
-
-## Homework
-
-* Extended Activity: [challenges](/microbit/lessons/guess-the-number/challenges)
-

docs/lessons/guess-the-number/activity.md

@@ -42,7 +42,7 @@ input.onButtonPressed(Button.A, () => {
 
 ### ~avatar avatar
 
-Excellent, you're ready to continue with the [challenges](/microbit/lessons/guess-the-number/challenges)!
+Excellent, you're ready to continue with the [challenges](/lessons/guess-the-number/challenges)!
 
 ### ~
 

docs/lessons/guess-the-number/challenges.md

@@ -4,7 +4,7 @@ Coding challenges for the guess the number tutorial.
 
 ## Before we get started
 
-Complete the following [guided tutorial](/microbit/lessons/guess-the-number/activity), and your code should look like this:
+Complete the following [guided tutorial](/lessons/guess-the-number/activity), and your code should look like this:
 
 ```blocks
 input.onButtonPressed(Button.A, () => {

docs/lessons/guess-the-number/quiz-answers.md

@@ -1,8 +1,8 @@
 # guess the number quiz answers
 
-Learn how to generate a random number on the micro:bit. #math #random #docs
+Learn how to generate a random number on the micro:bit.
 
-This is the answer key for the [guess the number quiz](/microbit/lessons/guess-the-number/quiz).
+This is the answer key for the [guess the number quiz](/lessons/guess-the-number/quiz).
 
 ## 1. What is on button pressed?
 
@@ -12,27 +12,29 @@ Answers may vary. Generally, on button pressed run code when an input button is
 
 Write the line of code that creates a condition when the BBC micro:bit button A is pressed.
 
-```
-input.onButtonPressed("A", () => {
+
+```blocks
+input.onButtonPressed(Button.A, () => {    
 })
 ```
 
-## 3. Consider the following directions
+## 3. Write the line of code that creates a **local variable** and a **random number**.
 
-Write the line of code that creates a **local variable** and a **random number**.
 
-```
+
+
+```blocks
 let randomNumber = Math.random(10)
 ```
 
-## 4. Consider the following code
-
-```
-randomNumber = Math.random(10)
-```
-
+## 4. 
 If the rectangle below represents the BBC micro:bit, shade the areas that will be displayed. Explain why that particular area is shaded.
 
+```blocks
+let randomNumber = Math.random(10)
+```
+
+
 ![](/static/mb/lessons/guess-the-number-0.png)
 
 The random number generator will return a number from 0 to the limit. However, not including the limit unless the limit is 0. So you can place an X to represent any single digit number.

docs/lessons/guess-the-number/quiz.md

@@ -1,12 +1,12 @@
 # guess the number quiz 
 
-Learn how to generate a random number on the micro:bit. #math #random #docs
+Learn how to generate a random number on the micro:bit.
 
 ## Name
 
 ## Directions
 
-Use this activity document to guide your work in the [guess the number tutorial](/microbit/lessons/guess-the-number/tutorial).
+Use this activity document to guide your work in the [guess the number tutorial](/lessons/guess-the-number/activity).
 
 Answer the questions while completing the tutorial. Pay attention to the dialogues!
 
@@ -24,7 +24,7 @@ Answer the questions while completing the tutorial. Pay attention to the dialogu
 
 ## 4. Draw the area that could be lit based on the code below. Explain why you chose to draw that number.
 
-```
+```blocks
 let randomNumber = Math.random(10)
 basic.showNumber(randomNumber, 150)
 ```

docs/lessons/hack-your-headphones.md

@@ -1,6 +1,6 @@
 # hack your headphones lesson
 
-display beautiful images on the BBC micro:bit #var #pause #docs
+display beautiful images on the BBC micro:bit.
 
 ## Topic
 
@@ -8,11 +8,7 @@ Hack your headphone
 
 ## Quick Links
 
-* [activity](/microbit/lessons/hack-your-headphones/activity)
-
-## Class
-
-Year 7
+* [activity](/lessons/hack-your-headphones/activity)
 
 ## Prior learning/place of lesson in scheme of work
 

docs/lessons/hack-your-headphones/activity.md

@@ -52,5 +52,10 @@ You hacked your headphones!
 
 ### Step 6
 
-Connect your micro:bit to your computer using your USB cable and program  [light beatbox](/microbit/lessons/light-beatbox/activity) music on it. Press the reset button to restart your music player!
+Connect your micro:bit to your computer using your USB cable and program  [light beatbox](/lessons/light-beatbox/activity) music on it. Press the reset button to restart your music player!
 
+### ~avatar avatar
+
+Excellent, you're ready to continue with the [challenges](/lessons/light-beatbox/activity)!
+
+### ~

docs/lessons/happy-birthday.md

@@ -1,6 +1,6 @@
 # happy birthday blocks lesson
 
-display beautiful images on the BBC micro:bit #var #pause #docs
+display beautiful images on the BBC micro:bit.
 
 ## Topic
 
@@ -8,12 +8,8 @@ Music
 
 ## Quick Links
 
-* [activity](/microbit/lessons/happy-birthday/activity)
-* [challenges](/microbit/lessons/happy-birthday/challenges)
-
-## Class
-
-Year 7
+* [activity](/lessons/happy-birthday/activity)
+* [challenges](/lessons/happy-birthday/challenges)
 
 ## Prior learning/place of lesson in scheme of work
 
@@ -26,50 +22,7 @@ Learn how to convert your BBC micro:bit into a music player using pins P0 and GN
 * Program: A stored set of instructions encoded in a language understood by the computer that does some form of computation, processing input and/or stored data to generate output.
 * Simulation: Using a computer to model the state and behaviour of real-world (or imaginary) systems, including physical or social systems; an integral part of most computer games.
 
-## Resources
-
-* Activity: [activity](/microbit/lessons/happy-birthday/activity)
-* Extended Activity: [challenges](/microbit/lessons/happy-birthday/challenges)
-
 ## Objectives
 
 * learn how to code music on the BBC micro:bit
 * learn how to setup the BBC micro:bit as a music player
-
-## 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)
-* Selects the appropriate data types(AL) (AB
-
-#### Communication Networks
-
-* Demonstrates responsible use of technologies and online services, and knows a range of ways to report concerns Understands how search engines rank search results (AL)
-
-#### Information Technology
-
-* Collects, organizes, and presents data and information in digital content (AB)
-* Makes appropriate improvements to solutions based on feedback received, and can comment on the success of the solution (EV)
-
-Computational Thinking Concept: AB = Abstraction; DE = Decomposition; AL = Algorithmic Thinking; EV = Evaluation; GE = Generalisation
-
-## Activity
-
-* time: 20 min.
-* [activity](/microbit/lessons/happy-birthday/activity)
-
-## Extended Activity
-
-* time: 20 min.
-* [challenges](/microbit/lessons/happy-birthday/challenges)
-
-## Homework
-
-* Extended Activity: [challenges](/microbit/lessons/happy-birthday/challenges)
-

docs/lessons/happy-birthday/activity.md

@@ -2,8 +2,6 @@
 
 Play sounds with music blocks. 
 
-To create a new script, go to the [Create Code](/microbit/create-code) page and tap `New Project` under `Block Editor`.
-
 Have you ever tried to play a song on an instrument? Let's try coding the song "Happy Birthday" on the micro:bit !
 
 Let's start by adding the code in the music drawer that includes a single musical chord (or pitched sound) with the `play` block. Then insert the chord "C". Once you are done coding, don't forget to run your code in the simulator or the micro:bit.
@@ -52,7 +50,7 @@ basic.pause(100);
 
 ### ~avatar boothing
 
-Excellent, you're ready to continue with the [challenges](/microbit/lessons/happy-birthday/challenges)!
+Excellent, you're ready to continue with the [challenges](/lessons/happy-birthday/challenges)!
 
 ### ~
 

docs/lessons/happy-birthday/challenges.md

@@ -4,7 +4,7 @@ Coding challenges for finishing the song, happy birthday.
 
 ## Before we get started
 
-Complete the [happy birthday](/microbit/lessons/happy-birthday/activity) activity and your code will look like this:
+Complete the [happy birthday](/lessons/happy-birthday/activity) activity and your code will look like this:
 
 
 ```blocks

docs/lessons/headbands.md

@@ -1,6 +1,6 @@
 # headbands lesson
 
-create a charades game that can be played with your friends #data #string #collection #at #Boolean #on-logo-down #on-logo-up #running-time #string #number #docs
+create a charades game that can be played with your friends.
 
 ## Topic
 
@@ -8,10 +8,10 @@ Collection
 
 ## Quick Links
 
-* [tutorial](/microbit/lessons/headbands/tutorial)
-* [quiz](/microbit/lessons/headbands/quiz)
-* [quiz answers](/microbit/lessons/headbands/quiz-answers)
-* [challenges](/microbit/lessons/headbands/challenges)
+* [activity](/lessons/headbands/activity)
+* [quiz](/lessons/headbands/quiz)
+* [quiz answers](/lessons/headbands/quiz-answers)
+
 
 ## Class
 
@@ -42,19 +42,19 @@ Learn how to create a charades game with **collections**, ` create -> Collection
 ## Documentation
 
 * **collection**
-* **global variables** : [read more...](/microbit/js/data)
-* **Boolean** : [read more...](/microbit/reference/types/boolean)
-* **on logo up** [read more...](/microbit/functions/on-logo-up)
-* **on screen down** [read more...](/microbit/functions/on-screen-down)
-* **on screen up** [read more...](/microbit/functions/on-screen-up)
-* **show string** : [read more...](/microbit/reference/basic/show-string)
-* **game library** : [read more...](/microbit/js/game-library)
+* **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)
+* **show string** : [read more...](/reference/basic/show-string)
+* **game library** : [read more...](/reference/game-library)
 
 ## Resources
 
-* Activity: [tutorial](/microbit/lessons/headbands/tutorial)
-* Activity: [quiz](/microbit/lessons/headbands/quiz)
-* Extended Activity: [challenges](/microbit/lessons/headbands/challenges)
+* Activity: [tutorial](/lessons/headbands/activity)
+* Activity: [quiz](/lessons/headbands/quiz)
+* Extended Activity: [challenges](/lessons/headbands/challenges)
 
 ## Objectives
 
@@ -112,17 +112,17 @@ Computational Thinking Concept: AB = Abstraction; DE = Decomposition; AL = Algor
 ## Activity
 
 * time: 20 min.
-* [tutorial](/microbit/lessons/headbands/tutorial)
-* [quiz](/microbit/lessons/headbands/quiz)
+* [tutorial](/lessons/headbands/activity)
+* [quiz](/lessons/headbands/quiz)
 
 ## Extended Activity
 
 * time: 20 min.
-* [challenges](/microbit/lessons/headbands/challenges)
+* [challenges](/lessons/headbands/challenges)
 
 ## Homework
 
-* Extended Activity: [challenges](/microbit/lessons/headbands/challenges)
+* Extended Activity: [challenges](/lessons/headbands/challenges)
 
 ## Intended follow on
 

docs/lessons/headbands/activity.md

@@ -1,17 +1,11 @@
-# headbands challenges
-
-These challenges will teach you how to create a fun charades game to play with your friends. #docs
+# headbands activity
 
 ## Before we get started
 
-Complete the following guided tutorial:
+Your beginning code should look like this:
 
-* [tutorial](/microbit/lessons/headbands/tutorial)
-
-At the tend of the tutorial, click `keep editing`. Your code should look like this:
-
-```
-coll = (<string[]>[])
+```blocks 
+let coll = (<string[]>[])
 coll.push("puppy")
 coll.push("clock")
 coll.push("night")
@@ -32,9 +26,23 @@ game.startCountdown(30000)
 
 Let's add more words for the player to act out! But first, we need to increase the time in one round to give the player more time get through all the words. Let's change the `game->start countdown` statement.
 
-```
-// **. . .**
-game.startCountdown(60000) // ***
+```blocks
+let coll = (<string[]>[])
+coll.push("puppy")
+coll.push("clock")
+coll.push("night")
+coll.push("cat")
+coll.push("cow")
+input.onLogoUp(() => {
+    let index = Math.random(coll.length)
+    let word = coll[index]
+    basic.showString(word, 150)
+})
+input.onScreenDown(() => {
+    game.addScore(1)
+})
+
+game.startCountdown(60000) 
 ```
 
 * Run your code to see if it works as expected
@@ -43,19 +51,26 @@ game.startCountdown(60000) // ***
 
 Now let's add 5 more words to our list of charade words. Right above the the line `word:=coll->at(index)` add 5 lines that say `coll->add("")`. In this example, we will add the words **bicycle, telephone, sun, car, and ant** but you can add whatever words you like.
 
-```
-// . . .
-coll.push("puppy")
+```blocks
+let coll.push("puppy")
 coll.push("clock")
 coll.push("night")
 coll.push("cat")
 coll.push("cow")
-coll.push("bicycle") // ***
-coll.push("telephone") // ***
-coll.push("sun") // ***
-coll.push("car") // ***
-coll.push("ant") // ***
-// . . .
+coll.push("bicycle") 
+coll.push("telephone") 
+coll.push("sun") 
+coll.push("car") 
+coll.push("ant") 
+input.onLogoUp(() => {
+    let index = Math.random(coll.length)
+    let word = coll[index]
+    basic.showString(word, 150)
+})
+input.onScreenDown(() => {
+    game.addScore(1)
+})
+game.startCountdown(30000)
 ```
 
 * Run your code to see if it works as expected.