0.2.64

.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,9 +1,15 @@
 node_modules
-*.sw?
 built
-typings/
-tmp/
+typings
+tmp
+temp
+projects
+win10/app/bin
+win10/app/bld
+
+*.user
+*.sw?
 *.ts.new
 *.tgz
-temp/
 *.db
+*.suo

.travis.yml

@@ -2,8 +2,9 @@ language: node_js
 node_js:
   - "5.7.0"
 script:
-  - "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"
 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,8 @@
+```sim
+basic.forever(() => {
+  basic.showString("Hi!");
+})
+``` 
 # 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.
@@ -57,7 +62,7 @@ basic.showString("BBC micro:bit");
 
 ## 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,80 @@ 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](/microbit/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](/microbit/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](/microbit/device/usb), 
+and about the error messages you might get [here](/microbit/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
+### Bluetooth Low Energy Antenna
 
-### What are the rings labelled 3V and GND?
-
-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.
-
-### 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/usb.md

@@ -1,6 +1,6 @@
 # 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).
 

docs/lessons.md

@@ -1,6 +1,5 @@
 # Lessons 
 
-Overview of lessons for the BBC micro:bit.
 
 ### @short Lessons
 
@@ -52,17 +51,19 @@ Overview of lessons for the BBC micro:bit.
 ### ~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
+* [Pogo](/microbit/lessons/pogo), create a pogo game to test your jumping abilities
 
 ## Advanced
-
+* [Charting](/microbit/lessons/charting), create a charting app between 2 BBC micro:bits
+* [Prank WiFi](/microbit/lessons/prank-wifi), create fake WiFi to trick your friends
+* [Speed Button](/microbit/lessons/speed-button), code a speed game with running time
+* [Headbands](/microbit/lessons/headbands), create a charades game with a collection of strings that hold the words
 * [Hero](/microbit/lessons/hero), reconstruct the classic arcade game pac man with the BBC micro:bit
-
+* [Catch the Egg](/microbit/lessons/catch-the-egg-game), catch falling eggs in a basket with an acceleration controller
 ### ~
 
 ### @section full

docs/lessons/answering-machine.md

@@ -22,12 +22,9 @@ Learn how to creating a message with a **string**, `show string` to write your m
 
 ## Documentation
 
-```docs
+```cards
 basic.showString('Hi!')
-
-input.onButtonPressed(Button.A, () => {
-    
-})
+input.onButtonPressed(Button.A, () => {})
 
 ```
 

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

@@ -1,6 +1,6 @@
 # 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).
 

docs/lessons/answering-machine/quiz.md

@@ -1,6 +1,6 @@
 # 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
 

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
 

docs/lessons/banana-keyboard/activity.md

@@ -81,3 +81,9 @@ Your banana keyboard is ready!
 
 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!
 
+
+### ~avatar boothing
+
+Excellent, you're ready to continue with the [challenges](/microbit/lessons/banana-keyboard/challenges)!
+
+### ~

docs/lessons/beatbox.md

@@ -1,6 +1,6 @@
 # beatbox blocks lesson
 
-display beautiful images on the BBC micro:bit #var #pause #docs
+display beautiful images on the BBC micro:bit.
 
 ## Topic
 

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
 
@@ -20,7 +20,7 @@ Learn how to **show LEDs**,  to show an image on the BBC micro:bit's LED screen.
 
 ## Documentation
 
-```docs
+```cards
 basic.showLeds(`
     . . . . .
     . . . . .
@@ -28,10 +28,7 @@ basic.showLeds(`
     . . . . .
     . . . . .
     `)
-
-
 basic.pause(100)
-
 ```
 
 ## Objectives

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
 

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
 
@@ -23,18 +23,11 @@ Learn how to control a blinking LED. We will be learning how to create a blinkin
 
 ## Documentation
 
-```docs
+```cards
 led.plot(0, 0)
-
 led.unplot(0, 0)
-
 basic.pause(100)
-
-basic.forever(() => {
-    
-})
-
-
+basic.forever(() => {})
 ```
 
 

docs/lessons/blink/quiz-answers.md

@@ -1,6 +1,6 @@
 # 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).
 

docs/lessons/blink/quiz.md

@@ -1,6 +1,6 @@
 # blink blocks quiz
 
-Learn how to create a blinking LED script. #LED #screen  #plot #docs
+Learn how to create a blinking LED script.
 
 ## Name
 

docs/lessons/bop-it/activity.md

@@ -4,13 +4,9 @@ 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(Button.A, () => {
     if (action == 0) {
@@ -21,27 +17,27 @@ input.onButtonPressed(Button.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(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}
  */

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

@@ -1,6 +1,6 @@
 # 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
 

docs/lessons/bop-it/quiz.md

@@ -1,6 +1,6 @@
 # bop it quiz 
 
-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
 

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

@@ -1,6 +1,6 @@
 # catch the egg game lesson
 
-a game to catch eggs in a basket #var #data #if #random #min #max #mod #plot #unplot #pause #accceleration #docs
+A game to catch eggs in a basket.
 
 ### @video td/videos/catch-the-egg-game-0
 
@@ -10,9 +10,9 @@ Variables
 
 ## Quick Links
 
+* [activity](/microbit/lessons/catch-the-egg-game/activity)
 * [quiz](/microbit/lessons/catch-the-egg-game/quiz)
 * [quiz answers](/microbit/lessons/catch-the-egg-game/quiz-answers)
-* [challenges](/microbit/lessons/catch-the-egg-game/challenges)
 
 ## Prior learning/place of lesson in scheme of work
 
@@ -35,7 +35,7 @@ Learn how to create a catch the egg game game with **plot**, `led->plot` , **unp
 
 ## Objectives
 
-* learn how to create a global 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 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

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

@@ -31,14 +31,6 @@ 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!
@@ -64,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)
@@ -77,7 +69,7 @@ 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.
 
@@ -116,7 +108,7 @@ basic.forever(() => {
 
 ### ~avatar avatar surprised
 
-### Challenge 4
+### Challenge 3
 
 ### @video td/videos/catch-the-egg-game-4
 
@@ -150,7 +142,7 @@ basic.forever(() => {
             game.removeLife(1)
         }
     }
-    basic.pause(fallingPause1) // ***
+    basic.pause(fallingPause1) 
 })
 
 ```

docs/lessons/catch-the-egg-game/quiz.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 challenges](/microbit/lessons/catch-the-egg-game/challenges)
+Use this activity document to guide your work in the [catch the egg challenges](/microbit/lessons/catch-the-egg-game/activity)
 
 Answer the questions while completing the tutorial. Pay attention to the dialogues!
 

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
 
@@ -10,9 +10,6 @@ Acceleration
 
 * [activity](/microbit/lessons/charting/activity)
 
-## Class
-
-Year 7
 
 ## Prior learning/place of lesson in scheme of work
 
@@ -20,23 +17,13 @@ Learn the functions of **on data received**, **send number** and **receive numbe
 
 ## Documentation
 
-```docs
-
+```cards
 basic.showNumber(0)
-
 input.acceleration(Dimension.X)
-
 led.plotBarGraph(0, 1023)
-
-radio.onDataReceived(() => {
-
-
-})
-
+radio.onDataReceived(() => {})
 radio.sendNumber(0)
-
 radio.receiveNumber()
-
 ```
 
 ## Objectives

docs/lessons/charting/activity.md

@@ -13,15 +13,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
 
@@ -11,9 +11,7 @@ Music
 * [activity](/microbit/lessons/classic-beatbox/activity)
 * [challenges](/microbit/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/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
 
@@ -21,17 +21,12 @@ Learn how to use an if statements to run code run code depending on whether a co
 
 ## Documentation
 
-```docs
+```cards
 input.compassHeading()
-
 basic.forever(() => {})
-
 let x = 0
-
 if (true) {}
-
 basic.showString("Hello!")
-
 basic.showLeds(`
     . . . . .
     . . . . .

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
 
@@ -21,22 +21,12 @@ Learn how to creating a **variable** to keep track of the current count. We will
 
 ## Documentation
 
-```docs
+```cards
 input.compassHeading()
-
-basic.forever(() => {
-
-
-})
-
+basic.forever(() => {})
 let x = 0
-
-if (true) {
-
-}
-
+if (true) {}
 basic.showString("Hello!")
-
 basic.showLeds(`
     . . . . .
     . . . . .
@@ -44,7 +34,6 @@ basic.showLeds(`
     . . . . .
     . . . . .
     `)
-
 ```
 
 * **variable**: [read more...](/microbit/reference/variables/var)

docs/lessons/counter/quiz-answers.md

@@ -23,10 +23,10 @@ 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
 
 ```blocks
-let counts = 0
+let count = 0
 input.onButtonPressed(Button.A, () => {
-    counts = counts + 1
-    basic.showNumber(counts, 150)
+    count = count + 1
+    basic.showNumber(count)
 })
 ```
 
@@ -39,10 +39,10 @@ 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
 
 ```blocks
-let counting= 0
+let count = 0
 input.onButtonPressed(Button.A, () => {
-    counting = counting + 1
-    basic.showNumber(counting, 100)
+    count =  + 1
+    basic.showNumber(count)
 })
 ```
 

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
 
@@ -21,21 +21,11 @@ Learn how to use an if statements to run code run code depending on whether a co
 
 ## Documentation
 
-```docs
-
-input.onGesture(Gesture.Shake, () => {
-
-})
-
-
-
+```cards
+input.onGesture(Gesture.Shake, () => {})
 let x = 0
-x = Math.random(3)
-
-if (true) {
-
-}
-
+Math.random(3)
+if (true) {}
 basic.showLeds(`
     . . . . .
     . . . . .
@@ -43,10 +33,6 @@ basic.showLeds(`
     . . . . .
     . . . . .
     `)
-
-
-
-
 ```
 
 ## Objectives

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
 
@@ -21,13 +21,11 @@ Learn how to creating a **while loop**, `while condition do` to repeat code whil
 
 ## Documentation
 
-```docs
+```cards
 let x = 0
 basic.showNumber(0)
-while (true) {
-
-    basic.pause(20)
-}
+while (true) {}
+basic.pause(20)
 ```
 
 ## Objectives

docs/lessons/digi-yoyo/activity.md

@@ -47,7 +47,7 @@ let count = 0
 while (count < 10) {
     basic.pause(100)
      basic.showNumber(count)
-    count == count + 1
+    count = count + (count - 1)
 }
 ```
 

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
 
@@ -20,13 +20,8 @@ Learn how to `show LEDs` by showing an image on the LED screen. We will be learn
 
 ## Documentation
 
-```docs
-basic.forever(() => {
-
-
-})
-
-
+```cards
+basic.forever(() => {})
 basic.showLeds(`
     . . . . .
     . . . . .
@@ -34,11 +29,8 @@ basic.showLeds(`
     . . . . .
     . . . . .
     `)
-
 basic.pause(100)
-
 basic.clearScreen()
-
 ```
 
 ## Objectives

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
 
@@ -19,15 +19,10 @@ Learn how to create game blocks to keep track of the current score. We will be l
 
 ## Documentation
 
-```docs
+```cards
 game.addScore(1)
-
-input.onButtonPressed(Button.A, () => {
-
-})
-
+input.onButtonPressed(Button.A, () => {})
 basic.showNumber(0)
-
 ```
 
 ## Objectives

docs/lessons/game-of-chance.md

@@ -18,15 +18,10 @@ Learn how to creating a message with a **game over** to write your message. We w
 ## Documentation
 
 
-```docs
+```cards
 game.gameOver()
-
 basic.showString("Hello!")
-
-input.onButtonPressed(Button.A, () => {
-    
-})
-
+input.onButtonPressed(Button.A, () => {})
 ```
 
 ## Objectives

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
 
@@ -10,10 +10,8 @@ Acceleration
 
 * [activity](/microbit/lessons/glowing-pendulum/activity)
 * [challenges](/microbit/lessons/glowing-pendulum/challenges)
-
-## Class
-
-Year 7
+* [quiz](/microbit/lessons/glowing-pendulum/quiz)
+* [quiz answers](/microbit/lessons/glowing-pendulum/quiz-answers)
 
 ## Prior learning/place of lesson in scheme of work
 
@@ -21,21 +19,12 @@ Learn how to get the acceleration **acceleration**, `acceleration` value (g-forc
 
 ## Documentation
 
-```docs
-
-basic.forever(() => {
-
-
-})
-
+```cards
+basic.forever(() => {})
 let x = 0
-
 input.acceleration(Dimension.X)
-
 Math.abs(0)
-
 led.setBrightness(255)
-
 basic.showLeds(`
     . . . . .
     . . . . .
@@ -43,7 +32,6 @@ basic.showLeds(`
     . . . . .
     . . . . .
     `)
-
 ```
 
 ## Objectives

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

@@ -1,6 +1,6 @@
 # glowing pendulum quiz answers
 
-construct a pendulum that glows using acceleration #LED #number #math #acceleration #docs
+construct a pendulum that glows using acceleration.
 
 ## Name
 
@@ -29,16 +29,19 @@ let acceleration = input.acceleration("y")
 <br/>
 
 ```blocks
-let acceleration = math.abs(acceleration)
+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/>
 
 ```blocks
-let acceleration = acceleration / 4
-led.setBrightness(acceleration)
+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,6 +1,6 @@
 # glowing pendulum quiz
 
-construct a pendulum that glows using acceleration #LED #number #math #acceleration #docs
+construct a pendulum that glows using acceleration.
 
 ## Name
 
@@ -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,6 +1,6 @@
 # glowing sword blocks lesson
 
-make a glowing sword #image #docs
+make a glowing sword.
 
 ### @video td/videos/glowing-sword-0
 

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
 
@@ -21,22 +21,12 @@ Learn how to create numbers randomly by using the input of the BBC micro:bit. We
 
 ## Documentation
 
-```docs
-
-input.onButtonPressed(Button.A, () => {
-
-
-})
-
+```cards
+input.onButtonPressed(Button.A, () => {})
 let x = 0
-
 basic.showNumber(0)
-
 Math.random(3)
-
 basic.clearScreen()
-
-
 ```
 
 ## Objectives

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

@@ -1,6 +1,6 @@
 # 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).
 

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

@@ -1,6 +1,6 @@
 # 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
 

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
 
@@ -10,10 +10,6 @@ Hack your headphone
 
 * [activity](/microbit/lessons/hack-your-headphones/activity)
 
-## Class
-
-Year 7
-
 ## Prior learning/place of lesson in scheme of work
 
 Learn how to convert your BBC micro:bit into a music player using pins P0 and GND, headphones (or speakers), as well as crocodile clips (or spring clips).

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

@@ -54,3 +54,8 @@ You hacked your headphones!
 
 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!
 
+### ~avatar avatar
+
+Excellent, you're ready to continue with the [challenges](/microbit/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
 

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)
+* [activity](/microbit/lessons/headbands/activity)
 * [quiz](/microbit/lessons/headbands/quiz)
 * [quiz answers](/microbit/lessons/headbands/quiz-answers)
-* [challenges](/microbit/lessons/headbands/challenges)
+
 
 ## Class
 

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.

docs/lessons/headbands/quiz-answers.md

@@ -1,12 +1,12 @@
 # headbands quiz answers
 
-create a charades game with a collection of strings #offset #screen  #variables #docs
+create a charades game with a collection of strings.
 
 ## Name
 
 ## Directions
 
-Use this activity document to guide your work in the [headbands tutorial](/microbit/lessons/headbands/tutorial).
+Use this activity document to guide your work in the [headbands tutorial](/microbit/lessons/headbands/activity).
 
 Answer the questions while completing the tutorial. Pay attention to the dialogues!
 
@@ -18,8 +18,8 @@ A 'collection' is a group of variables of the same type stored together. A 'coll
 
 ## 2. Consider the following lines of code.
 
-```
-coll = (<string[]>[])
+```blocks
+let coll = (<string[]>[])
 coll.push("puppy")
 coll.push("clock")
 ```
@@ -28,14 +28,14 @@ Write the line of code that will display the string "puppy" using `data->coll`.
 
 <br/>
 
-```
+```blocks
 basic.showString(coll[0], 150)
 ```
 
 ## 3. Consider the following lines of code.
 
-```
-coll = (<string[]>[])
+```blocks
+let coll = (<string[]>[])
 coll.push("puppy")
 coll.push("clock")
 coll.push("cat")
@@ -45,22 +45,22 @@ Write the line of code that will display the string "cat" using `data->coll`.
 
 <br/>
 
-```
+```blocks
 basic.showString(coll[2], 150)
 ```
 
 ## 4. Consider the following line of code.
 
-```
-coll = (<string[]>[])
+```blocks
+let coll = (<string[]>[])
 ```
 
 Write the five (5) lines of code that will add the following five words to `data->coll`: puppy, clock, night, cat, cow.
 
 <br/>
 
-```
-coll.push("puppy")
+```blocks
+let coll.push("puppy")
 coll.push("clock")
 coll.push("night")
 coll.push("cat")
@@ -71,7 +71,7 @@ coll.push("cow")
 
 <br/>
 
-```
+```blocks
 let index = Math.random(coll.length)
 let word = coll[index]
 ```

docs/lessons/headbands/quiz.md

@@ -1,12 +1,12 @@
 # headbands quiz
 
-create a charades game with a collection of strings #offset #screen  #variables #docs
+create a charades game with a collection of strings.
 
 ## Name
 
 ## Directions
 
-Use this activity document to guide your work in the [headbands tutorial](/microbit/lessons/headbands/tutorial).
+Use this activity document to guide your work in the [headbands tutorial](/microbit/lessons/headbands/activity).
 
 Answer the questions while completing the tutorial. Pay attention to the dialogues!
 
@@ -18,8 +18,8 @@ Answer the questions while completing the tutorial. Pay attention to the dialogu
 
 ## 2. Write the line of code that will display the string "puppy" using "data->coll".
 
-```
-coll = (<string[]>[])
+```blocks
+let coll = (<string[]>[])
 coll.push("puppy")
 coll.push("clock")
 ```
@@ -28,8 +28,8 @@ coll.push("clock")
 
 ## 3. Write the line of code that will display the string "cat" using `"data->coll".
 
-```
-coll = (<string[]>[])
+```blocks
+let coll = (<string[]>[])
 coll.push("puppy")
 coll.push("clock")
 coll.push("cat")
@@ -40,7 +40,7 @@ coll.push("cat")
 ## 4. Write the five (5) lines of code that will add the following five words to `data->coll`: puppy, clock, night, cat, cow.
 
 ```
-coll = (<string[]>[])
+let coll = (<string[]>[])
 ```
 
 <br/>

docs/lessons/hero.md

@@ -1,6 +1,6 @@
 # hero 
 
-make a game to test hand-eye coordination #docs #functions #var
+make a game to test hand-eye coordination.
 
 Make a game to test hand-eye coordination
 

docs/lessons/hero/activity.md

@@ -39,8 +39,14 @@ ghost.change(LedSpriteProperty.Blink, 100);
 
 We want to identify the food so the player moves towards the food. We need to set the `brightness` of the `variable` food to 8. The brightness of the LED screen is expressed as a number between 0 and 255.
 
-![](/static/mb/blocks/lessons/hero-3.png)
+```blocks
+let hero = game.createSprite(2, 2);
+let food = game.createSprite(4, 4);
+let ghost = game.createSprite(0, 0);
+ghost.change(LedSpriteProperty.Blink, 100);
+food = led.brightness() == 8;
 
+```
 
 We want to include a block from the Loops drawer called `While`. Then set the `While` loop to `true`. This code will be important for repeating code of the game logic of the game. The game will continue to run using `While` loop while the Boolean condition is true. Finally, include a `pause` of 400 milliseconds before the logic of the game begins.
 
@@ -50,52 +56,223 @@ let hero = game.createSprite(2, 2);
 let food = game.createSprite(4, 4);
 let ghost = game.createSprite(0, 0);
 ghost.change(LedSpriteProperty.Blink, 100);
+food = led.brightness() == 8;
 while (true) {
-    basic.pause(400)
+    basic.pause(400);
 }
+
+
 ```
 
 Let's create a function that will take care of keep the ghost pursuing the hero. We will need to a conditional statement that checks the position of the ghost and hero. The first condition will check if the horizontal coordinates of the ghost is less than the horizontal coordinates of the hero. We create a function from the Game drawer that will check the coordinates of the hero and the ghost. Finally, change the x-direction of the ghost by 1.
 
 Then create another function that will take care of keep the ghost pursuing the hero. We will need to a conditional statement that checks the position of the ghost and hero. The second condition will check if the horizontal coordinates of the ghost is greater than the x-direction of hero. We create a function from the Game drawer that will check the x-direction of hero and ghost. Finally, change the x-direction of the ghost by -1.
 
-![](/static/mb/blocks/lessons/hero-5.png)
+```blocks
+let hero = game.createSprite(2, 2);
+let food = game.createSprite(4, 4);
+let ghost = game.createSprite(0, 0);
+ghost.change(LedSpriteProperty.Blink, 100);
+food = led.brightness() == 8;
+while (true) {
+    basic.pause(400);
+    if (ghost.get(LedSpriteProperty.X) < hero.get(LedSpriteProperty.X)) {
+        ghost.change(LedSpriteProperty.X, 1);
+    }
+    else if (ghost.get(LedSpriteProperty.X) > hero.get(LedSpriteProperty.X)) {
+        ghost.change(LedSpriteProperty.X,  -1 );
+    }
+    else if (false) {
+    }
+    else if (false) {
+    }
+   
+}
+
+
+```
 
 Let's create the third function and forth function that continues the same logic in the y-direction of pacman and ghost. We create a function from the Game drawer that will check the y-direction of pacman and ghost. Finally, change the y-direction of the ghost to continue following pacman.
 
-![](/static/mb/blocks/lessons/hero-6.png)
+```blocks
+let hero = game.createSprite(2, 2);
+let food = game.createSprite(4, 4);
+let ghost = game.createSprite(0, 0);
+ghost.change(LedSpriteProperty.Blink, 100);
+food = led.brightness() == 8;
+while (true) {
+    basic.pause(400);
+    if (ghost.get(LedSpriteProperty.X) < hero.get(LedSpriteProperty.X)) {
+        ghost.change(LedSpriteProperty.X, 1);
+    }
+    else if (ghost.get(LedSpriteProperty.X) < hero.get(LedSpriteProperty.X)) {
+        ghost.change(LedSpriteProperty.X,  -1 );
+    }
+    else if (ghost.get(LedSpriteProperty.Y) < hero.get(LedSpriteProperty.Y)) {
+        ghost.change(LedSpriteProperty.Y, 1);
+    }
+    else if (ghost.get(LedSpriteProperty.Y) > hero.get(LedSpriteProperty.Y)) {
+        ghost.change(LedSpriteProperty.Y,  -1 );
+    }
+   
+}
+
+
+```
 
 Let's enable pacman to move in the x-direction and move in the y-direction with acceleration using the micor:bit sensor
 
-![](/static/mb/blocks/lessons/hero-7.png)
-
-**Do not disconnect the blocks for the conditional statements. We are focusing on this section of the code and are not showing the entire code**
+```blocks
+let hero = game.createSprite(2, 2);
+let food = game.createSprite(4, 4);
+let ghost = game.createSprite(0, 0);
+ghost.change(LedSpriteProperty.Blink, 100);
+food = led.brightness() == 8;
+while (true) {
+    basic.pause(400);
+    if (ghost.get(LedSpriteProperty.X) < hero.get(LedSpriteProperty.X)) {
+        ghost.change(LedSpriteProperty.X, 1);
+    }
+    else if (ghost.get(LedSpriteProperty.X) < hero.get(LedSpriteProperty.X)) {
+        ghost.change(LedSpriteProperty.X,  -1 );
+    }
+    else if (ghost.get(LedSpriteProperty.Y) < hero.get(LedSpriteProperty.Y)) {
+        ghost.change(LedSpriteProperty.Y, 1);
+    }
+    else if (ghost.get(LedSpriteProperty.Y) > hero.get(LedSpriteProperty.Y)) {
+        ghost.change(LedSpriteProperty.Y,  -1 );
+    }
+    if (input.acceleration(Dimension.X) > 200) {
+        hero.change(LedSpriteProperty.X, 1);
+    }
+    else if (input.acceleration(Dimension.X) <  -200 ) {
+        hero.change(LedSpriteProperty.X,  -1 );
+    }
+    if (input.acceleration(Dimension.Y) > 200) {
+        hero.change(LedSpriteProperty.Y, 1);
+    }
+    else if (input.acceleration(Dimension.Y) >  -200 ) {
+        hero.change(LedSpriteProperty.Y,  -1 );
+    }
+}
+```
 
 Let's setup the logic for the food. If hero  is `touching` "food", increase the score of the game by 1 and `set` ``x`` -direction of food randomly randomly from 0 to 4 and `set` ``y``-direction of food randomly from 0 to 4.
 
-![](/static/mb/blocks/lessons/hero-8.jpg)
+```blocks
+let hero = game.createSprite(2, 2);
+let food = game.createSprite(4, 4);
+let ghost = game.createSprite(0, 0);
+ghost.change(LedSpriteProperty.Blink, 100);
+food = led.brightness() == 8;
+while (true) {
+    basic.pause(400);
+    if (ghost.get(LedSpriteProperty.X) < hero.get(LedSpriteProperty.X)) {
+        ghost.change(LedSpriteProperty.X, 1);
+    }
+    else if (ghost.get(LedSpriteProperty.X) < hero.get(LedSpriteProperty.X)) {
+        ghost.change(LedSpriteProperty.X,  -1 );
+    }
+    else if (ghost.get(LedSpriteProperty.Y) < hero.get(LedSpriteProperty.Y)) {
+        ghost.change(LedSpriteProperty.Y, 1);
+    }
+    else if (ghost.get(LedSpriteProperty.Y) > hero.get(LedSpriteProperty.Y)) {
+        ghost.change(LedSpriteProperty.Y,  -1 );
+    }
+    if (input.acceleration(Dimension.X) > 200) {
+        hero.change(LedSpriteProperty.X, 1);
+    }
+    else if (input.acceleration(Dimension.X) <  -200 ) {
+        hero.change(LedSpriteProperty.X,  -1 );
+    }
+    if (input.acceleration(Dimension.Y) > 200) {
+        hero.change(LedSpriteProperty.Y, 1);
+    }
+    else if (input.acceleration(Dimension.Y) >  -200 ) {
+        hero.change(LedSpriteProperty.Y,  -1 );
+    }
+    if (hero.isTouching(food)) {
+        game.addScore(1);
+        food.set(LedSpriteProperty.X, Math.random(5));
+        food.set(LedSpriteProperty.Y, Math.random(5));
+    }
 
-**Do not disconnect the blocks from the conditional statements. We are focusing on this section of the code and are not showing the entire code**
+}
 
-Let's setup the logic for the food and the ghost to be in different quadrants.
 
-![](/static/mb/blocks/lessons/hero-9.jpg)
+```
 
-**Do not disconnect the blocks for the conditional statements. We are focusing on this section of the code and are not showing the entire code**
 
-The game over component is now upon the game. If the hero is `touching` the ghost, let's display `game over`
 
-![](/static/mb/blocks/lessons/hero-10.jpg)
+Let's setup the logic for the food and the ghost to be in different quadrants. Finally, the game over component is now upon the game. If the hero is `touching` the ghost, let's display `game over`
 
-**Do not disconnect the conditional statements blocks from the remaining blocks. We are focusing on this section of the code and are not showing the entire code**
+```blocks
 
-The game can also use the buttons. Let's create a `while` loop for button A is pressed. If button A is pressed, the micro:bit will display the word Hero. Let's use a `while` loop for button B is pressed. If button B is pressed, the micro:bit will display image of the hero.
+let hero = game.createSprite(2, 2);
+let food = game.createSprite(4, 4);
+let ghost = game.createSprite(0, 0);
+let ghost.change(LedSpriteProperty.Blink, 100);
+food = led.brightness() == 8;
+while (true) {
+    basic.pause(400);
+    if (ghost.get(LedSpriteProperty.X) < hero.get(LedSpriteProperty.X)) {
+        ghost.change(LedSpriteProperty.X, 1);
+    }
+    else if (ghost.get(LedSpriteProperty.X) < hero.get(LedSpriteProperty.X)) {
+        ghost.change(LedSpriteProperty.X,  -1 );
+    }
+    else if (ghost.get(LedSpriteProperty.Y) < hero.get(LedSpriteProperty.Y)) {
+        ghost.change(LedSpriteProperty.Y, 1);
+    }
+    else if (ghost.get(LedSpriteProperty.Y) > hero.get(LedSpriteProperty.Y)) {
+        ghost.change(LedSpriteProperty.Y,  -1 );
+    }
+    if (input.acceleration(Dimension.X) > 200) {
+        hero.change(LedSpriteProperty.X, 1);
+    }
+    else if (input.acceleration(Dimension.X) <  -200 ) {
+        hero.change(LedSpriteProperty.X,  -1 );
+    }
+    if (input.acceleration(Dimension.Y) > 200) {
+        hero.change(LedSpriteProperty.Y, 1);
+    }
+    else if (input.acceleration(Dimension.Y) >  -200 ) {
+        hero.change(LedSpriteProperty.Y,  -1 );
+    }
+    if (hero.isTouching(food)) {
+        game.addScore(1);
+        food.set(LedSpriteProperty.X, Math.random(5));
+        food.set(LedSpriteProperty.Y, Math.random(5));
+        if (food.get(LedSpriteProperty.X) < 2 && food.get(LedSpriteProperty.Y) < 2) {
+            ghost.set(LedSpriteProperty.X, 4);
+            ghost.set(LedSpriteProperty.Y, 4);
+        }
+        else if (food.get(LedSpriteProperty.X) > 2 && food.get(LedSpriteProperty.Y) < 2) {
+            ghost.set(LedSpriteProperty.X, 0);
+            ghost.set(LedSpriteProperty.Y, 4);
+        }
+        else if (food.get(LedSpriteProperty.X) < 2 && food.get(LedSpriteProperty.Y) > 2) {
+            ghost.set(LedSpriteProperty.X, 4);
+            ghost.set(LedSpriteProperty.Y, 0);
+        }
+        else {
+            ghost.set(LedSpriteProperty.X, 0);
+            ghost.set(LedSpriteProperty.Y, 0);
+        }
+    }
+    if (hero.isTouching(ghost)) {
+        game.gameOver();
+    }
 
-![](/static/mb/blocks/lessons/hero-11.jpg)
+}
+0.set(LedSpriteProperty.X, 4);
+
+
+```
 
 ### ~avatar avatar
 
-You can review the final code for [hero](/microbit/numraj)
+Congratulations! You have a homemade hero game based on the classic version of PacMan
 
 ### ~
 

docs/lessons/light-beatbox.md

@@ -1,6 +1,6 @@
 # light beatbox 
 
-display beautiful images on the BBC micro:bit #var #pause #docs
+display beautiful images on the BBC micro:bit.
 
 ## Topic
 

docs/lessons/looper.md

@@ -1,6 +1,6 @@
 # looper blocks lesson
 
-Learn to control blinking LEDs. #LED #screen  #for #docs
+Learn to control blinking LEDs.
 
 ### @video td/videos/looper-0
 
@@ -26,10 +26,8 @@ Learn how to control a blinking LED. We will be learning how to create a blinkin
 
 ## Documentation
 
-```docs
-for (let i = 0; i < 5; i++) {
-
-}
+```cards
+for (let i = 0; i < 5; i++) {}
 basic.showNumber(0)
 basic.pause(100)
 

docs/lessons/looper/quiz-answers.md

@@ -1,6 +1,6 @@
 # looper quiz answers
 
-Learn how to create a series of numbers with a for loop. #LED #screen #plot #docs
+Learn how to create a series of numbers with a for loop.
 
 This is the answer key for the [looper quiz](/microbit/lessons/looper/quiz).
 

docs/lessons/looper/quiz.md

@@ -1,6 +1,6 @@
 # looper quiz
 
-Learn how to create a series of numbers with a for loop. #LED #screen #plot #docs
+Learn how to create a series of numbers with a for loop.
 
 ## Name
 

docs/lessons/love-meter.md

@@ -1,6 +1,6 @@
 # love meter blocks lesson
 
-create a love meter with the BBC micro:bit #pin #pressed #string #if #var #pause #show #docs
+create a love meter with the BBC micro:bit.
 
 ### @video td/videos/love-meter-0
 
@@ -22,19 +22,11 @@ Learn how to use the **pin pressed**, `on pin pressed` to run code when the user
 
 ## Documentation
 
-```docs
-if (true) {
-
-}
-
-input.onPinPressed(TouchPin.P0, () => {
-
-})
+```cards
+if (true) {}
+input.onPinPressed(TouchPin.P0, () => {})
 let x = 0
 Math.random(3)
 basic.showNumber(0)
 basic.pause(100)
-
-
-
 ```

docs/lessons/lucky-7.md

@@ -1,6 +1,6 @@
 # lucky 7 blocks lesson
 
-show a number on the LED screen #show #number #docs
+show a number on the LED screen.
 
 ### @video td/videos/lucky-7-0
 

docs/lessons/magic-8.md

@@ -1,6 +1,6 @@
 # magic 8 lesson
 
-a fortune teller game with the BBC micro:bit #string #shake #clear-screen #if #string #number #var #docs
+a fortune teller game with the BBC micro:bit.
 
 ## Topic
 
@@ -19,14 +19,10 @@ Learn how to creating **conditionals**, `if condition do` to conditionally run c
 
 ## Documentation
 
-```docs
-if (true) {
-
-}
+```cards
+if (true) {}
 Math.random(3)
-input.onGesture(Gesture.Shake, () => {
-
-})
+input.onGesture(Gesture.Shake, () => {})
 basic.showNumber(7)
 basic.clearScreen()
 basic.showString("Hello!")

docs/lessons/magic-8/quiz-answers.md

@@ -1,6 +1,6 @@
 # magic 8 quiz answers
 
-create a magic 8 ball on the BBC micro:bit #math #random #docs
+create a magic 8 ball on the BBC micro:bit.
 
 ## Name
 

docs/lessons/magic-8/quiz.md

@@ -1,6 +1,6 @@
 # magic 8 quiz 
 
-create a magic 8 ball on the BBC micro:bit #math #random #docs
+create a magic 8 ball on the BBC micro:bit.
 
 ## Name
 

docs/lessons/magic-logo.md

@@ -1,6 +1,6 @@
 # magic logo lesson
 
-show an image that points up when the logo is up #logo #point #docs
+show an image that points up when the logo is up.
 
 ### @video td/videos/magic-logo-0
 
@@ -20,13 +20,9 @@ On Logo Up
 Learn how to plot image **on logo up**, `on logo up` to run code when the micro:bit screen is facing up and vertically orientated. We will be learning how to plot an image with the logo up, basic show LEDs, and logo down.
 
 ## Documentation
-```docs
-input.onLogoUp(() => {
-
-})
-input.onLogoDown(() => {
-    
-})
+```cards
+input.onLogoUp(() => {})
+input.onLogoDown(() => {})
 basic.showLeds(`
     . . . . .
     . . . . .
@@ -34,8 +30,6 @@ basic.showLeds(`
     . . . . .
     . . . . .
     `)
-
-
 ```
 
 ## Objectives

docs/lessons/magic-logo/quiz-answers.md

@@ -1,6 +1,6 @@
 # magic logo quiz answers
 
-show an image that points up when the logo is up #logo #show #create #docs
+show an image that points up when the logo is up.
 
 ## Name
 

docs/lessons/magic-logo/quiz.md

@@ -1,6 +1,6 @@
 # magic logo quiz
 
-show an image that points up when the logo is up #logo #show #create #docs
+show an image that points up when the logo is up.
 
 ## Name
 

docs/lessons/night-light.md

@@ -1,6 +1,6 @@
 # night light lesson
 
-change the brightness of the BBC micro:bit #brightness #plot #docs
+change the brightness of the BBC micro:bit.
 
 ### @video td/videos/night-light-0
 
@@ -21,11 +21,9 @@ Learn how to **set brightness** of an image `set brightness` to set the brightne
 
 ## Documentation
 
-```docs
+```cards
 led.setBrightness(255)
-input.onButtonPressed(Button.A, () => {
-
-})
+input.onButtonPressed(Button.A, () => {})
 basic.showLeds(`
     . . . . .
     . . . . .
@@ -33,7 +31,6 @@ basic.showLeds(`
     . . . . .
     . . . . .
     `)
-
 ```
 
 ## Objectives

docs/lessons/night-light/quiz-answers.md

@@ -1,6 +1,6 @@
 # night light quiz answers
 
-Answers to the night light quiz. #LED #image #brightness #fade #docs
+Answers to the night light quiz.
 
 This is the answer key for the [night light quiz](/microbit/lessons/night-light/quiz).
 

docs/lessons/night-light/quiz.md

@@ -1,6 +1,6 @@
 # night light quiz
 
-change the brightness of the BBC micro:bit #LED #image #brightness #fade #docs
+change the brightness of the BBC micro:bit.
 
 ## Name
 

docs/lessons/offset-image/activity.md

@@ -4,13 +4,9 @@ Coding challenges for the offset image tutorial. #docs
 
 ## Before we get started
 
-Complete the following guided tutorial:
+Complete the following exercise. Your code should look like this:
 
-* [tutorial](/microbit/lessons/offset-image/tutorial)
-
-At the end of the tutorial, click `keep editing`. Your code should look like this:
-
-```
+```blocks
 offset = 0
 basic.forever(() => {
     if (offset == -4) {

docs/lessons/offset-image/quiz-answers.md

@@ -1,6 +1,6 @@
 # offset image quiz answers
 
-shift an image horizontally across the display with offset #offset #screen  #variables #docs
+shift an image horizontally across the display with offset.
 
 This is the answer key for the [offset image quiz](/microbit/lessons/offset-image/quiz).
 

docs/lessons/offset-image/quiz.md

@@ -1,6 +1,6 @@
 # offset image quiz
 
-shift an image horizontally across the display with offset #offset #screen  #variables #docs
+shift an image horizontally across the display with offset.
 
 ## Name
 

docs/lessons/ornament-chain/activity.md

@@ -1,80 +0,0 @@
-# ornament chain activity 
-
-Build a telgraph 
-
-# micro:bit Ornament Chain
-
-![](/static/mb/lessons/ornament-chain-0.jpg)
-
-![](/static/mb/lessons/ornament-chain-1.jpg)
-
-In this project, you will build your ornament chain between micro:bits. 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/lessons/ornament-chain-2.png)
-
-Using the 2nd crocodile clip, connect the end of the crocodile clip onto the 3V pin on the micro:bit.
-
-### Step 3
-
-![](/static/mb/lessons/ornament-chain-3.png)
-
-Using the 3rd crocodile clip, connect the end of the crocodile clip onto pin 1 of the micro:bit.
-
-### Step 4
-
-![](/static/mb/lessons/ornament-chain-4.png)
-
-Using the 4th crocodile clip, connect the end of the crocodile clip onto pin 2 of the micro:bit.
-
-### Step 5
-
-![](/static/mb/lessons/ornament-chain-5.png)
-
-Using the 1st crocodile clip, connect the unattached end of the crocodile clip onto the GND on the 2nd micro:bit.
-
-### Step 6
-
-![](/static/mb/lessons/ornament-chain-6.png)
-
-Using the 2nd crocodile clip, connect the unattached end of the crocodile clip onto the 3V pin on the 2nd micro:bit.
-
-### Step 7
-
-![](/static/mb/lessons/ornament-chain-7.png)
-
-Using the 3rd crocodile clip, connect the unattached end of the crocodile clip onto pin 2 of the 2nd micro:bit.
-
-### Step 8
-
-![](/static/mb/lessons/ornament-chain-8.png)
-
-Using the 4th crocodile clip, connect the unattached end of the crocodile clip onto pin 1 of the 2nd micro:bit
-
-### Step 9
-
-![](/static/mb/lessons/ornament-chain-0.jpg)
-
-![](/static/mb/lessons/ornament-chain-1.jpg)
-
-Your ornament chain is ready!
-
-### Step 10
-
-* Connect the first micro:bit to your computer using your USB cable and run the [ornament chain](/microbit/fcicvk) script on it.
-* Connect the second micro:bit to your computer using your USB cable and run the [ornament chain](/microbit/fcicvk) script on it.
-* The first person and second person take turns pressing button A to start the ornament chain game!

docs/lessons/pogo.md

@@ -1,6 +1,6 @@
 # pogo lesson
 
-create a game that relies on precise instincts and timing reflexes #if #  #function #data #forever #var #button #if #assignment #pause #string  #number #docs
+create a game that relies on precise instincts and timing reflexes #if #.
 
 ## Topic
 
@@ -10,24 +10,30 @@ Running Time
 
 * [activity](/microbit/lessons/pogo/activity)
 
-## Class
-
-Year 7
-
 ## Prior learning/place of lesson in scheme of work
 
 Learn how to use running time. We will be learning how to create a pogo game using variables, forever loop, conditionals, on button pressed, as well as simple commands, such as show LEDs and clear screen.
 
 ## Documentation
-
-* **variable** : [read more...](/microbit/reference/variables/var)
-* **arithmetic operator** : [read more...](/microbit/reference/types/number)
-* **forever** : [read more...](/microbit/reference/basic/forever)
-* **on button pressed** : [read more...](/microbit/reference/input/on-button-pressed)
-* **if** : [read more...](/microbit/reference/logic/if)
-* **clear screen** : [read more...](/microbit/reference/basic/clear-screen)
-* **show LEDs** : [read more...](/microbit/reference/basic/show-leds)
-
+```cards
+let jumps = 0
+let acc = input.acceleration(Dimension.Y)
+basic.showNumber(0)
+radio.receiveNumber()
+led.stopAnimation()
+radio.sendNumber(0)
+basic.forever(() => { })
+basic.showLeds(`
+    . . . . .
+    . # . # .
+    . . # . .
+    # . . . #
+    . # # # .
+    `)
+basic.clearScreen()
+if (true) {}
+radio.onDataReceived(() => { })
+```
 ## Objectives
 
 * learn how to create a function as a unit of code that performs a specific task and returns a result
@@ -36,25 +42,3 @@ Learn how to use running time. We will be learning how to create a pogo game usi
 * learn how to conditionally run code depending on whether a condition is true or not
 * learn how to run code when an input button is pressed
 * learn how to pause your code for the specified number of milliseconds
-
-## 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)
-* 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 post-tested loop e.g.‘until’,and a sequence of selection statements in programs,including an if,then and else statement(AL)
-* Understands the difference between, and appropriately uses if and if, then and else statements(AL)
-* Uses a variable and relational operators within a loop to govern termination (AL) (GE)
-* 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
-
-Computational Thinking Concept: AB = Abstraction; DE = Decomposition; AL = Algorithmic Thinking; EV = Evaluation; GE = Generalisation
-

docs/lessons/pogo/activity.md

@@ -8,29 +8,159 @@ Welcome! This activity will teach how to construct a pendulum that glows using a
 
 Create a **forever** loop that will constantly display the appropriate brightness on the LED display.  Now let's measure the acceleration on the `y` axis and store that value in a variable. The `acceleration(y)` function will provide the value.
 
-![](/static/mb/blocks/lessons/pogo-0.jpg)
+```blocks
+basic.forever(() => {
+    let acc = input.acceleration(Dimension.Y)
+})
+```
 
 Since the micro:bit will be swinging up and down, we need to store the variable called jumps. We will set the variable called jumps to 0 to store the number 0.
 
-![](/static/mb/blocks/lessons/pogo-1.jpg)
+```blocks
+let jumps = 0
+basic.forever(() => {
+    let acc = input.acceleration(Dimension.Y)
+})
+```
 
-The function `acceleration(y)` gets the acceleration value (milli g-force), in the `y` dimension. If the `acceleration(y)`is greater than 2000 milli g-force, we will change jumps by 1.
+The function `acceleration(y)` gets the acceleration value (milli g-force), in the `y` dimension. If the `acceleration(y)`is greater than 2000 milli g-force, we will change jumps by 1. If jumping is greater than 2000 milli-gravities, then change jumps by 1 and display a smiley on the BBC micro:bit. Finally, we will remove the smiley image from the screen
 
-If the `acceleration(y)`is greater than 2000 milli g-force, we will display the image with `show LEDs` to display a smiley face on the LEDs and `clear screen` to to turn off all the LED lights on the LED screen.
 
-![](/static/mb/blocks/lessons/pogo-2.jpg)
+```blocks
+let jumps = 0
+basic.forever(() => {
+    let acc = input.acceleration(Dimension.Y)
+    if (acc > 2000) {
+        jumps = jumps + 1;
+        basic.showLeds(`
+            . . . . .
+            . # . # .
+            . . # . .
+            # . . . #
+            . # # # .
+            `)
+        basic.clearScreen()
+    }
+})
+```
 
-Now let's register an event handler that will execute whenever an input button (A) is pressed during program execution.
+Now let's register an event handler that will execute whenever an input button (A) is pressed during program execution. If you press button A, then show the number of jumps greater than 2000 milli-gravities on the BBC micro:bit.
 
-![](/static/mb/blocks/lessons/pogo-3.jpg)
+```blocks
+let jumps = 0
+basic.forever(() => {
+    let acc = input.acceleration(Dimension.Y)
+    if (acc > 2000) {
+        jumps = jumps + 1;
+        basic.showLeds(`
+            . . . . .
+            . # . # .
+            . . # . .
+            # . . . #
+            . # # # .
+            `)
+        basic.clearScreen()
+    }
+})
+input.onButtonPressed(Button.A, () => {
+    basic.showNumber(jumps)
+})
+```
 
-Let's show what the brightness of the micro:bit is by turning all the LEDs on!
+If you press button A+B together, then reset the jump counter to 0 on the BBC micro:bit. Finally, we will show the show the jump counter on the micro:bit
 
-![](/static/mb/blocks/lessons/glowing-pendulum-5.png)
 
-### ~avatar avatar
+```blocks
+let jumps = 0
+basic.forever(() => {
+    let acc = input.acceleration(Dimension.Y)
+    if (acc > 2000) {
+        jumps = jumps + 1;
+        basic.showLeds(`
+            . . . . .
+            . # . # .
+            . . # . .
+            # . . . #
+            . # # # .
+            `)
+        basic.clearScreen()
+    }
+})
+input.onButtonPressed(Button.A, () => {
+    basic.showNumber(jumps)
+})
+input.onButtonPressed(Button.AB, () => {
+    let jumps = 0
+    basic.showNumber(jumps)
+})
 
-Excellent, you're ready to continue with the [challenges](/microbit/lessons/glowing-pendulum/challenges)!
+```
 
-### ~
+We want to setup the radio communication between an additional micro:bit. We first must send number for jumps. The additional micro:bit will receive the number and show number on data received. We are now displaying the current jump count on the second micro:bit
 
+```blocks
+let jumps = 0
+basic.forever(() => {
+    let acc = input.acceleration(Dimension.Y)
+    if (acc > 2000) {
+        jumps = jumps + 1;
+        radio.sendNumber(jumps)
+        basic.showLeds(`
+            . . . . .
+            . # . # .
+            . . # . .
+            # . . . #
+            . # # # .
+            `)
+        basic.clearScreen()
+    }
+})
+input.onButtonPressed(Button.A, () => {
+    basic.showNumber(jumps)
+})
+input.onButtonPressed(Button.AB, () => {
+    let jumps = 0
+    basic.showNumber(jumps)
+})
+radio.onDataReceived(() => {
+    basic.showNumber(radio.receiveNumber())
+})
+
+```
+We want to stop animation so every time the number of jumps increase by 1 the second micro:bit will not also display smiley from show leds. So we add the code stop animation
+
+```blocks
+let jumps = 0
+basic.forever(() => {
+    let acc = input.acceleration(Dimension.Y)
+    if (acc > 2000) {
+        jumps = jumps + 1;
+        radio.sendNumber(jumps)
+        basic.showLeds(`
+            . . . . .
+            . # . # .
+            . . # . .
+            # . . . #
+            . # # # .
+            `)
+        basic.clearScreen()
+    }
+})
+input.onButtonPressed(Button.A, () => {
+    basic.showNumber(jumps)
+})
+input.onButtonPressed(Button.AB, () => {
+    let jumps = 0
+    basic.showNumber(jumps)
+})
+radio.onDataReceived(() => {
+    basic.showNumber(radio.receiveNumber())
+    led.stopAnimation()
+})
+
+```
+
+
+Connect the first micro:bit to your computer using your USB cable and run the pogo script on it.
+Connect the second micro:bit to your computer using your USB cable and run the pogo script on it.
+The first person and second person take turns jumping in the “y” direction while the other player uses the micro:bit to track the results on the micro:bit!

docs/lessons/prank-wifi.md

@@ -0,0 +1,9 @@
+# prank wifi lesson
+
+create a fake wifi app to trick your friends.
+
+create a fake wifi app to trick your friends
+
+* [activity](/microbit/lessons/prank-wifi/activity)
+* [quiz](/microbit/lessons/prank-wifi/quiz)
+* [quiz answers](/microbit/lessons/prank-wifi/quiz-answers)

docs/lessons/prank-wifi/activity.md

@@ -4,46 +4,42 @@ create a fake wifi app to trick your friends. #docs
 
 ## Before we get started
 
-Complete the following guided tutorial:
+Complete the following exercise. Your code should look like this:
 
-* [tutorial](/microbit/lessons/prank-wifi/tutorial)
-
-At the end of the tutorial, click `keep editing`. Your code should look like this:
-
-```
+```blocks
 basic.showString("Check Wifi", 150)
 basic.forever(() => {
-    let xAccel = math.abs(input.acceleration("x"))
-    let yAccel = math.abs(input.acceleration("y"))
-    let zAccel = math.abs(input.acceleration("z"))
+    let xAccel = Math.abs(input.acceleration(Dimension.X))
+    let yAccel = Math.abs(input.acceleration(Dimension.Y))
+    let zAccel = Math.abs(input.acceleration(Dimension.Z))
     let sum = xAccel + yAccel + zAccel
     if (sum < 1400) {
-        basic.plotImage(`
-. . . . .
-. . . . .
-. . # . .
-. # # . .
-# # # . .
-`)
+        basic.showLeds(`
+            . . . . .
+            . . . . .
+            . . # . .
+            . # # . .
+            # # # . .
+            `)
     } else if (sum >= 1400 && sum < 1680) {
-        basic.plotImage(`
-. . . . .
-. . . # .
-. . # # .
-. # # # .
-# # # # .
-`)
-    }
-    else if (sum >= 1680) {
-        basic.plotImage(`
-. . . . .
-. . . . .
-. . . . .
-. . . . .
-# . . . .
-`)
+        basic.showLeds(`
+            . . . . .
+            . . . # .
+            . . # # .
+            . # # # .
+            # # # # .
+            `)
+    } else if (sum >= 1680) {
+        basic.showLeds(`
+            . . . . .
+            . . . . .
+            . . . . .
+            . . . . .
+            # . . . .
+            `)
     }
 })
+
 ```
 
 **Challenge 1**
@@ -52,19 +48,17 @@ What if wanted to show the maximum connectivity of wifi instead of just 1, 3, or
 
 Let's start by changing the first **IF** statement to `if sum <1200`.
 
-Edit this line: **if** sum <1400 **then**
+Edit this line: if sum is greater than 1400 then just click on the `1400` and backspace until you can add your own number of `1200`.
 
-Just click on the `1400` and backspace until you can add your own number of `1200`.
-
-```
+```blocks
 basic.showString("Check Wifi", 150)
 basic.forever(() => {
-    let xAccel1 = math.abs(input.acceleration("x"))
-    let yAccel1 = math.abs(input.acceleration("y"))
-    let zAccel1 = math.abs(input.acceleration("z"))
+    let xAccel1 = Math.abs(input.acceleration(Dimension.X))
+    let yAccel1 = Math.abs(input.acceleration(Dimension.Y))
+    let zAccel1 = Math.abs(input.acceleration(Dimension.Z))
     let sum1 = xAccel1 + yAccel1 + zAccel1
     if (sum1 < 1200) {
-        basic.plotImage(`
+        basic.showLeds(`
 . . . . .
 . . . . .
 . . # . .
@@ -72,7 +66,7 @@ basic.forever(() => {
 # # # . .
 `)
     } else if (sum1 >= 1400 && sum1 < 1680) {
-        basic.plotImage(`
+        basic.showLeds(`
 . . . . .
 . . . # .
 . . # # .
@@ -81,7 +75,7 @@ basic.forever(() => {
 `)
     }
     else if (sum1 >= 1680) {
-        basic.plotImage(`
+        basic.showLeds(`
 . . . . .
 . . . . .
 . . . . .
@@ -96,15 +90,15 @@ basic.forever(() => {
 
 Let's add an **IF** at the bottom of your code that checks to see if `sum >= to 1200` **and** if `sum <1400`
 
-```
+```blocks
 basic.showString("Check Wifi", 150)
 basic.forever(() => {
-    let xAccel2 = math.abs(input.acceleration("x"))
-    let yAccel2 = math.abs(input.acceleration("y"))
-    let zAccel2 = math.abs(input.acceleration("z"))
+    let xAccel2 = Math.abs(input.acceleration(Dimension.X))
+    let yAccel2 = Math.abs(input.acceleration(Dimension.Y))
+    let zAccel2 = Math.abs(input.acceleration(Dimension.Z))
     let sum2 = xAccel2 + yAccel2 + zAccel2
     if (sum2 < 1200) {
-        basic.plotImage(`
+        basic.showLeds(`
 . . . . .
 . . . . .
 . . # . .
@@ -112,7 +106,7 @@ basic.forever(() => {
 # # # . .
 `)
     } else if (sum2 >= 1400 && sum2 < 1680) {
-        basic.plotImage(`
+        basic.showLeds(`
 . . . . .
 . . . # .
 . . # # .
@@ -121,7 +115,7 @@ basic.forever(() => {
 `)
     }
     else if (sum2 >= 1680) {
-        basic.plotImage(`
+        basic.showLeds(`
 . . . . .
 . . . . .
 . . . . .
@@ -130,18 +124,18 @@ basic.forever(() => {
 `)
     }
     if (sum2 >= 1200 && sum2 < 1400) {
-        basic.plotImage(`
+        basic.showLeds(`
 . . . . #
 . . . # #
 . . # # #
 . # # # #
 # # # # #
-`) // ***
+`) 
     }
 })
 ```
 
 **Challenge 3**
 
-Now it's your turn! Be creative and change the Wifi meter images to your own wifi image you're sure will prank your friends by editing the lines that call `plot image()`.
+Now it's your turn! Be creative and change the Wifi meter images to your own wifi image you're sure will prank your friends by editing the lines that call `showLeds()`.
 

docs/lessons/prank-wifi/quiz-answers.md

@@ -1,6 +1,6 @@
 # prank wifi quiz answers
 
-create a fake wifi app to trick your friends #string #forever #abs #var #plot #image #if #math #abs #acceleration #docs
+create a fake wifi app to trick your friends.
 
 ## Name
 
@@ -14,10 +14,10 @@ Answer the questions while completing the tutorial. Pay attention to the dialogu
 
 <br/>
 
-```
-let xAccel = math.abs(input.acceleration("x"))
-let yAccel = math.abs(input.acceleration("y"))
-let zAccel = math.abs(input.acceleration("z"))
+```blocks
+let xAccel = Math.abs(input.acceleration(Dimension.X))
+let yAccel = Math.abs(input.acceleration(Dimension.Y))
+let zAccel = Math.abs(input.acceleration(Dimension.Z))
 ```
 
 <br/>
@@ -28,7 +28,10 @@ let zAccel = math.abs(input.acceleration("z"))
 
 <br/>
 
-```
+```blocks
+let xAccel = Math.abs(input.acceleration(Dimension.X))
+let yAccel = Math.abs(input.acceleration(Dimension.Y))
+let zAccel = Math.abs(input.acceleration(Dimension.Z))
 let sum = xAccel + yAccel + zAccel
 ```
 
@@ -38,9 +41,13 @@ let sum = xAccel + yAccel + zAccel
 
 <br/>
 
-```
+```blocks
+let xAccel = Math.abs(input.acceleration(Dimension.X))
+let yAccel = Math.abs(input.acceleration(Dimension.Y))
+let zAccel = Math.abs(input.acceleration(Dimension.Z))
+let sum = xAccel + yAccel + zAccel
 if (sum < 1400) {
-    basic.plotImage(`
+    basic.showLeds(`
 . . . . .
 . . . . .
 . . # . .
@@ -58,9 +65,13 @@ if (sum < 1400) {
 
 <br/>
 
-```
+```blocks
+let xAccel = Math.abs(input.acceleration(Dimension.X))
+let yAccel = Math.abs(input.acceleration(Dimension.Y))
+let zAccel = Math.abs(input.acceleration(Dimension.Z))
+let sum = xAccel + yAccel + zAccel
 if (sum >= 1400 && sum < 1680) {
-    basic.plotImage(`
+    basic.showLeds(`
 . . . . .
 . . . # .
 . . # # .
@@ -70,7 +81,7 @@ if (sum >= 1400 && sum < 1680) {
 }
 ```
 
-## 5. Write the 'if statement' needed to display this specific plot image on the device
+## 5. Write the code to display this specific image on the device
 
 ![](/static/mb/lessons/prank-wifi-0.png)
 
@@ -78,9 +89,13 @@ if (sum >= 1400 && sum < 1680) {
 
 <br/>
 
-```
+```blocks
+let xAccel = Math.abs(input.acceleration(Dimension.X))
+let yAccel = Math.abs(input.acceleration(Dimension.Y))
+let zAccel = Math.abs(input.acceleration(Dimension.Z))
+let sum = xAccel + yAccel + zAccel
 if (sum >= 1680) {
-    basic.plotImage(`
+    basic.showLeds(`
 . . . . .
 . . . . .
 . . . . .

docs/lessons/prank-wifi/quiz.md

@@ -1,12 +1,12 @@
 # prank wifi quiz
 
-create a fake wifi app to trick your friends #string #forever #abs #var #plot #image #if #math #abs #acceleration #docs
+create a fake wifi app to trick your friends.
 
 ## Name
 
 ## Directions
 
-Use this activity document to guide your work in the [prank WiFi tutorial](/microbit/lessons/prank-wifi/tutorial)
+Use this activity document to guide your work in the [prank WiFi tutorial](/microbit/lessons/prank-wifi/activity)
 
 Answer the questions while completing the tutorial. Pay attention to the dialogues!
 

docs/lessons/rock-paper-scissors.md

@@ -1,6 +1,6 @@
 # rock paper scissors lesson
 
-a game against the BBC micro:bit #var #image #button #string #number #docs
+a game against the BBC micro:bit.
 
 ### @video td/videos/rock-paper-scissors-0
 
@@ -23,10 +23,8 @@ Learn how to create a **local variable**, `var t :=time` where you can store dat
 
 ## Documentation
 
-```docs
-input.onGesture(Gesture.Shake, () => {
-
-})
+```cards
+input.onGesture(Gesture.Shake, () => {})
 Math.random(3)
 let x = 0
 basic.showLeds(`

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

@@ -1,6 +1,6 @@
 # rock paper scissors quiz
 
-shift an image horizontally across the display with offset #offset #screen  #variables #docs
+shift an image horizontally across the display with offset.
 
 ## Name
 

docs/lessons/rotation-animation.md

@@ -1,6 +1,6 @@
 # rotation animation block lesson
 
-Learn how to create images with a global variable and while loop. #LED #screen  #plot #docs
+Learn how to create images with a global variable and while loop.
 
 ## Topic
 
@@ -19,11 +19,9 @@ Learn how to create images that look like a rotating animation by using a while
 
 ## Documentation
 
-```docs
+```cards
 let x = 0
-input.onButtonPressed(Button.A, () => {
-
-})
+input.onButtonPressed(Button.A, () => {})
 basic.showLeds(`
     . . . . .
     . . . . .
@@ -32,10 +30,8 @@ basic.showLeds(`
     . . . . .
     `)
 basic.pause(100)
-while (true) {
-
-    basic.pause(20)
-}
+while (true) {}
+basic.pause(20)
 ```
 
 ## Objectives

docs/lessons/rotation-animation/quiz-answers.md

@@ -1,6 +1,6 @@
 # rotation animation quiz answers
 
-Learn how to create a rotating image with a while loop. #image #loop  #while #docs
+Learn how to create a rotating image with a while loop.
 
 This is the answer key for the [rotation animation quiz](/microbit/lessons/rotation-animation/quiz).
 

docs/lessons/rotation-animation/quiz.md

@@ -1,6 +1,6 @@
 # rotation animation quiz
 
-Learn how to create a rotating image with a while loop. #image #loop  #while #docs
+Learn how to create a rotating image with a while loop.
 
 ## Name
 

docs/lessons/screen-wipe.md

@@ -1,6 +1,6 @@
 # screen wipe blocks lesson
 
-clear the screen by pressing button "A" #button #clear #docs
+clear the screen by pressing button "A".
 
 ### @video td/videos/screen-wipe-0
 
@@ -23,7 +23,7 @@ Learn how to **clear screen**, `clear screen` to turn off all the LED lights on
 
 ## Documentation
 
-```docs
+```cards
 basic.clearScreen()
 basic.showLeds(`
     . . . . .
@@ -32,10 +32,7 @@ basic.showLeds(`
     . . . . .
     . . . . .
     `)
-input.onButtonPressed(Button.A, () => {
-    
-})
-
+input.onButtonPressed(Button.A, () => {})
 ```
 
 ## Objectives

docs/lessons/smiley.md

@@ -24,10 +24,8 @@ Learn how to **show LEDs** to turn on a LED light pattern on the LED screen. We
 * **show LEDs** : [read more...](/microbit/reference/basic/show-leds)
 * **on button pressed** : [read more...](/microbit/reference/input/on-button-pressed)
 
-```docs
-input.onButtonPressed(Button.A, () => {
-
-})
+```cards
+input.onButtonPressed(Button.A, () => {})
 basic.showLeds(`
     . . . . .
     . . . . .
@@ -35,7 +33,6 @@ basic.showLeds(`
     . . . . .
     . . . . .
     `)
-
 ```
 
 ## Objectives

docs/lessons/snowflake-fall.md

@@ -1,6 +1,6 @@
 # snowflake fall blocks lesson
 
-design a blinking rectangle animation #animation #loop #forever #docs
+design a blinking rectangle animation.
 
 ### @video td/videos/snowflake-fall-0
 
@@ -25,7 +25,7 @@ Learn how to show LEDs with a, `pause` to pause program execution for a specifie
 * **pause** : [read more...](/microbit/reference/basic/pause)
 * **forever** : [read more...](/microbit/reference/basic/forever)
 
-```docs
+```cards
 basic.showLeds(`
     . . . . .
     . . . . .
@@ -34,8 +34,5 @@ basic.showLeds(`
     . . . . .
     `)
 basic.pause(100)
-basic.forever(() => {
-    
-})
-
+basic.forever(() => {})
 ```

docs/lessons/snowflake-fall/activity.md

@@ -1,6 +1,6 @@
 # snowflake fall blocks activity
 
-design a blinking rectangle animation. #docs #tutorials #stepByStep
+design a blinking rectangle animation.
 
 ### ~avatar avatar
 

docs/lessons/speed-button.md

@@ -0,0 +1,38 @@
+# speed button lesson
+
+code a speed game by declaring Booleans on the BBC micro:bit.
+
+### @video td/videos/speed-button-3
+
+## Topic
+
+Running Time
+
+## Quick Links
+
+* [activity](/microbit/lessons/speed-button/activity)
+* [quiz](/microbit/lessons/speed-button/quiz)
+* [quiz answers](/microbit/lessons/speed-button/quiz-answers)
+
+
+## Prior learning/place of lesson in scheme of work
+
+Learn how to declare a **Boolean** variable, `var t:= true` `var f:=false` for one of two possible values: true or false. We will be learning how to declare Boolean variables using global variables, if (conditionals), input on button pressed, input running time,  as well as simple commands, such as input on button pressed, and show string.
+
+## Documentation
+
+* **running time** : [read more...](/microbit/reference/input/running-time)
+* **global variable** : [read more...](/microbit/js/data)
+* **Boolean** : [read more...](/microbit/reference/types/boolean)
+* **on button pressed** : [read more...](/microbit/reference/input/on-button-pressed)
+* **if** : [read more...](/microbit/reference/logic/if)
+* **show string** : [read more...](/microbit/reference/basic/show-string)
+
+## Objectives
+
+* learn how to get the number of milliseconds elapsed since the script began. 1,000 milliseconds = 1 second
+* learn how to create a global variable to store data so that you can use it later in your code and will be accessible across functions and in nested code blocks
+* learn how to create a Boolean with one of two possible values: true or false
+* learn how to run code when an input button is pressed
+* learn how to conditionally run code depending on whether a condition is true or not
+* learn how to show a string on the LED screen one character at a time

docs/lessons/speed-button/activity.md

@@ -6,11 +6,9 @@ Coding challenges for the speed button tutorial. #docs
 
 Complete the following guided tutorial:
 
-* [tutorial](/microbit/lessons/speed-button/tutorial)
+Your starting code should look like this:
 
-At the end of the tutorial, click `keep editing`. Your code should look like this:
-
-```
+```blocks
 let counter = 0
 let fastPress = false
 input.onButtonPressed(Button.A, () => {
@@ -22,7 +20,7 @@ input.onButtonPressed(Button.A, () => {
 
 We need to know when the user has hit button `A` 15 times. The user wins when he/she is able to accomplish this in less than 5000 milliseconds (5 seconds). We can check for both conditions by using an `and` operator. When using an `and` operator, both conditions need to be true in order for the condition to be true.
 
-```
+```blocks
 let counter1 = 0
 let fastPress1 = false
 input.onButtonPressed(Button.A, () => {
@@ -34,7 +32,7 @@ input.onButtonPressed(Button.A, () => {
 
 Next, if the user has won, let's set our boolean to true. This indicates that he or she has won.
 
-```
+```blocks
 let counter2 = 0
 let fastPress2 = false
 input.onButtonPressed(Button.A, () => {
@@ -49,7 +47,7 @@ input.onButtonPressed(Button.A, () => {
 
 We want to set `fastPress` to false if the user was too slow. To do so, we need another condition to see if the user took more than 5000 milliseconds (5 seconds). In the `if` statement, set `fastPress` to false.
 
-```
+```blocks
 let counter3 = 0
 let fastPress3 = false
 input.onButtonPressed(Button.A, () => {
@@ -69,7 +67,7 @@ input.onButtonPressed(Button.A, () => {
 
 Now let's display if the user won or lost. To do so, we need to check the status of `fastPress` when the game is finished, and then show the correct message.
 
-```
+```blocks
 let counter4 = 0
 let fastPress4 = false
 input.onButtonPressed(Button.A, () => {

docs/lessons/speed-button/quiz-answers.md

@@ -1,6 +1,6 @@
 # speed button quiz answers
 
-counter that keeps track of how many times button "A" has been pressed #LED #screen #variables #docs #input
+counter that keeps track of how many times button "A" has been pressed.
 
 This is the answer key for the [speed button quiz](/microbit/lessons/speed-button/quiz).
 
@@ -12,7 +12,7 @@ A variable that is available throughout your main function.
 
 ## 2. If the rectangle below represents the BBC micro:bit, shade the area that shows the value of the variable count.
 
-```
+```blocks
 let count = 0
 ```
 
@@ -20,7 +20,7 @@ let count = 0
 
 ## 3. If the rectangle below represents the BBC micro:bit, shade the areas that will be displayed after two button presses on Button A. Explain why that particular area is shaded.
 
-```
+```blocks
 let count_ = 0
 input.onButtonPressed(Button.A, () => {
     count_ = count_ + 1
@@ -36,8 +36,8 @@ After two button presses, **count** will be equal to 2.
 
 ## 5. If the rectangle below represents the BBC micro:bit, shade the areas that will be displayed after five button presses on Button A. Explain why that particular area is shaded.
 
-```
-count_ = 0
+```blocks
+let count_ = 0
 input.onButtonPressed(Button.A, () => {
     count_ = count_ + 1
     basic.showNumber(count_, 100)

docs/lessons/speed-button/quiz.md

@@ -1,12 +1,12 @@
 # speed button quiz 
 
-counter that keeps track of how many times button "A" has been pressed #LED #screen #variables #docs #input
+counter that keeps track of how many times button "A" has been pressed.
 
 ## Name
 
 ## Directions
 
-Use this activity document to guide your work in the [speed button tutorial](/microbit/lessons/speed-button/tutorial).
+Use this activity document to guide your work in the [speed button tutorial](/microbit/lessons/speed-button/activity).
 
 Answer the questions while completing the tutorial. Pay attention to the dialogues!
 
@@ -14,7 +14,7 @@ Answer the questions while completing the tutorial. Pay attention to the dialogu
 
 ## 2. Draw which LEDs show the number being stored as a global variable called count
 
-```
+```blocks
 let count = 0
 ```
 
@@ -22,7 +22,7 @@ let count = 0
 
 ## 3. Draw which LED is ON after running this code and pressing Button A twice. Explain why you chose to draw that number 
 
-```
+```blocks
 let count_ = 0
 input.onButtonPressed(Button.A, () => {
     count_ = count_ + 1
@@ -36,8 +36,8 @@ input.onButtonPressed(Button.A, () => {
 
 ## 4. Draw which LED is ON after running this code and pressing Button A five times. Explain why you chose to draw that number.
 
-```
-count_ = 0
+```blocks
+let count_ = 0
 input.onButtonPressed(Button.A, () => {
     count_ = count_ + 1
     basic.showNumber(count_, 100)

docs/lessons/spinner.md

@@ -1,6 +1,6 @@
 # spinner lesson
 
-a spin the BBC micro:bit game with the input on shake #button #pressed #math #random #var #string #if #docs
+a spin the BBC micro:bit game with the input on shake.
 
 ### @video td/videos/spinner-0
 
@@ -22,14 +22,10 @@ Learn how to use an if statement to run code run code depending on whether a con
 ## Documentation
 
 
-```docs
-if (true) {
-
-}
+```cards
+if (true) {}
 let x = 0
-input.onGesture(Gesture.Shake, () => {
-
-})
+input.onGesture(Gesture.Shake, () => {})
 Math.random(3)
 basic.showLeds(`
     . . . . .

docs/lessons/spinner/activity.md

@@ -23,7 +23,7 @@ Now let's randomly generate a number from 0 to 3 so that we can randomly display
 ```blocks
 input.onGesture(Gesture.Shake, () => {
     let randomArrow = Math.random(4)
-    if (randomArrow = 3) {
+    if (randomArrow == 3) {
         basic.showLeds(`
             . . # . .
             . # # # .
@@ -42,7 +42,7 @@ Now let's handle each of the cases by displaying the appropriate arrow. (Let's d
 ```blocks
 input.onGesture(Gesture.Shake, () => {
     let randomArrow = Math.random(4)
-    if (randomArrow = 3) {
+    if (randomArrow == 3) {
         basic.showLeds(`
             . . # . .
             . # # # .
@@ -51,7 +51,7 @@ input.onGesture(Gesture.Shake, () => {
             . . # . .
             `)
     }
-    if (randomArrow = 2) {
+    if (randomArrow == 2) {
         basic.showLeds(`
             . . # . .
             . . # . .
@@ -70,7 +70,7 @@ Now let's handle the rest of the cases for `random arrow`.
 ```blocks
 input.onGesture(Gesture.Shake, () => {
     let randomArrow = Math.random(4)
-    if (randomArrow = 3) {
+    if (randomArrow == 3) {
         basic.showLeds(`
             . . # . .
             . # # # .
@@ -79,7 +79,7 @@ input.onGesture(Gesture.Shake, () => {
             . . # . .
             `)
     }
-    if (randomArrow = 2) {
+    if (randomArrow == 2) {
         basic.showLeds(`
             . . # . .
             . . # . .
@@ -88,7 +88,7 @@ input.onGesture(Gesture.Shake, () => {
             . . # . .
             `)
     }
-    if (randomArrow = 1) {
+    if (randomArrow == 1) {
         basic.showLeds(`
             . . # . .
             . # # . .

docs/lessons/spinner/challenges.md

@@ -9,7 +9,7 @@ Complete the following [guided tutorial](/microbit/lessons/spinner/activity), yo
 ```blocks
 input.onGesture(Gesture.Shake, () => {
     let randomArrow = Math.random(4)
-    if (randomArrow = 3) {
+    if (randomArrow == 3) {
         basic.showLeds(`
             . . # . .
             . # # # .
@@ -18,7 +18,7 @@ input.onGesture(Gesture.Shake, () => {
             . . # . .
             `)
     }
-    if (randomArrow = 2) {
+    if (randomArrow == 2) {
         basic.showLeds(`
             . . # . .
             . . # . .
@@ -27,7 +27,7 @@ input.onGesture(Gesture.Shake, () => {
             . . # . .
             `)
     }
-    if (randomArrow = 1) {
+    if (randomArrow == 1) {
         basic.showLeds(`
             . . # . .
             . # # . .
@@ -47,7 +47,7 @@ Modify the random number generator so that it can include new arrows we will cre
 ```blocks
 input.onGesture(Gesture.Shake, () => {
     let randomArrow = Math.random(8)
-    if (randomArrow = 3) {
+    if (randomArrow == 3) {
         basic.showLeds(`
             . . # . .
             . # # # .
@@ -56,7 +56,7 @@ input.onGesture(Gesture.Shake, () => {
             . . # . .
             `)
     }
-    if (randomArrow = 2) {
+    if (randomArrow == 2) {
         basic.showLeds(`
             . . # . .
             . . # . .
@@ -65,7 +65,7 @@ input.onGesture(Gesture.Shake, () => {
             . . # . .
             `)
     }
-    if (randomArrow = 1) {
+    if (randomArrow == 1) {
         basic.showLeds(`
             . . # . .
             . # # . .
@@ -90,7 +90,7 @@ Let's add more arrows that point diagonally.
 ```blocks
 input.onGesture(Gesture.Shake, () => {
     let randomArrow = Math.random(8)
-    if (randomArrow = 7) {
+    if (randomArrow == 7) {
         basic.showLeds(`
             . . # . .
             . # # # .
@@ -99,7 +99,7 @@ input.onGesture(Gesture.Shake, () => {
             . . # . .
             `)
     }
-    if (randomArrow = 6) {
+    if (randomArrow == 6) {
         basic.showLeds(`
             . . # . .
             . . # . .
@@ -108,7 +108,7 @@ input.onGesture(Gesture.Shake, () => {
             . . # . .
             `)
     }
-    if (randomArrow = 5) {
+    if (randomArrow == 5) {
         basic.showLeds(`
             . . # . .
             . # # . .
@@ -118,7 +118,7 @@ input.onGesture(Gesture.Shake, () => {
             `)
 
     }
-    if (randomArrow = 4) {
+    if (randomArrow == 4) {
         basic.showLeds(`
             . . # . .
             . . . # .
@@ -129,7 +129,7 @@ input.onGesture(Gesture.Shake, () => {
 
     }
 
-    if (randomArrow = 3) {
+    if (randomArrow == 3) {
         basic.showLeds(`
             # # # # #
             # # # # .
@@ -139,7 +139,7 @@ input.onGesture(Gesture.Shake, () => {
             `)
 
     }
-    if (randomArrow = 2) {
+    if (randomArrow == 2) {
         basic.showLeds(`
             # # # # #
             # # # # #
@@ -149,7 +149,7 @@ input.onGesture(Gesture.Shake, () => {
             `)
 
     }
-        if (randomArrow = 1) {
+        if (randomArrow == 1) {
         basic.showLeds(`
             # . . . #
             # # . # .

docs/lessons/spinner/quiz-answers.md

@@ -1,6 +1,6 @@
 # spinner quiz answers
 
-a spin the BBC micro:bit game with the input on shake #math #random #docs #shake
+a spin the BBC micro:bit game with the input on shake.
 
 ## Name
 

docs/lessons/spinner/quiz.md

@@ -1,6 +1,6 @@
 # spinner quiz 
 
-a spin the BBC micro:bit game with the input on shake #math #random #docs #shake
+a spin the BBC micro:bit game with the input on shake.
 
 ## Name
 

docs/lessons/stem.md

@@ -1,6 +1,6 @@
 # Block Editor STEM Lessons
 
-Overview of Blocks lessons for the BBC micro:bit. #docs #contents
+Overview of Blocks lessons for the BBC micro:bit.
 
 ### @short Lessons
 

docs/lessons/strobe-light.md

@@ -1,6 +1,6 @@
 # strobe light lesson
 
-Learn how to create a blinking LED script. #LED #screen  #plot #docs
+Learn how to create a blinking LED script.
 
 ### @video td/videos/strobe-light-0
 
@@ -17,14 +17,11 @@ For Loop
 
 ## Documentation
 
-```docs
+```cards
 led.plot(0, 0)
 led.unplot(0, 0)
-for (let i = 0; i < 5; i++) {
-
-}
+for (let i = 0; i < 5; i++) {}
 basic.pause(100)
-
 ```
 
 ## Objectives