0.1.2

fixing mood block (#349 )
0.1.1
2018-02-26 15:59:57 -08:00 · 2018-02-26 15:59:36 -08:00 · 2018-02-26 15:17:14 -08:00 · 2018-02-26 15:17:06 -08:00 · 2018-02-26 15:16:17 -08:00 · 2018-02-26 14:49:15 -08:00
201 changed files with 9759 additions and 6477 deletions
--- a/.gitignore
+++ b/.gitignore
@ -17,8 +17,6 @@ clients/**/bin/**
 clients/**/obj/**
 clients/electron/projects
 libs/**/_locales/**
-libs/**/shims.d.ts
-libs/**/enums.d.ts

 videos/**

--- a/README.md
+++ b/README.md
@ -2,7 +2,7 @@

 [![Build Status](https://ci2.dot.net/buildStatus/icon?job=Private/pxt_project_rainbow/master/pxt-ev3_Push)](https://ci2.dot.net/job/Private/job/pxt_project_rainbow/job/master/job/pxt-ev3_Push/)

-This repo contains the editor target hosted at https://d541eec2-1e96-4b7b-a223-da9d01d0337a.pxt.io/
+This repo contains the editor target hosted at https://makecode.legoeducation.com

 LEGO Auth: https://src.education.lego.com/groups/ev3-makecode (use Google Authenticator)
 LEGO Chat: https://chat.internal.education.lego.com/make-code/channels/town-square
@ -11,7 +11,7 @@ LEGO Chat: https://chat.internal.education.lego.com/make-code/channels/town-squa

 These instructions assume familiarity with dev tools and languages.

-* install Node.js 6+
+* install Node.js 8.9.4+
 * install Docker; make sure `docker` command is in your `PATH`
 * (optional) install [Visual Studio Code](https://code.visualstudio.com/)

@ -58,12 +58,6 @@ cd libs/core
 pxt deploy
 ```

-### Hosted editor
-
-Currently hosted at:
-
-https://d541eec2-1e96-4b7b-a223-da9d01d0337a.pxt.io/
-
 ### Jenkins build
 https://ci2.dot.net/job/Private/job/pxt_project_rainbow/job/master/

--- a/docs/SUMMARY.md
+++ b/docs/SUMMARY.md
@ -2,14 +2,30 @@

 ## Projects #projects

+* [Getting Started](/getting-started)
+    * [Try](/getting-started/try)
+    * [Use](/getting-started/use)
+
+* [Coding](/coding)
+    * [Autonomous Parking](/coding/autonomous-parking)
+    * [Object Detection](/coding/object-detection)
+    * [Line Following](/coding/line-following)
+        
+* [Design Engineering](/design-engineering)
+    * [Make It Move Without Wheels](/design-engineering/make-it-move)
+    * [Make It Smarter and Faster](/design-engineering/make-it-smarter)
+    * [Make a System that Communicates](/design-engineering/make-it-communicate)
+
 * [Maker](/maker)
-    * [Sound Machine](/maker/sound-machine)
+    * [Make a Sound Machine](/maker/sound-machine)
+
+* [Examples](/examples)
+    * [Make it move](/lessons/make-it-move)
+    * [Line detection](/lessons/line-detection)
    * [Sound of Color](/maker/sound-of-color)
    * [Security Gadget](/maker/security-gadget)
    * [Intruder detector](/maker/intruder-detector)
    * [Puppet](/maker/puppet)
-
-* [Coding](/coding)
    * [Three Point Turn 1](/coding/three-point-turn-1)
    * [Three Point Turn 2](/coding/three-point-turn-2)
    * [Three Point Turn 3](/coding/three-point-turn-3)
@ -34,10 +50,6 @@
    * [Roaming 1](/coding/roaming-1)
    * [Roaming 2](/coding/roaming-2)

-* [Lessons](/lessons)
-    * [Make it move](/lessons/make-it-move)
-    * [Line detection](/lessons/line-detection)
-
 ## Reference #reference

 * [Reference](/reference)
@ -55,7 +67,7 @@
        * [set light](/reference/brick/set-status-light)
        * [battery level](/reference/brick/battery-level)
    * [Motors](/reference/motors)
-        * [set speed](/reference/motors/motor/set-speed)
+        * [run](/reference/motors/motor/run)
        * [stop](/reference/motors/motor/stop)
        * [reset](/reference/motors/motor/reset)
        * [set brake](/reference/motors/motor/set-brake)
@ -67,7 +79,7 @@
        * [angle](/reference/motors/motor/angle)
        * [speed](/reference/motors/motor/speed)
        * [clear counts](/reference/motors/motor/clear-counts)
-        * [stop all motors](/reference/motors/stop-all-motors)
+        * [stop all motors](/reference/motors/stop-all)
    * [Sensors](/reference/sensors)
        * [Touch](/reference/sensors/touch-sensor)
            * [on event](/reference/sensors/touch-sensor/on-event)
@ -79,6 +91,45 @@
            * [rate](/reference/sensors/gyro/rate)
            * [reset](/reference/sensors/gyro/reset)
        * [Ultrasonic](/reference/sensors/ultrasonic)
-            * [on event](/reference/sensors/ultrasonic/on-event),
-            * [distance](reference/sensors/ultrasonic/distance),
-            * [pause until](reference/sensors/ultrasonic/pause-until)
+            * [on event](/reference/sensors/ultrasonic/on-event)
+            * [distance](reference/sensors/ultrasonic/distance)
+            * [pause until](reference/sensors/ultrasonic/pause-until)
+        * [Infrared](/reference/sensors/infrared)
+            * [on event](/reference/sensors/infrared/on-event)
+            * [distance](reference/sensors/infrared/proximity)
+            * [pause until](reference/sensors/infrared/pause-until)
+        * [Infrared beacon](/reference/sensors/beacon)
+            * [on event](/reference/sensors/beacon/on-event)
+            * [pause until](/reference/sensors/beacon/pause-until)
+            * [is pressed](/reference/sensors/beacon/is-pressed)
+            * [was pressed](/reference/sensors/beacon/was-pressed)
+            * [set remote channel](/reference/sensors/beacon/set-remote-channel)
+        * [Color](/reference/sensors/color-sensor)
+            * [on color detected](/reference/sensors/color-sensor/on-color-detected)
+            * [pause for color](/reference/sensors/color-sensor/pause-for-color)
+            * [on light changed](/reference/sensors/color-sensor/on-light-changed)
+            * [pause for light](/reference/sensors/color-sensor/pause-for-light)
+            * [color](/reference/sensors/color-sensor/color)
+            * [light](/reference/sensors/color-sensor/ambient-light)
+    * [Music](/reference/music)
+        * [play sound effect](/reference/music/play-sound-effect)
+        * [play sound effect until done](/reference/music/play-sound-effect-until-done)
+        * [play tone](/reference/music/play-tone)
+        * [ring tone](/reference/music/ring-tone)
+        * [stop all sounds](/reference/music/stop-all-sounds)
+        * [rest](/reference/music/rest)
+        * [change tempo by](/reference/music/change-tempo-by)
+        * [set tempo](/reference/music/set-tempo)
+        * [note frequency](/reference/music/note-frequency)
+        * [beat](/reference/music/beat)
+        * [set volume](/reference/music/set-volume)
+    * [Control](/reference/control)
+        * [Timer](/reference/control/timer)
+            * [seconds](/reference/control/timer/seconds)
+            * [millis](/reference/control/timer/millis)
+            * [reset](/reference/control/timer/reset)
+            * [pause until](/reference/control/timer/pause-until)
+    * [Console](/reference/console)
+        * [log](/reference/console/log)
+        * [log value](/reference/console/log-value)
+        * [send to screen](/reference/console/send-to-screen)
--- a/docs/about.md
+++ b/docs/about.md
@ -8,12 +8,12 @@ You can program the @boardname@ using [Blocks](/blocks) or [JavaScript](/javascr

 ```blocks
 brick.buttonEnter.onEvent(ButtonEvent.Bumped, () => {
-    motors.largeA.setSpeed(50)
+    motors.largeA.run(50)
 })
 ```
 ```typescript
 brick.buttonEnter.onEvent(ButtonEvent.Bumped, () => {
-    motors.largeA.setSpeed(50)
+    motors.largeA.run(50)
 })
 ```

@ -34,6 +34,6 @@ The simulator has support for the LED screen, buttons, as well as compass, accel

 ```sim
 brick.buttonEnter.onEvent(ButtonEvent.Bumped, () => {
-    motors.largeA.setSpeed(50)
+    motors.largeA.run(50)
 })
 ```
--- a/docs/blocks/loops.md
+++ b/docs/blocks/loops.md
@ -3,6 +3,6 @@
 ### #specific

 ```cards
-loops.forever(() => {});
-loops.pause(0)
+forever(() => {});
+pause(0)
 ```
--- a/docs/coding.md
+++ b/docs/coding.md
@ -1,171 +1,25 @@
 # Coding Activites

-12 computer science activities, with cross-curricular opportunities in design and technology, science, and math.

-* [Download Curriculum Materials](https://education.lego.com/en-us/downloads/mindstorms-ev3)
-
-## Three Point Turn
+## Projects

 ```codecard
 [
 {
-  "name": "Three Point Turn 1",
-  "description": "Activity 1",
-  "url":"/coding/three-point-turn-1",
-  "cardType": "example"
+  "name": "Autonomous Parking",
+  "description": "TBD",
+  "url":"/coding/autonomous-parking",
+  "imageUrl": "/static/lessons/parking.png",
+  "cardType": "side"
 }, {
-  "name": "Three Point Turn 2",
-  "description": "Activity 2",
-  "url":"/coding/three-point-turn-2",
-  "cardType": "example"
+  "name": "Object Detection",
+  "description": "TBD",
+  "url":"/coding/object-detection",
+  "cardType": "side"
 }, {
-  "name": "Three Point Turn 3",
-  "description": "Activity 3",
-  "url":"/coding/three-point-turn-3",
-  "cardType": "example"
-}]
-```
-
-## Reversing the robot
-
-```codecard
-[{
-  "name": "Reversing the robot 1",
-  "description": "Activity 1",
-  "url":"/coding/reversing-the-robot-1",
-  "cardType": "example"
-}, {
-  "name": "Reversing the robot 2",
-  "description": "Activity 2",
-  "url":"/coding/reversing-the-robot-2",
-  "cardType": "example"
-}, {
-  "name": "Reversing the robot 3",
-  "description": "Activity 3",
-  "url":"/coding/reversing-the-robot-3",
-  "cardType": "example"
-}]
-```
-
-## Light the way
-
-```codecard
-[{
-  "name": "Light the way 1",
-  "description": "Activity 1",
-  "url":"/coding/light-the-way-1",
-  "cardType": "example"
-}, {
-  "name": "Light the way 2",
-  "description": "Activity 2",
-  "url":"/coding/light-the-way-2",
-  "cardType": "example"
-}, {
-  "name": "Light the way 3",
-  "description": "Activity 3",
-  "url":"/coding/light-the-way-3",
-  "cardType": "example"
-}    
-]
-```
-
-## Traffic Lights
-
-```codecard
-[{
-  "name": "Traffic Lights 1",
-  "description": "Activity 1",
-  "url":"/coding/traffic-lights-1",
-  "cardType": "example"
-}, {
-  "name": "Traffic Lights 2",
-  "description": "Activity 2",
-  "url":"/coding/traffic-lights-2",
-  "cardType": "example"
-}, {
-  "name": "Traffic Lights 3",
-  "description": "Activity 3",
-  "url":"/coding/traffic-lights-3",
-  "cardType": "example"
-}
-]
-```
-
-## Reverse Bepper
-
-```codecard
-[{
-  "name": "Reverse Beeper 1",
-  "description": "Activity 1",
-  "url":"/coding/reverse-beeper-1",
-  "cardType": "example"
-}, {
-  "name": "Reverse Beeper 2",
-  "description": "Activity 2",
-  "url":"/coding/reverse-beeper-2",
-  "cardType": "example"
-}, {
-  "name": "Reverse Beeper 3",
-  "description": "Activity 3",
-  "url":"/coding/reverse-beeper-3",
-  "cardType": "example"
-}]
-```
-
-## Ignition
-
-```codecard
-[{
-  "name": "Ignition 1",
-  "description": "Activity 1",
-  "url":"/coding/ingition-1",
-  "cardType": "example"
-}, {
-  "name": "Ignition 2",
-  "description": "Activity 2",
-  "url":"/coding/ignition-2",
-  "cardType": "example"
-}, {
-  "name": "Ignition 3",
-  "description": "Activity 3",
-  "url":"/coding/ignition-3",
-  "cardType": "example"
-}]
-```
-
-## Cruise Control
-
-```codecard
-[{
-  "name": "Cruise Control 1",
-  "description": "Activity 1",
-  "url":"/coding/cruise-control-1",
-  "cardType": "example"
-}, {
-  "name": "Cruise Control 2",
-  "description": "Activity 2",
-  "url":"/coding/cruise-control-2",
-  "cardType": "example"
-}, {
-  "name": "Cruise Control 3",
-  "description": "Activity 3",
-  "url":"/coding/cruise-control-3",
-  "cardType": "example"
-}]
-```
-
-## Roaming
-
-```codecard
-[{
-  "name": "Roaming 1",
-  "description": "Activity 1",
-  "url":"/coding/roaming-1",
-  "cardType": "example"
-}, {
-  "name": "Roaming 2",
-  "description": "Activity 2",
-  "url":"/coding/roaming-2",
-  "cardType": "example"
+  "name": "Line Following",
+  "description": "TBD",
+  "url":"/coding/line-following",
+  "cardType": "side"
 }]
 ```
--- a/docs/coding/cruise-control-1.md
+++ b/docs/coding/cruise-control-1.md
@ -5,6 +5,6 @@ let speed = 0;
 sensors.touch1.onEvent(ButtonEvent.Pressed, function () {
    if (speed < 100)
        speed = speed + 10;
-    motors.largeBC.setSpeed(speed);
+    motors.largeBC.run(speed);
 }) 
 ```
--- a/docs/coding/cruise-control-2.md
+++ b/docs/coding/cruise-control-2.md
@ -5,11 +5,11 @@ let speed = 0;
 sensors.touch1.onEvent(ButtonEvent.Pressed, function () {
    if (speed < 100)
        speed = speed + 10;
-    motors.largeBC.setSpeed(speed);
+    motors.largeBC.run(speed);
 }) 
 sensors.touch2.onEvent(ButtonEvent.Pressed, function () {
    if (speed > -100)
        speed = speed - 10;
-    motors.largeBC.setSpeed(speed);
+    motors.largeBC.run(speed);
 }) 
 ```
--- a/docs/coding/cruise-control-3.md
+++ b/docs/coding/cruise-control-3.md
@ -15,7 +15,7 @@ function accelerate() {
 function update() {
    brick.clearScreen()
    brick.showString("speed: " + speed, 1)
-    motors.largeBC.setSpeed(speed)
+    motors.largeBC.run(speed)
 }
 sensors.touch2.onEvent(ButtonEvent.Pressed, function () {
    accelerate()
--- a/docs/coding/ignition-2.md
+++ b/docs/coding/ignition-2.md
@ -7,6 +7,6 @@ while (true) {
        music.playSoundEffectUntilDone(sounds.mechanicalMotorStart)
        music.playSoundEffectUntilDone(sounds.mechanicalMotorIdle);
    }
-    loops.pause(1);
+    pause(1);
 }
 ```
--- a/docs/coding/ignition-3.md
+++ b/docs/coding/ignition-3.md
@ -8,6 +8,6 @@ while (true) {
        music.playSoundEffectUntilDone(sounds.mechanicalMotorStart)
        music.playSoundEffectUntilDone(sounds.mechanicalMotorIdle);
    }
-    loops.pause(1);
+    pause(1);
 }
 ```
--- a/docs/coding/light-the-way-1.md
+++ b/docs/coding/light-the-way-1.md
@ -3,7 +3,7 @@
 ```blocks
 sensors.color3.onLightChanged(LightIntensityMode.Ambient, LightCondition.Dark, function () {
    brick.showImage(images.objectsLightOn)
-    loops.pause(5000)
+    pause(5000)
    brick.clearScreen()
 })
 ```
--- a/docs/coding/reverse-beeper-1.md
+++ b/docs/coding/reverse-beeper-1.md
@ -1,11 +1,11 @@
 # Reverse Beeper Activity 1

 ```blocks
-loops.forever(function () {
+forever(function () {
    music.playTone(440, sensors.ultrasonic4.distance());
-    loops.pause(50)
+    pause(50)
 })
-motors.largeBC.setSpeed(-20);
+motors.largeBC.run(-20);
 sensors.ultrasonic4.pauseUntil(UltrasonicSensorEvent.ObjectNear);
 motors.largeBC.stop();
 ```
--- a/docs/coding/reverse-beeper-2.md
+++ b/docs/coding/reverse-beeper-2.md
@ -1,13 +1,13 @@
 # Reverse Beeper Activity 2

 ```blocks
-loops.forever(function () {
+forever(function () {
    if (motors.largeB.speed() != 0 && sensors.ultrasonic4.distance() < 20) {
        music.playTone(440, sensors.ultrasonic4.distance());
-        loops.pause(50)
+        pause(50)
    }
 })
-motors.largeBC.setSpeed(-20);
+motors.largeBC.run(-20);
 sensors.ultrasonic4.pauseUntil(UltrasonicSensorEvent.ObjectNear);
 motors.largeBC.stop();
 ```
--- a/docs/coding/reverse-beeper-3.md
+++ b/docs/coding/reverse-beeper-3.md
@ -4,7 +4,7 @@
 let beep = false
 beep = true
 control.runInParallel(function () {
-    motors.largeBC.setSpeed(-20)
+    motors.largeBC.run(-20)
    sensors.ultrasonic4.pauseUntil(UltrasonicSensorEvent.ObjectNear)
    motors.largeBC.stop()
    beep = false
@ -13,7 +13,7 @@ control.runInParallel(function () {
    while (beep) {
        if (sensors.ultrasonic4.distance() < 20) {
            music.playTone(440, sensors.ultrasonic4.distance())
-            loops.pause(50)
+            pause(50)
        }
    }
 })
--- a/docs/coding/reversing-the-robot-1.md
+++ b/docs/coding/reversing-the-robot-1.md
@ -2,13 +2,13 @@

 ```blocks
 brick.buttonEnter.onEvent(ButtonEvent.Bumped, function () {
-    motors.largeBC.setSpeed(50)
+    motors.largeBC.run(50)
    sensors.touch1.pauseUntil(ButtonEvent.Pressed)
-    motors.largeBC.setSpeed(0)
-    loops.pause(1000)
+    motors.largeBC.run(0)
+    pause(1000)
    brick.setStatusLight(StatusLight.OrangeFlash)
-    motors.largeBC.setSpeed(-50)
-    loops.pause(2000)
-    motors.largeBC.setSpeed(0)
+    motors.largeBC.run(-50)
+    pause(2000)
+    motors.largeBC.run(0)
 })
 ```
--- a/docs/coding/reversing-the-robot-2.md
+++ b/docs/coding/reversing-the-robot-2.md
@ -3,13 +3,13 @@
 ```blocks
 brick.buttonEnter.onEvent(ButtonEvent.Bumped, function () {
    sensors.touch1.pauseUntil(ButtonEvent.Pressed)
-    motors.largeBC.setSpeed(50)
+    motors.largeBC.run(50)
    sensors.touch2.pauseUntil(ButtonEvent.Pressed)
-    motors.largeBC.setSpeed(0)
-    loops.pause(1000)
+    motors.largeBC.run(0)
+    pause(1000)
    brick.setStatusLight(StatusLight.OrangeFlash)
-    motors.largeBC.setSpeed(-50)
-    loops.pause(2000)
-    motors.largeBC.setSpeed(0)
+    motors.largeBC.run(-50)
+    pause(2000)
+    motors.largeBC.run(0)
 })
 ```
--- a/docs/coding/reversing-the-robot-3.md
+++ b/docs/coding/reversing-the-robot-3.md
@ -5,15 +5,15 @@ brick.buttonEnter.onEvent(ButtonEvent.Bumped, function () {
    brick.showImage(images.eyesSleeping)
    sensors.touch1.pauseUntil(ButtonEvent.Pressed)
    brick.showImage(images.eyesNeutral)
-    motors.largeBC.setSpeed(50)
+    motors.largeBC.run(50)
    sensors.touch2.pauseUntil(ButtonEvent.Pressed)
    brick.showImage(images.eyesTiredMiddle)
-    motors.largeBC.setSpeed(0)
-    loops.pause(1000)
+    motors.largeBC.run(0)
+    pause(1000)
    brick.setStatusLight(StatusLight.OrangeFlash)
    brick.showImage(images.eyesDizzy)
-    motors.largeBC.setSpeed(-50)
-    loops.pause(2000)
-    motors.largeBC.setSpeed(0)
+    motors.largeBC.run(-50)
+    pause(2000)
+    motors.largeBC.run(0)
 })
 ```
--- a/docs/coding/roaming-1.md
+++ b/docs/coding/roaming-1.md
@ -15,17 +15,17 @@ brick.buttonDown.onEvent(ButtonEvent.Bumped, function () {
    drive.push(5)
 })
 pauseUntil(() => drive.length >= 5)
-loops.pause(1000)
+pause(1000)
 music.playSoundEffectUntilDone(sounds.communicationGo)
 for (let d of drive) {
    if (d == 1) {
-        motors.largeC.setSpeed(50, 360, MoveUnit.Degrees)
+        motors.largeC.run(50, 360, MoveUnit.Degrees)
    } else if (d == 3) {
-        motors.largeB.setSpeed(50, 360, MoveUnit.Degrees)
+        motors.largeB.run(50, 360, MoveUnit.Degrees)
    } else if (d == 4) {
-        motors.largeBC.setSpeed(50, 360, MoveUnit.Degrees)
+        motors.largeBC.run(50, 360, MoveUnit.Degrees)
    } else {
-        motors.largeBC.setSpeed(-50, 360, MoveUnit.Degrees)
+        motors.largeBC.run(-50, 360, MoveUnit.Degrees)
    }
 }
 music.playSoundEffectUntilDone(sounds.communicationGameOver)
--- a/docs/coding/roaming-2.md
+++ b/docs/coding/roaming-2.md
@ -19,17 +19,17 @@ brick.buttonDown.onEvent(ButtonEvent.Bumped, function () {
    music.playSoundEffectUntilDone(sounds.systemClick)
 })
 brick.buttonEnter.pauseUntil(ButtonEvent.Bumped);
-loops.pause(1000)
+pause(1000)
 music.playSoundEffectUntilDone(sounds.communicationGo)
 for (let d of drive) {
    if (d == 1) {
-        motors.largeC.setSpeed(50, 360, MoveUnit.Degrees)
+        motors.largeC.run(50, 360, MoveUnit.Degrees)
    } else if (d == 3) {
-        motors.largeB.setSpeed(50, 360, MoveUnit.Degrees)
+        motors.largeB.run(50, 360, MoveUnit.Degrees)
    } else if (d == 4) {
-        motors.largeBC.setSpeed(50, 360, MoveUnit.Degrees)
+        motors.largeBC.run(50, 360, MoveUnit.Degrees)
    } else {
-        motors.largeBC.setSpeed(-50, 360, MoveUnit.Degrees)
+        motors.largeBC.run(-50, 360, MoveUnit.Degrees)
    }
 }
 music.playSoundEffectUntilDone(sounds.communicationGameOver)
--- a/docs/coding/three-point-turn-1.md
+++ b/docs/coding/three-point-turn-1.md
@ -3,10 +3,10 @@
 ```blocks
 brick.buttonEnter.onEvent(ButtonEvent.Bumped, function () {
    motors.largeBC.tank(75, 30)
-    loops.pause(1500)
+    pause(1500)
    motors.largeBC.tank(-30, -75)
-    loops.pause(1000)
+    pause(1000)
    motors.largeBC.tank(50, 50)
-    loops.pause(3000)
+    pause(3000)
 })
 ```
--- a/docs/coding/three-point-turn-2.md
+++ b/docs/coding/three-point-turn-2.md
@ -3,12 +3,12 @@
 ```blocks
 brick.buttonEnter.onEvent(ButtonEvent.Bumped, function () {
    motors.largeBC.tank(75, 30)
-    loops.pause(1500)
+    pause(1500)
    motors.largeBC.tank(-30, -75)
    sensors.ultrasonic4.pauseUntil(UltrasonicSensorEvent.ObjectNear);
    motors.largeBC.tank(0, 0)
-    loops.pause(1000)
+    pause(1000)
    motors.largeBC.tank(50, 50)
-    loops.pause(3000)
+    pause(3000)
 })
 ```
--- a/docs/coding/three-point-turn-3.md
+++ b/docs/coding/three-point-turn-3.md
@ -3,13 +3,13 @@
 ```blocks
 brick.buttonEnter.onEvent(ButtonEvent.Bumped, function () {
    motors.largeBC.tank(75, 30)
-    loops.pause(1500)
+    pause(1500)
    motors.largeBC.tank(-30, -75)
    sensors.ultrasonic4.pauseUntil(UltrasonicSensorEvent.ObjectNear);
    motors.largeBC.tank(0, 0)
    music.playSoundEffect(sounds.animalsDogBark1)
-    loops.pause(1000)
+    pause(1000)
    motors.largeBC.tank(50, 50)
-    loops.pause(3000)
+    pause(3000)
 })
 ```
--- a/docs/coding/traffic-lights-3.md
+++ b/docs/coding/traffic-lights-3.md
@ -1,7 +1,7 @@
 # Traffic Lights Activity 3

 ```blocks
-loops.forever(function () {
+forever(function () {
    if (sensors.color3.light(LightIntensityMode.Reflected) < 15) {
        motors.largeBC.tank(30, 12)
    } else {
--- a/docs/design-engineering.md
+++ b/docs/design-engineering.md
@ -0,0 +1,29 @@
+# Design Engineering Projects
+
+## Projects
+
+```codecard
+[
+    {
+        "name": "Make It Move Without Wheels",
+        "description": "TBD",
+        "imageUrl": "/static/lessons/make-it-move-1.png",
+        "url": "/design-engineering/make-it-move",
+        "cardType": "side"
+    },
+    {
+        "name": "Make It Smarter and Faster",
+        "description": "TBD",
+        "imageUrl": "/static/lessons/make-it-smarter-1.png",
+        "url": "/design-engineering/make-it-smarter",
+        "cardType": "side"
+    },
+    {
+        "name": "Make a System that Communicates",
+        "description": "A robot that tells you what it is doing.",
+        "imageUrl": "/static/lessons/make-it-communicate.png",
+        "url": "/design-engineering/make-it-communicate",
+        "cardType": "side"
+    }
+]
+```
--- a/docs/design-engineering/make-it-communicate.md
+++ b/docs/design-engineering/make-it-communicate.md
@ -0,0 +1,164 @@
+# Make A System That Communicates
+
+## Connect 
+
+### Design Brief
+
+Design, build and program a robotic system that follows a path and communicates its position at least twice along the way.
+
+https://www.youtube.com/watch?v=6piMI1JPDQc
+
+*	Robotic systems are built from smaller, related subsystems. Look at the automobile system shown in the video. What subsystems can you see?
+*	What kinds of robots follow a path?
+*	What kind of system do you want to make?
+
+### Brainstorm
+
+Discuss different solutions to the design brief.
+
+Think about:
+* What kind of motorized mechanism can be used to control the movements of a robot?
+* How can the robot sense where it is along the path?
+* How can the robot communicate its position?
+ 
+ ![EV3 + LEGO Bricks](/static/lessons/make-it-communicate/hero.png)
+
+## Construct 
+
+### Build
+
+You can start by tinkering with the LEGO elements in the picture and then build on.
+
+More building ideas: 
+* [EV3 Frames](https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/ev3%20frames-5054ee378e624fb4cb31158d2fc8e5cf.pdf)
+
+* [Tracks](https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/tracks-32d7554813af3f25cf5012d54a4bad2b.pdf)
+
+* [Color Sensor 2](https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/color%20sensor_v2-e7fd54b6fa3cdfe36f414c1d2510f9cb.pdf)
+
+
+Build a path for your robot to follow. You can use electrical tape on a floor, or marker on paper. You can use objects as milestones to indicate a path that can be detected by either the Touch Sensor, Color Sensor, or Ultrasonic Sensor. 
+
+## Program 
+
+Before you program, think about: 
+ 
+*	How will you program the robot to follow a path?
+*	How will you program the robot to communicate its position?
+*	Which programming blocks will you use?
+
+### ~ hint
+
+Explore the different Motor and Sensor blocks in the programming menu.
+
+### ~
+
+### Sample Solution 
+
+[Video: EV3 Track Rover](/static/lessons/make-it-communicate/trackrover.mp4)
+
+The Track Rover follows a path using the color sensor. It identifies two locations by color.
+
+[Building Instructions](https://le-www-live-s.legocdn.com/sc/media/lessons/mindstorms-ev3/ev3-dep/building%20instructions/track-rover-bi-6aadb1b053df0c58a0dea108b5ce0eea.pdf)
+
+### Sample Program Solution 
+
+This program works with the Track Rover. If you create a different robot, adjust the program to fit your solution. 
+
+#### Program summary: 
+
+* If the Color Sensor sees black, Motor B runs at -50 power and Motor C turns off.
+* If the Color Sensor sees white, Motor B turns off and Motor C runs at -50 power.
+* If the Color Sensor sees green, all motors stop and the green sound plays. 
+* The robot waits one second, then motors move forward.
+* If the Color Sensor sees red, all motors stop, and the red sound plays.
+* The robot waits one second, then motors move forward.
+* Loops unlimited.
+
+```blocks
+forever(function () {
+    if (sensors.color3.color() == ColorSensorColor.Black) {
+        motors.largeB.run(-50)
+        motors.largeC.run(0)
+    } else if (sensors.color3.color() == ColorSensorColor.White) {
+        motors.largeC.run(-50)
+        motors.largeB.run(0)
+    } else if (sensors.color3.color() == ColorSensorColor.Green) {
+        motors.stopAll()
+        music.playSoundEffectUntilDone(sounds.colorsGreen)
+        motors.largeBC.run(-50)
+    } else if (sensors.color3.color() == ColorSensorColor.Red) {
+        motors.stopAll()
+        music.playSoundEffectUntilDone(sounds.colorsRed)
+        motors.largeBC.run(-50)
+    } else {
+
+    }
+})
+```
+
+```blocks
+sensors.color3.onColorDetected(ColorSensorColor.Black, function () {
+    motors.largeB.run(-50)
+    motors.largeC.run(0)    
+})
+sensors.color3.onColorDetected(ColorSensorColor.White, function () {
+    motors.largeB.run(0)    
+    motors.largeC.run(-50)
+})
+sensors.color3.onColorDetected(ColorSensorColor.Green, function () {
+    motors.stopAll()
+    music.playSoundEffect(sounds.colorsGreen)
+    pause(1000)  
+    motors.largeBC.run(-50)
+})
+sensors.color3.onColorDetected(ColorSensorColor.Red, function () {
+    motors.stopAll()
+    music.playSoundEffect(sounds.colorsRed)
+    pause(1000)
+    motors.largeBC.run(-50)
+})
+```
+
+### Download and test
+
+Click Download and follow the instructions to get your code onto your EV3 Brick. Press the center button on the EV3 Brick to run the program.
+
+## Contemplate 
+
+### Test and Analyze 
+
+As you work on your solution: 
+1. Describe one part of your design that worked especially well. 
+2. Describe one design change that you had to make. 
+3. What will you try next? 
+
+
+### Review and Revise 
+Take a moment to reflect on your robot solution. 
+
+### Think about: 
+*	Can the robot’s movement be more accurate? 
+*	What are some ways that others have solved the problem?
+
+Describe two ways you could improve your robot.
+
+## Continue 
+
+### Personalize your project
+*	Add/remove LEGO elements to improve the way your robot moves. 
+*	Click on the JavaScript tab and experiment with changing the values in the code.
+*	Add a custom image or sounds by adding blocks from the Brick or Music menus.
+
+## Communicate 
+
+Here are some ideas: 
+*	Create a video of your project, especially your final presentation and your robot’s performance. 
+*	Explain some important features of your software program. 
+*	Produce a building guide for your model by taking a series of photographs as you deconstruct it. 
+*	Include an image of your program with comments. 
+*	Add a team photograph! 
+
+Congratulations! What will you design next?
+
+
--- a/docs/design-engineering/make-it-move.md
+++ b/docs/design-engineering/make-it-move.md
@ -0,0 +1,90 @@
+# Make It Move Without Wheels
+
+## ~ avatar
+
+Design, build and program a robot that can move itself using no wheels for locomotion.
+
+## ~
+
+## Connect
+
+### Design Brief
+
+Design, build and program a robot that can move itself a distance of at least 30cm, using at least one motor, using NO wheels for locomotion.
+
+### Brainstorm
+
+Discuss different solutions to the design brief.
+
+Think about:
+
+How can robots move without wheels? For example, how will you:
+* Connect the motor(s) to something to make the robot walk, crawl, or wiggle?
+How will you program the robot to move? For example, which programming blocks will you use to:
+* Turn on and turn off the motor or motors?
+* Display the distance moved?
+
+### Select the Best Solution
+
+Describe the solution that you have agreed to build and program.
+
+Think about examples from your brainstorming discussion. Then explain why you chose this solution for the design brief.
+
+![The Mars rover](/static/lessons/make-it-move/hero.png)
+
+https://www.youtube.com/ErC_s3hLGMk
+
+## Construct
+
+### Build and Program
+
+Now you are ready to start building and programming your solution!
+
+```blocks
+motors.largeBC.tank(-60, 60, 9, MoveUnit.Rotations);
+motors.stopAll();
+```
+
+As you work on your solution:
+
+* Describe one part of your design that worked especially well.
+* Describe one design change that you had to make.
+
+What will you try next?
+	
+As you test your design solution, use the table for recording your findings.
+
+[**VIEW BUILDING INSTRUCTIONS**](TODO) for a sample solution. (7.8 MB, PDF)
+
+## Contemplate
+
+### Test and Analyze
+
+How well does your solution satisfy the design brief? Record your data. Name the columns and rows, such as Trial Number, Distance Moved, and Observations.
+
+### Review and Revise
+
+Take a moment to reflect on your robot solution.
+
+Think about:
+* Is the robot using something other than wheels to move? Trace the movement from the motor axle to the mechanism(s) that drives the robot forward, backward or sideways. Wheels can be used to stabilize the robot but not to drive it.
+* Does the robot display the distance moved?
+* Is it accurate? How do you know?
+Describe two ways you could improve your robot.
+
+## Continue
+
+### Communicate
+
+Here are some ideas:
+* Create a video of your project, especially your final presentation and your robot’s performance.
+* Explain some important features of your software program.
+* Produce a building guide for your model by taking a series of photographs as you deconstruct it.
+* Include an image of your program with comments.
+* Add a team photograph!
+
+## ~ avatar
+
+Congratulations! What will you design next?
+
+## ~
--- a/docs/design-engineering/make-it-smarter.md
+++ b/docs/design-engineering/make-it-smarter.md
@ -0,0 +1,192 @@
+# Make It Smarter and Faster 
+
+
+## Connect 
+
+### Design Brief
+
+Design, build and program a robotic creature that can sense its environment and respond by moving.
+
+https://www.youtube.com/watch?v=y9-A_C_08KY
+
+* What do the robots in the video need to be able to sense, plan, and act?
+* What senses do humans have and why are they important to us?
+* How many human-like senses do you see the robots demonstrating? 
+
+### Brainstorm 
+
+Discuss different solutions to the design brief.
+
+Think about: 
+
+* What kind of creature can it be? 
+* How can it move? 
+* What does it need to be aware so that it stays safe, well fed and warm (or cool)? 
+* Is it looking for food, a safe place to hide or a warm place to soak up the sun? 
+* Will the creature need to move fast or slow? 
+* Will it need to turn? 
+* Will it need to go backward?
+
+![EV3 and bricks](/static/lessons/make-it-smarter/bricks.png)
+
+## Construct
+ 
+### Build
+
+Think about a creature’s movement for inspiration. Your mechanism can be attached or unattached to the EV3 brick. You can start by tinkering with the LEGO elements in the picture add then build on.
+More building ideas: 
+
+* [EV3 Frames](https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/ev3%20frames-5054ee378e624fb4cb31158d2fc8e5cf.pdf)
+* [Color Sensor 1](https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/color%20sensor_v1-16a7231bdc187cd88a8da120c68f58d5.pdf)
+* [Gyro Sensor](https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/gyro%20sensor-6f0fdbd82ae45fe0effa0ebf3f460f3d.pdf)
+* [Ultrasonic Sensor](https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/ultrasonic%20sensor-a56156c72e8946ed4c58c5e69f3520d3.pdf)
+* [Touch Sensor](https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/touch%20sensor-868fda1b9d6070a0a034fb22456a7fc9.pdf)
+* [Jaw](https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/jaw-ee93e8f3243e4d30cd34b0c337c33653.pdf)
+* [Leg 1](https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/leg%201-c14624046ea3a95148820ed404f5ac65.pdf)
+* [Leg 2](https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/leg%202-8855c35b990205f6b9d7130687a3d4db.pdf)
+* [Leg 3](https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/leg%203-575d52ef15fb79f1e4d3350d36607160.pdf)
+
+
+### Program 
+
+Before you program, think about:  
+
+* How will you program the robot to sense?
+* How will you program the robot to respond?
+* Which programming blocks will you use?
+
+### ~ hint
+
+**Hint:** Explore the different Sensor blocks in the Sensors Menu
+
+### ~
+
+## SCREEN 5
+
+Sample Solution 
+
+[Video: EV3 Insect]
+
+This Insect uses its Ultrasonic Sensor to sense danger and move away from threat.
+
+The Insect solution combines these building ideas:
+
+* EV3 Frames
+* Leg 2
+* Leg 3
+* Ultrasonic Sensor 
+
+Four copies of Leg 3 were built: one for the front left, one for the back right, and two mirror copies for the front right and back left.
+
+* [Building Instructions](https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/insect-94b8a46f0dc5082c9d78ddb734626dc9.pdf)
+
+### Sample Solution 
+
+This program checks if the Ultrasonic Sensor senses something near. 
+
+This program:
+
+* Turns on the green EV3 brick Status Light
+
+```block
+brick.setStatusLight(StatusLight.Green)
+```
+
+* Waits for Ultrasonic Sensor to detect an object
+
+```block
+sensors.ultrasonic4.pauseUntil(UltrasonicSensorEvent.ObjectDetected)
+```
+
+* Turns on Motors A and D in opposite directions
+
+```block
+motors.largeAD.tank(50, -50)
+```
+
+* Waits for one half of a second (1500 milli seconds)
+
+```block
+pause(1500)
+```
+
+* Reverses the direction of Motors A and D
+
+```block
+motors.largeAD.tank(-50, 50)
+```
+
+* Waits for one half of a second
+* Stops all motors
+
+```block
+motors.stopAll()
+```
+
+* Makes an insect chirping sound
+
+```block
+music.playSoundEffectUntilDone(sounds.animalsInsectChirp)
+```
+
+* Loops so the insect wanders around when the Ultrasonic Sensor is triggered
+
+```blocks
+forever(function () {
+    brick.setStatusLight(StatusLight.Green)
+    sensors.ultrasonic4.pauseUntil(UltrasonicSensorEvent.ObjectDetected)
+    motors.largeAD.tank(50, -50)
+    pause(1500)
+    motors.largeAD.tank(-50, 50)
+    pause(1500)
+    motors.stopAll()
+    music.playSoundEffectUntilDone(sounds.animalsInsectChirp)
+})
+```
+
+### Download and test
+
+Click Download and follow the instructions to get your code onto your EV3 Brick. Press the center button on the EV3 Brick to run the program.
+
+## Contemplate 
+
+### Test and Analyze 
+
+As you work on your solution: 
+1. Describe one part of your design that worked especially well. 
+2. Describe one design change that you had to make. 
+3. What will you try next? 
+
+
+### Review and Revise 
+
+Take a moment to reflect on your robot solution. 
+
+Think about: 
+
+* Does your robot move when the sensor is activated? 
+* If not, what will you change to make the robot’s ability to sense and respond more obvious? 
+* What other behaviors can you add to the robot to make it more realistic? 
+
+Describe two ways you could improve your robot.
+
+
+## Continue 
+
+Personalize your project
+
+* Add/remove LEGO elements to improve the way your robot moves. 
+* Click on the JavaScript tab and experiment with changing the values in the code.
+* Add a custom image or sounds by adding blocks from the Brick or Music menus.
+* Does your robot resemble a creature? Add arts and crafts materials to you project.
+
+## Communicate 
+
+Here are some ideas: 
+
+* Create a video of your project, especially your final presentation and your robot’s performance. Explain some important features of your software program. 
+* Produce a building guide for your model by taking a series of photographs as you deconstruct it. 
+* Include an image of your program with comments. 
+* Add a team photograph! 
+
+Congratulations! What will you design next?
--- a/docs/examples.md
+++ b/docs/examples.md
@ -2,6 +2,207 @@

 Here are some fun programs for your @boardname@!

+## Maker
+
+```codecard
+[
+{
+  "name": "Sound Of Color",
+  "description": "Play different sounds based on the color",
+  "url":"/maker/sound-of-color",
+  "cardType": "example",
+  "imageUrl": "/static/maker/sound-of-color.png"
+},
+{
+  "name": "Security Gadget",
+  "description": "Raise the alarm when your brick is lifted!",
+  "url":"/maker/security-gadget",
+  "cardType": "example",
+  "imageUrl": "/static/maker/security-gadget.png"
+},
+{
+  "name": "Intruder Detector",
+  "description": "Raise the alarm when an intruder sneaks in",
+  "url":"/maker/intruder-detector",
+  "cardType": "example",
+  "imageUrl": "/static/maker/intruder-detector.png"
+},
+{
+  "name": "Puppet",
+  "description": "Build an automated puppet",
+  "url":"/maker/puppet",
+  "cardType": "example",
+  "imageUrl": "/static/maker/puppet.png"
+}
+]
+```
+
+## Three Point Turn
+
+```codecard
+[
+{
+  "name": "Three Point Turn 1",
+  "description": "Activity 1",
+  "url":"/coding/three-point-turn-1",
+  "cardType": "example"
+}, {
+  "name": "Three Point Turn 2",
+  "description": "Activity 2",
+  "url":"/coding/three-point-turn-2",
+  "cardType": "example"
+}, {
+  "name": "Three Point Turn 3",
+  "description": "Activity 3",
+  "url":"/coding/three-point-turn-3",
+  "cardType": "example"
+}]
+```
+
+## Reversing the robot
+
+```codecard
+[{
+  "name": "Reversing the robot 1",
+  "description": "Activity 1",
+  "url":"/coding/reversing-the-robot-1",
+  "cardType": "example"
+}, {
+  "name": "Reversing the robot 2",
+  "description": "Activity 2",
+  "url":"/coding/reversing-the-robot-2",
+  "cardType": "example"
+}, {
+  "name": "Reversing the robot 3",
+  "description": "Activity 3",
+  "url":"/coding/reversing-the-robot-3",
+  "cardType": "example"
+}]
+```
+
+## Light the way
+
+```codecard
+[{
+  "name": "Light the way 1",
+  "description": "Activity 1",
+  "url":"/coding/light-the-way-1",
+  "cardType": "example"
+}, {
+  "name": "Light the way 2",
+  "description": "Activity 2",
+  "url":"/coding/light-the-way-2",
+  "cardType": "example"
+}, {
+  "name": "Light the way 3",
+  "description": "Activity 3",
+  "url":"/coding/light-the-way-3",
+  "cardType": "example"
+}    
+]
+```
+
+## Traffic Lights
+
+```codecard
+[{
+  "name": "Traffic Lights 1",
+  "description": "Activity 1",
+  "url":"/coding/traffic-lights-1",
+  "cardType": "example"
+}, {
+  "name": "Traffic Lights 2",
+  "description": "Activity 2",
+  "url":"/coding/traffic-lights-2",
+  "cardType": "example"
+}, {
+  "name": "Traffic Lights 3",
+  "description": "Activity 3",
+  "url":"/coding/traffic-lights-3",
+  "cardType": "example"
+}
+]
+```
+
+## Reverse Bepper
+
+```codecard
+[{
+  "name": "Reverse Beeper 1",
+  "description": "Activity 1",
+  "url":"/coding/reverse-beeper-1",
+  "cardType": "example"
+}, {
+  "name": "Reverse Beeper 2",
+  "description": "Activity 2",
+  "url":"/coding/reverse-beeper-2",
+  "cardType": "example"
+}, {
+  "name": "Reverse Beeper 3",
+  "description": "Activity 3",
+  "url":"/coding/reverse-beeper-3",
+  "cardType": "example"
+}]
+```
+
+## Ignition
+
+```codecard
+[{
+  "name": "Ignition 1",
+  "description": "Activity 1",
+  "url":"/coding/ingition-1",
+  "cardType": "example"
+}, {
+  "name": "Ignition 2",
+  "description": "Activity 2",
+  "url":"/coding/ignition-2",
+  "cardType": "example"
+}, {
+  "name": "Ignition 3",
+  "description": "Activity 3",
+  "url":"/coding/ignition-3",
+  "cardType": "example"
+}]
+```
+
+## Cruise Control
+
+```codecard
+[{
+  "name": "Cruise Control 1",
+  "description": "Activity 1",
+  "url":"/coding/cruise-control-1",
+  "cardType": "example"
+}, {
+  "name": "Cruise Control 2",
+  "description": "Activity 2",
+  "url":"/coding/cruise-control-2",
+  "cardType": "example"
+}, {
+  "name": "Cruise Control 3",
+  "description": "Activity 3",
+  "url":"/coding/cruise-control-3",
+  "cardType": "example"
+}]
+```
+
+## Roaming
+
+```codecard
+[{
+  "name": "Roaming 1",
+  "description": "Activity 1",
+  "url":"/coding/roaming-1",
+  "cardType": "example"
+}, {
+  "name": "Roaming 2",
+  "description": "Activity 2",
+  "url":"/coding/roaming-2",
+  "cardType": "example"
+}]
+```
+
 ## Fun stuff

 ```codecard
@ -11,5 +212,10 @@ Here are some fun programs for your @boardname@!
  "description": "Keep your brick entertained and happy",
  "url":"/examples/happy-unhappy",
  "cardType": "example"
+}, {
+  "name": "Distance Measurer",
+  "description": "Use a motor to measure angle and distance",
+  "url": "/examples/distance-measurer",
+  "cardType": "example"
 }]
 ```
--- a/docs/examples/core-set/gyroboy-blocks.md
+++ b/docs/examples/core-set/gyroboy-blocks.md
@ -108,7 +108,7 @@ function checkFallen() {
 // stop all motors and wait for touch button to be
 // pressed
 function stop() {
-    motors.stopAllMotors()
+    motors.stopAll()
    state = 0
    moods.knockedOut.show();
    sensors.touch3.pauseUntil(ButtonEvent.Pressed)
@ -119,15 +119,15 @@ sensors.ultrasonic4.onEvent(UltrasonicSensorEvent.ObjectNear, function () {
    controlSteering = 0
    oldControlDrive = controlDrive
    controlDrive = -10
-    motors.mediumC.setSpeed(30, 30, MoveUnit.Degrees);
-    motors.mediumC.setSpeed(-30, 60, MoveUnit.Degrees);
-    motors.mediumC.setSpeed(30, 30, MoveUnit.Degrees);
+    motors.mediumC.run(30, 30, MoveUnit.Degrees);
+    motors.mediumC.run(-30, 60, MoveUnit.Degrees);
+    motors.mediumC.run(30, 30, MoveUnit.Degrees);
    if (Math.randomRange(-1, 1) >= 1) {
        controlSteering = 70
    } else {
        controlSteering = -70
    }
-    loops.pause(4000)
+    pause(4000)
    music.playTone(2000, 100)
    controlSteering = 0
    controlDrive = oldControlDrive
@ -149,8 +149,8 @@ sensors.color1.onColorDetected(ColorSensorColor.Blue, function () {
 })
 // apply power to motors
 function controlMotors() {
-    motors.largeA.setSpeed(power + controlSteering * 0.1)
-    motors.largeD.setSpeed(power - controlSteering * 0.1)
+    motors.largeA.run(power + controlSteering * 0.1)
+    motors.largeD.run(power - controlSteering * 0.1)
 }
 sensors.color1.onColorDetected(ColorSensorColor.Yellow, function () {
    moods.middleLeft.show()
@ -162,7 +162,7 @@ sensors.color1.onColorDetected(ColorSensorColor.White, function () {
 })
 timestep = 0.014
 // main loop
-loops.forever(function () {
+forever(function () {
    reset()
    while (!fallen) {
        control.timer3.pauseUntil(5)
--- a/docs/examples/core-set/gyroboy-labview.md
+++ b/docs/examples/core-set/gyroboy-labview.md
@ -36,7 +36,7 @@ function RST() {
    sensors.gyro2.reset()
    sensors.gyro2.rate()
    control.timer2.reset()
-    loops.pause(5000)
+    pause(5000)
    mSum = 0;
    mPos = 0;
    mD = 0;
@ -65,7 +65,7 @@ function OS() {
            gSum = gyro;
            gMx = Math.max(gMx, gyro)
            gMn = Math.min(gMn, gyro)
-            loops.pause(4);
+            pause(4);
        }
    } while (gMx - gMn > 2);
    gOS = gSum / 200;
@ -121,7 +121,7 @@ function CHK() {
 }

 // M
-loops.forever(function () {
+forever(function () {
    RST();
    brick.showImage(images.eyesSleeping)
    OS()
@ -137,14 +137,14 @@ loops.forever(function () {
        GM();
        EQ();
        cntrl();
-        motors.largeA.setSpeed(lpwr)
-        motors.largeD.setSpeed(rpwr)
+        motors.largeA.run(lpwr)
+        motors.largeD.run(rpwr)
        CHK()
        let t2 = control.timer1.millis();
        let p = 5 - (t2 - t1);
-        loops.pause(Math.max(1, p))
+        pause(Math.max(1, p))
    }
-    motors.stopAllMotors()
+    motors.stopAll()
    st = 0;
    brick.setStatusLight(StatusLight.RedPulse);
    brick.showImage(images.eyesKnockedOut)
@ -154,7 +154,7 @@ loops.forever(function () {
 })

 // BHV
-loops.forever(function () {
+forever(function () {
    switch (st) {
        case 0:
            Cdrv = 0;
@ -162,7 +162,7 @@ loops.forever(function () {
            break;
        case 1:
            Cdrv = 40;
-            loops.pause(4000);
+            pause(4000);
            Cdrv = 0;
            music.playTone(1000, 100);
            st = 2;
@ -196,20 +196,20 @@ loops.forever(function () {
                Cstr = 0;
                oldDr = Cdrv;
                Cdrv = -10;
-                motors.mediumC.setSpeed(30, 30, MoveUnit.Degrees);
-                motors.mediumC.setSpeed(-30, 60, MoveUnit.Degrees);
-                motors.mediumC.setSpeed(30, 30, MoveUnit.Degrees);
+                motors.mediumC.run(30, 30, MoveUnit.Degrees);
+                motors.mediumC.run(-30, 60, MoveUnit.Degrees);
+                motors.mediumC.run(30, 30, MoveUnit.Degrees);
                if (Math.randomRange(-1, 1) >= 1)
                    Cstr = 70;
                else
                    Cstr = -70;
-                loops.pause(4000);
+                pause(4000);
                music.playTone(2000, 100)
                Cstr = 0;
                Cdrv = oldDr;
            }
            break;
    }
-    loops.pause(80);
+    pause(80);
 })
 ```
--- a/docs/examples/core-set/puppy-labview.md
+++ b/docs/examples/core-set/puppy-labview.md
@ -21,7 +21,7 @@ let GTO = 0;
 function DN() {
    motors.largeAD.setBrake(true);
    motors.largeAD.tank(50, 50, 1, MoveUnit.Seconds);
-    loops.pause(100);
+    pause(100);
    motors.largeA.clearCounts()
    motors.largeD.clearCounts()
 }
@ -32,9 +32,9 @@ function MNRH() {
    brick.setStatusLight(StatusLight.OrangePulse)
    while (!brick.buttonEnter.wasPressed()) {
        if (brick.buttonUp.wasPressed()) {
-            motors.mediumC.setSpeed(-100);
+            motors.mediumC.run(-100);
        } else if (brick.buttonDown.wasPressed()) {
-            motors.mediumC.setSpeed(100);
+            motors.mediumC.run(100);
        } else {
            motors.mediumC.stop();
        }
@ -83,24 +83,24 @@ function UP() {
    if (motors.largeA.angle() > -50) {
        control.runInParallel(function () {
            motors.largeD.clearCounts()
-            motors.largeD.setSpeed(-35);
+            motors.largeD.run(-35);
            pauseUntil(() => motors.largeD.angle() < -25);
            motors.largeD.stop();
            motors.largeD.setRegulated(false)
-            motors.largeD.setSpeed(-15)
+            motors.largeD.run(-15)
            pauseUntil(() => motors.largeD.angle() < -65);
            motors.largeD.stop();
        })
        motors.largeA.clearCounts()
-        motors.largeA.setSpeed(-35);
+        motors.largeA.run(-35);
        pauseUntil(() => motors.largeA.angle() < -25);
        motors.largeA.stop();
        motors.largeA.setRegulated(false)
-        motors.largeA.setSpeed(-15)
+        motors.largeA.run(-15)
        pauseUntil(() => motors.largeA.angle() < -65);
        motors.largeA.stop();

-        loops.pause(500);
+        pause(500);
    }
 }

@ -231,9 +231,9 @@ function IDL() {
 function MHT(Pos: number) {
    let _R = Pos - motors.mediumC.angle();
    if (_R >= 0) {
-        motors.mediumC.setSpeed(100, _R, MoveUnit.Degrees);
+        motors.mediumC.run(100, _R, MoveUnit.Degrees);
    } else {
-        motors.mediumC.setSpeed(-100, Math.abs(_R), MoveUnit.Degrees);
+        motors.mediumC.run(-100, Math.abs(_R), MoveUnit.Degrees);
    }
 }

@ -277,7 +277,7 @@ function NGR() {
    IS(4)
    music.playSoundEffect(sounds.animalsDogGrowl);
    UP();
-    loops.pause(1500);
+    pause(1500);
    music.stopAllSounds()
    music.playSoundEffect(sounds.animalsDogBark1)
    P_C--;
@ -303,16 +303,16 @@ function PPP() {
    NS = false;
    IS(2);
    UP();
-    loops.pause(100)
-    motors.largeA.setSpeed(-30, 70, MoveUnit.Degrees);
-    loops.pause(800);
+    pause(100)
+    motors.largeA.run(-30, 70, MoveUnit.Degrees);
+    pause(800);
    music.playSoundEffect(sounds.mechanicalHorn1);
-    loops.pause(1000);
+    pause(1000);
    for(let i = 0; i < 3; ++i) {
-        motors.largeA.setSpeed(-30, 20, MoveUnit.Degrees);
-        motors.largeA.setSpeed(30, 20, MoveUnit.Degrees);
+        motors.largeA.run(-30, 20, MoveUnit.Degrees);
+        motors.largeA.run(30, 20, MoveUnit.Degrees);
    }
-    motors.largeA.setSpeed(30, 70, MoveUnit.Degrees);
+    motors.largeA.run(30, 70, MoveUnit.Degrees);
    F_C = 1;
    CS(0);
 }
@ -320,14 +320,14 @@ function PPP() {
 function HPY() {
    IS(8)
    MHT(0);
-    motors.largeAD.setSpeed(10, 0.8, MoveUnit.Seconds);
+    motors.largeAD.run(10, 0.8, MoveUnit.Seconds);
    for(let i = 0; i < 3; ++i) {
        music.playSoundEffect(sounds.animalsDogBark1);
-        motors.largeAD.setSpeed(-100, 0.2, MoveUnit.Seconds);
-        loops.pause(300)
-        motors.largeAD.setSpeed(10, 0.3, MoveUnit.Seconds)
+        motors.largeAD.run(-100, 0.2, MoveUnit.Seconds);
+        pause(300)
+        motors.largeAD.run(10, 0.3, MoveUnit.Seconds)
    }
-    loops.pause(500);
+    pause(500);
    music.stopAllSounds();
    DN();
    RST();
@ -335,9 +335,9 @@ function HPY() {

 function STL() {
    UP();
-    motors.largeAD.setSpeed(-20, 60, MoveUnit.Degrees);
+    motors.largeAD.run(-20, 60, MoveUnit.Degrees);
    music.playSoundEffect(sounds.animalsDogWhine);
-    motors.largeAD.setSpeed(20, 60, MoveUnit.Degrees);
+    motors.largeAD.run(20, 60, MoveUnit.Degrees);
 }

 function WKU() {
@ -347,7 +347,7 @@ function WKU() {
    MHT(0)
    DN()
    STL()
-    loops.pause(1000);
+    pause(1000);
    UP()
    CS(0;)
 }
@ -358,7 +358,7 @@ MNRH();
 IS(1);
 UP();
 RST();
-loops.forever(function () {
+forever(function () {
    MON();
    switch (DB_S) {
        case 0:
--- a/docs/examples/core-set/robotarm-labview.md
+++ b/docs/examples/core-set/robotarm-labview.md
@ -5,20 +5,20 @@ function INI() {
    motors.largeB.setBrake(true)
    motors.largeC.setBrake(true)
    motors.mediumA.setBrake(true)
-    motors.largeB.setSpeed(-50)
+    motors.largeB.run(-50)
    pauseUntil(() => sensors.color3.light(LightIntensityMode.Reflected) > 25);
    motors.largeB.stop();
-    motors.mediumA.setSpeed(30, 1, MoveUnit.Seconds);
-    motors.mediumA.setSpeed(-50, 90, MoveUnit.Degrees);
-    motors.largeC.setSpeed(50)
+    motors.mediumA.run(30, 1, MoveUnit.Seconds);
+    motors.mediumA.run(-50, 90, MoveUnit.Degrees);
+    motors.largeC.run(50)
    sensors.touch1.pauseUntil(ButtonEvent.Pressed);
-    motors.largeC.setSpeed(-50, 0.86, MoveUnit.Rotations);
+    motors.largeC.run(-50, 0.86, MoveUnit.Rotations);
 }

 INI()

 let down = false;
-loops.forever(function () {
+forever(function () {
    brick.showImage(images.informationQuestionMark)
    brick.setStatusLight(StatusLight.OrangePulse);
    pauseUntil(() => (down = brick.buttonDown.wasPressed()) || brick.buttonUp.wasPressed())
@ -27,24 +27,24 @@ loops.forever(function () {
    brick.showImage(images.informationAccept)
    if (down) {
        brick.showImage(images.informationForward)
-        motors.largeC.setSpeed(65, 0.85, MoveUnit.Rotations);
+        motors.largeC.run(65, 0.85, MoveUnit.Rotations);
    } else {
        brick.showImage(images.informationBackward)
-        motors.largeC.setSpeed(-65, 0.85, MoveUnit.Rotations);
+        motors.largeC.run(-65, 0.85, MoveUnit.Rotations);
    }
-    motors.largeB.setSpeed(20, 275, MoveUnit.Degrees)
-    motors.mediumA.setSpeed(30, 1, MoveUnit.Seconds)
-    motors.largeB.setSpeed(-55)
+    motors.largeB.run(20, 275, MoveUnit.Degrees)
+    motors.mediumA.run(30, 1, MoveUnit.Seconds)
+    motors.largeB.run(-55)
    pauseUntil(() => sensors.color3.light(LightIntensityMode.Reflected) > 25);
    motors.largeB.stop();
    if (down) {
-        motors.largeC.setSpeed(-65, 0.86, MoveUnit.Rotations);
+        motors.largeC.run(-65, 0.86, MoveUnit.Rotations);
    } else {
-        motors.largeC.setSpeed(65, 0.85, MoveUnit.Rotations);
+        motors.largeC.run(65, 0.85, MoveUnit.Rotations);
    }
-    motors.largeB.setSpeed(20, 275, MoveUnit.Degrees);
-    motors.mediumA.setSpeed(-30, 90, MoveUnit.Degrees);
-    motors.largeB.setSpeed(-55)
+    motors.largeB.run(20, 275, MoveUnit.Degrees);
+    motors.mediumA.run(-30, 90, MoveUnit.Degrees);
+    motors.largeB.run(-55)
    pauseUntil(() => sensors.color3.light(LightIntensityMode.Reflected) > 25);
    motors.largeB.stop()
 })
--- a/docs/examples/crane-labview.md
+++ b/docs/examples/crane-labview.md
@ -5,20 +5,20 @@ function INI() {
    motors.largeB.setBrake(true)
    motors.largeC.setBrake(true)
    motors.mediumA.setBrake(true)
-    motors.largeB.setSpeed(-50)
+    motors.largeB.run(-50)
    pauseUntil(() => sensors.color3.light(LightIntensityMode.Reflected) > 25);
    motors.largeB.stop();
-    motors.mediumA.setSpeed(30, 1, MoveUnit.Seconds);
-    motors.mediumA.setSpeed(-50, 90, MoveUnit.Degrees);
-    motors.largeC.setSpeed(50)
+    motors.mediumA.run(30, 1, MoveUnit.Seconds);
+    motors.mediumA.run(-50, 90, MoveUnit.Degrees);
+    motors.largeC.run(50)
    sensors.touch1.pauseUntil(ButtonEvent.Pressed);
-    motors.largeC.setSpeed(-50, 0.86, MoveUnit.Rotations);
+    motors.largeC.run(-50, 0.86, MoveUnit.Rotations);
 }

 INI()

 let down = false;
-loops.forever(function () {
+forever(function () {
    brick.showImage(images.informationQuestionMark)
    brick.setStatusLight(StatusLight.OrangePulse);
    pauseUntil(() => (down = brick.buttonDown.wasPressed()) || brick.buttonUp.wasPressed())
@ -27,24 +27,24 @@ loops.forever(function () {
    brick.showImage(images.informationAccept)
    if (down) {
        brick.showImage(images.informationForward)
-        motors.largeC.setSpeed(65, 0.85, MoveUnit.Rotations);
+        motors.largeC.run(65, 0.85, MoveUnit.Rotations);
    } else {
        brick.showImage(images.informationBackward)
-        motors.largeC.setSpeed(-65, 0.85, MoveUnit.Rotations);
+        motors.largeC.run(-65, 0.85, MoveUnit.Rotations);
    }
-    motors.largeB.setSpeed(20, 275, MoveUnit.Degrees)
-    motors.mediumA.setSpeed(30, 1, MoveUnit.Seconds)
-    motors.largeB.setSpeed(-55)
+    motors.largeB.run(20, 275, MoveUnit.Degrees)
+    motors.mediumA.run(30, 1, MoveUnit.Seconds)
+    motors.largeB.run(-55)
    pauseUntil(() => sensors.color3.light(LightIntensityMode.Reflected) > 25);
    motors.largeB.stop();
    if (down) {
-        motors.largeC.setSpeed(-65, 0.86, MoveUnit.Rotations);
+        motors.largeC.run(-65, 0.86, MoveUnit.Rotations);
    } else {
-        motors.largeC.setSpeed(65, 0.85, MoveUnit.Rotations);
+        motors.largeC.run(65, 0.85, MoveUnit.Rotations);
    }
-    motors.largeB.setSpeed(20, 275, MoveUnit.Degrees);
-    motors.mediumA.setSpeed(-30, 90, MoveUnit.Degrees);
-    motors.largeB.setSpeed(-55)
+    motors.largeB.run(20, 275, MoveUnit.Degrees);
+    motors.mediumA.run(-30, 90, MoveUnit.Degrees);
+    motors.largeB.run(-55)
    pauseUntil(() => sensors.color3.light(LightIntensityMode.Reflected) > 25);
    motors.largeB.stop()
 })
--- a/docs/examples/distance-measurer.md
+++ b/docs/examples/distance-measurer.md
@ -0,0 +1,34 @@
+# Distance Measurer
+
+```blocks
+let distance = 0
+let angle = 0
+let measuring = false
+let radius = 0
+// Start and stop measuring with the enter button
+brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
+    if (measuring) {
+        // turn off the measuring
+        measuring = false
+        brick.setStatusLight(StatusLight.Off)
+    } else {
+        // turn on the measuring clear the counters so that
+        // the motor tracks the angle
+        measuring = true
+        motors.largeB.clearCounts()
+        brick.setStatusLight(StatusLight.GreenPulse)
+    }
+})
+radius = 2.5
+brick.showString("Press ENTER to measure", 4)
+forever(function () {
+    if (measuring) {
+        angle = motors.largeB.angle()
+        distance = angle / 180 * Math.PI * radius
+        brick.clearScreen()
+        brick.showValue("angle", angle, 2)
+        brick.showValue("distance", distance, 3)
+    }
+    pause(100)
+})
+```
--- a/docs/examples/gyro-boy-labview.md
+++ b/docs/examples/gyro-boy-labview.md
@ -36,7 +36,7 @@ function RST() {
    sensors.gyro2.reset()
    sensors.gyro2.rate()
    control.timer2.reset()
-    loops.pause(5000)
+    pause(5000)
    mSum = 0;
    mPos = 0;
    mD = 0;
@ -65,7 +65,7 @@ function OS() {
            gSum = gyro;
            gMx = Math.max(gMx, gyro)
            gMn = Math.min(gMn, gyro)
-            loops.pause(4);
+            pause(4);
        }
    } while (gMx - gMn > 2);
    gOS = gSum / 200;
@ -121,7 +121,7 @@ function CHK() {
 }

 // M
-loops.forever(function () {
+forever(function () {
    RST();
    brick.showImage(images.eyesSleeping)
    OS()
@ -137,14 +137,14 @@ loops.forever(function () {
        GM();
        EQ();
        cntrl();
-        motors.largeA.setSpeed(lpwr)
-        motors.largeD.setSpeed(rpwr)
+        motors.largeA.run(lpwr)
+        motors.largeD.run(rpwr)
        CHK()
        let t2 = control.timer1.millis();
        let p = 5 - (t2 - t1);
-        loops.pause(Math.max(1, p))
+        pause(Math.max(1, p))
    }
-    motors.stopAllMotors()
+    motors.stopAll()
    st = 0;
    brick.setStatusLight(StatusLight.RedPulse);
    brick.showImage(images.eyesKnockedOut)
@ -154,7 +154,7 @@ loops.forever(function () {
 })

 // BHV
-loops.forever(function () {
+forever(function () {
    switch (st) {
        case 0:
            Cdrv = 0;
@ -162,7 +162,7 @@ loops.forever(function () {
            break;
        case 1:
            Cdrv = 40;
-            loops.pause(4000);
+            pause(4000);
            Cdrv = 0;
            music.playTone(1000, 100);
            st = 2;
@ -196,20 +196,20 @@ loops.forever(function () {
                Cstr = 0;
                oldDr = Cdrv;
                Cdrv = -10;
-                motors.mediumC.setSpeed(30, 30, MoveUnit.Degrees);
-                motors.mediumC.setSpeed(-30, 60, MoveUnit.Degrees);
-                motors.mediumC.setSpeed(30, 30, MoveUnit.Degrees);
+                motors.mediumC.run(30, 30, MoveUnit.Degrees);
+                motors.mediumC.run(-30, 60, MoveUnit.Degrees);
+                motors.mediumC.run(30, 30, MoveUnit.Degrees);
                if (Math.randomRange(-1, 1) >= 1)
                    Cstr = 70;
                else
                    Cstr = -70;
-                loops.pause(4000);
+                pause(4000);
                music.playTone(2000, 100)
                Cstr = 0;
                Cdrv = oldDr;
            }
            break;
    }
-    loops.pause(80);
+    pause(80);
 })
 ```
--- a/docs/examples/line-follower-pid.md
+++ b/docs/examples/line-follower-pid.md
@ -26,9 +26,9 @@ while (!(brick.buttonEnter.wasPressed())) {
    brick.showValue("min", min, 4)
    brick.showValue("max", v, 5)
    brick.showValue("setpoint", setpoint, 6)
-    loops.pause(100)
+    pause(100)
 }
-loops.forever(function () {
+forever(function () {
    brick.clearScreen()
    v = sensors.color3.light(LightIntensityMode.Reflected)
    brick.showValue("light", v, 1)
@ -43,7 +43,7 @@ loops.forever(function () {
    motors.largeBC.steer(P + (I + D), 100)
    lasterror = error
    if (brick.buttonEnter.wasPressed()) {
-        motors.largeBC.setSpeed(0)
+        motors.largeBC.run(0)
        brick.buttonDown.pauseUntil(ButtonEvent.Bumped)
    }
 })
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@ -0,0 +1,22 @@
+# Getting Started
+
+## Projects
+
+```codecard
+[
+{
+    "name": "Try",
+    "imageUrl": "/static/lessons/try.png",
+    "description": "Get a quick introduction to programming with EV3.",
+    "url": "/getting-started/try",
+    "cardType": "side"
+},
+{
+    "name": "Use",
+    "imageUrl": "/static/lessons/use.png",
+    "description": "Build a robot and drive into the world of robotics!",
+    "url": "/getting-started/use",
+    "cardType": "side"
+}
+]
+```
--- a/docs/getting-started/try.md
+++ b/docs/getting-started/try.md
@ -0,0 +1,178 @@
+# Try 
+
+[IMG: Neutral Image Display on EV3 Brick with Music Notes]
+
+Get a quick introduction to programming with EV3.
+
+We are excited to help you get started with LEGO MINDSTORMS Education EV3. In this project we will guide you through connecting your EV3 brick, creating your first program, controlling a Large Motor, a Touch Sensor and a Color Sensor. These steps can take up to 45 minutes.
+
+## Turn on your EV3 Brick
+
+[IMG: Hand pressing power button, Neutral Image Display, EV3 Brick]
+
+Power on your EV3 Brick by pressing the Center Button.
+
+## Connect Your EV3 Brick to Your Device
+
+[IMG: Hand on cable & computer, Neutral Image Display, EV3 Brick]
+
+Use the USB cable to connect your EV3 Brick to your device.
+
+## Create and Run your First Program
+
+[IMG: Try Program Blocks (see JavaScript below)]
+
+1 - Create the program shown here:
+
+```blocks
+brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
+    brick.showMood(moods.neutral)
+    music.playSoundEffect(sounds.communicationHello)
+})
+```
+
+* Drag a Brick Screen show mood block inside the on button block
+* Change mood to 
+
+```block
+brick.showMood(moods.neutral)
+```
+
+* Drag a Music play sound effect block below the show mood block
+* Change sound effect to 
+
+```block
+music.playSoundEffect(sounds.communicationHello)
+```
+
+2 – Click Download and follow the instructions to get your code onto your EV3 Brick. Press the center button on the EV3 Brick to run the program.
+
+## ~ hint
+
+Note: Click here  for help and more information about the programming blocks.
+
+## ~
+
+## Did It Work?
+
+[IMG: Neutral Image Display, EV3 Brick]
+
+Verify that the program you just created shows eyes on the Brick Display, and that the EV3 Brick played the sound “Hello!”
+
+**Well done!**
+
+## Connect a Large Motor
+
+[IMG: EV3 Brick with hands connecting Large Motor to Port D]
+
+Now you will learn to control the Large Motor.
+
+Connect a Large Motor to Port D of your EV3 Brick using any of the connector cables.
+
+## Create and Run This Program
+
+[IMG: Program Blocks (see JavaScript below)]
+
+1) Create the program shown here:
+
+```blocks
+brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
+    motors.largeD.run(50, 1, MoveUnit.Rotations)
+})
+```
+
+* Start a new program
+* Drag a run large A motor block inside the on button block
+* Change large A to large D motors.largeD.run(50)
+* Click on the + sign
+* Change to 1 rotation
+
+2) Click Download and follow the instructions to get your code onto your EV3 Brick. Press the center button on the EV3 Brick to run the program.
+
+## Did It Rotate?
+
+[IMG: Large Motor D w/Rotating “WHRRR,” Hand, EV3 Brick]
+
+Confirm that your motor has turned one rotation at power level 50 before stopping.
+
+Download and run the program as many times as you want in order to verify this, or tinker with different power levels and different rotations.
+
+## Connect a Touch Sensor
+
+[IMG: Hands connecting Touch Sensor to Port 1 on EV3 Brick]
+
+We will now control the Large Motor using a Touch Sensor.
+
+Keeping the Large Motor connected to **Port D**, connect a Touch Sensor to **Port 1** of your EV3 Brick.
+
+## Modify Your Program
+
+[IMG: Program Blocks (see JavaScript below)]
+
+```blocks
+brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
+    sensors.touch1.pauseUntil(ButtonEvent.Pressed)
+    motors.largeD.run(50, 1, MoveUnit.Rotations)
+})
+```
+
+1) Add a pause until touch 1 pressed Sensor block on top of the run large D Motor block
+
+```block
+sensors.touch1.pauseUntil(ButtonEvent.Pressed)
+```
+
+2) Click Download and follow the instructions to get your code onto your EV3 Brick. Press the center button on the EV3 Brick to run the program.
+
+## Press the Touch Sensor
+
+[IMG: Hand Touch Sensor Pressed & EV3 Brick & Large Motor]
+
+Confirm that the Large Motor has turned one rotation AFTER you press the Touch Sensor.
+
+Download and run the program as many times as you want in order to verify this, or tinker with different Touch Sensor and Large Motor values.
+
+## Connect a Color Sensor
+
+[IMG: Hand connecting Color Sensor to Port 4, Large Motor D, EV3 Brick]
+
+Now we will try to control the Large Motor using another sensor.
+
+Keeping the Large Motor connected to **Port D**, connect the Color Sensor to **Port 4**.
+Modify Your Program
+
+[IMG: Program Blocks (see JavaScript below)]
+
+```blocks
+brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
+    sensors.color3.pauseForColor(ColorSensorColor.Green)
+    motors.largeD.run(50, 1, MoveUnit.Rotations)
+})
+```
+
+1) Using the same program, replace the pause until touch 1 block with a pause color 3 for color block
+
+```block
+sensors.color3.pauseForColor(ColorSensorColor.Green)
+```
+
+2) Select the color you want to detect (e.g., green).
+
+3) Click Download and follow the instructions to get your code onto your EV3 Brick. Press the center button on the EV3 Brick to run the program.
+
+## Place a Colored Brick in Front of the Color Sensor
+
+[IMG: Colored bricks in front of Color Sensor, hands, EV3 Brick]
+
+Confirm that the Large Motor has turned one rotation AFTER the Color Sensor has detected the colored brick.
+
+Download and run the program as many times as you want in order to verify this, or tinker with different Color Sensor and Large Motor values.
+
+Click on the JavaScript tab and change the color the Color Sensor detects to Black, Blue, Green, Yellow, Red, White, or Brown. Use Title Case for the color names.
+
+## Well Done!
+
+[IMG: EV3 Driving Base]
+
+You have now learned how to control some of the inputs and outputs of the EV3.
+
--- a/docs/getting-started/use.md
+++ b/docs/getting-started/use.md
@ -0,0 +1,114 @@
+# Use
+
+[IMG: EV3 Driving Base full w/cuboid]
+
+Build a robot and drive into the world of robotics!
+In this project we will guide you through building a Driving Base Robot and programming it to move straight and turn. You will also build and Object Detector Module, and program it to detect an object. It’s a good idea to have done the [Try](/getting-started/try)  sequence first.
+
+## Connect
+
+[IMG: Apple Picker]
+
+What if your school had a multipurpose robot? How would you use it?
+
+Would you use it to clean the school or plant trees?
+
+## Build Your Driving Base Robot
+
+[IMG: EV3 Driving Base Building Instructions Cover Image]
+
+* [Building instructions](https://le-www-live-s.legocdn.com/sc/media/lessons/mindstorms-ev3/building-instructions/ev3-rem-driving-base-79bebfc16bd491186ea9c9069842155e.pdf)
+
+## Make It Move
+
+[IMG: Program Blocks (see JavaScript below)]
+
+1) Create a program that makes the Driving Base move forward and stop at the finish line, which is 1 meter away.
+
+Start by building this program:
+
+```blocks
+brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
+    motors.largeBC.steer(0, 50, 1, MoveUnit.Rotations)
+})
+```
+
+* Drag a steer large B+C motor block inside the on button block
+* Click on the + sign
+* Change to 1 rotation
+
+### ~ hint
+
+Hint: You will have to modify the number of rotations until you find the number that matches the robot moving forward 1 meter and stopping.
+
+### ~
+
+2) Click Download and follow the instructions to get your code onto your EV3 Brick. Press the center button on the EV3 Brick to run the program.
+
+## Make It Turn
+
+[IMG: Program Blocks (see JavaScript below)]
+
+```blocks
+brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
+    motors.largeBC.steer(-50, 50, 1, MoveUnit.Rotations)
+})
+```
+
+1) Create a new program that turns the Driving Base 180 degrees.
+
+### ~ hint
+
+Hint: You will have to modify the turn ratio and the number of rotations until the robot reaches 180 degrees.
+
+### ~
+ 
+
+2) Click Download and follow the instructions to get your code onto your EV3 Brick. Press the center button on the EV3 Brick to run the program.
+
+## Add an Ultrasonic Sensor to Your Driving Base
+
+[IMG: EV3 Ultrasonic Sensor Driving Base Building Instructions Main Image]
+
+* [building instructions](https://le-www-live-s.legocdn.com/sc/media/lessons/mindstorms-ev3/building-instructions/ev3-ultrasonic-sensor-driving-base-61ffdfa461aee2470b8ddbeab16e2070.pdf)
+
+## Detect an Object
+
+[IMG: Program Blocks (see JavaScript below)]
+
+1 - Create a program that moves the Driving Base and makes it stop ``6`` cm from the Cuboid.
+
+Create a new program
+```blocks
+brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
+    motors.largeBC.tank(50, 50)
+    sensors.ultrasonic4.setThreshold(UltrasonicSensorEvent.ObjectDetected, 6)
+    sensors.ultrasonic4.pauseUntil(UltrasonicSensorEvent.ObjectDetected);
+    motors.stopAll()
+})
+```
+
+* Drag a tank large B+C motor block inside the on button block
+* Drag a threshold Ultrasonic Sensor block and place below the motor block
+* Drag a stop all motors block and place it below the sensor block
+
+### ~ hint
+
+Hint: You will have to modify the values of the Ultrasonic Sensor block until the robot reaches the desired position.
+
+### ~
+
+2) Click Download and follow the instructions to get your code onto your EV3 Brick. Press the center button on the EV3 Brick to run the program.
+
+Click on the JavaScript tab and change and test the number value of the Ultrasonic Sensor 
+
+```typescript
+sensors.ultrasonic4.setThreshold(UltrasonicSensorEvent.ObjectDetected, 10)
+```
+
+[IMG: EV3 Ultrasonic Sensor Driving Base Building Instructions Main Image]
+
+**Congratulations!**
+
+You are ready to move on to the next steps.
+Try a LEGO MINDSTORMS Design Engineering, Coding, or Maker activity.
--- a/docs/index-ref.json
+++ b/docs/index-ref.json
@ -1,3 +1,3 @@
 {
-    "appref": "v"
+    "appref": "v0.0.104"
 }
--- a/docs/labview.md
+++ b/docs/labview.md
@ -14,16 +14,16 @@ Take a look a the LabView program below: it **starts**, turns on motor A, waits
 The blocks in MakeCode have similar functions and go together in the same way: they snap into the ``||loops:on start||`` block and then connect to each other vertically.

 ```blocks
-motors.largeA.setSpeed(50)
-loops.pause(1000)
+motors.largeA.run(50)
+pause(1000)
 motors.largeA.stop()
 ```

 Any block program can be converted to JavaScript and you can edit it as lines of code too.

 ```typescript
-motors.largeA.setSpeed(50)
-loops.pause(1000)
+motors.largeA.run(50)
+pause(1000)
 motors.largeA.stop()
 ```

@ -40,10 +40,10 @@ This program controls a large motor on port A in several different ways. It sets
 ![Single motor blocks](/static/labview/motors.png)       

 ```blocks
-motors.largeA.setSpeed(50);
-motors.largeA.setSpeed(50, 1000, MoveUnit.MilliSeconds);
-motors.largeA.setSpeed(50, 360, MoveUnit.Degrees);
-motors.largeA.setSpeed(50, 1, MoveUnit.Rotations);
+motors.largeA.run(50);
+motors.largeA.run(50, 1000, MoveUnit.MilliSeconds);
+motors.largeA.run(50, 360, MoveUnit.Degrees);
+motors.largeA.run(50, 1, MoveUnit.Rotations);
 motors.largeA.stop();
 ```

@ -83,7 +83,7 @@ By default, all motors coast when any command used to move finishes. You can kee

 ```blocks
 motors.largeD.setBrake(true);
-motors.largeD.setSpeed(50, 1, MoveUnit.Rotations)
+motors.largeD.run(50, 1, MoveUnit.Rotations)
 ```

 ## Inverting and regulating motors
@ -132,15 +132,15 @@ It is quite common to have to wait for a task to finish or for a sensor state to
 ![pause for time](/static/labview/pausefortime.png)      

 ```blocks
-motors.largeD.setSpeed(50)
-loops.pause(1000)
+motors.largeD.run(50)
+pause(1000)
 motors.largeD.stop();
 ```

 ![pause for touch](/static/labview/pausefortouch.png)

 ```blocks
-motors.largeD.setSpeed(50)
+motors.largeD.run(50)
 sensors.touch1.pauseUntil(ButtonEvent.Pressed)
 motors.largeD.stop();
 ```
@ -148,7 +148,7 @@ motors.largeD.stop();
 ![pause for distance](/static/labview/pausefordistance.png)

 ```blocks
-motors.largeD.setSpeed(50)
+motors.largeD.run(50)
 sensors.ultrasonic4.pauseUntil(UltrasonicSensorEvent.ObjectNear)
 motors.largeD.stop();
 ```
@ -156,7 +156,7 @@ motors.largeD.stop();
 You can also use the ``||loops:pause until||`` block to wait on any [boolean](/types/boolean) expression. As your program runs, it waits until the condition (expression) inside becomes true.

 ```blocks
-motors.largeD.setSpeed(50)
+motors.largeD.run(50)
 pauseUntil(() => sensors.touch1.isPressed())
 motors.largeD.stop()
 ```
@ -166,9 +166,9 @@ motors.largeD.stop()
 ![Single loop](/static/labview/loopinfinite.png)

 ```blocks
-loops.forever(() => {
-    motors.largeD.setSpeed(50, 1, MoveUnit.Rotations);
-    motors.largeD.setSpeed(-50, 1, MoveUnit.Rotations);
+forever(() => {
+    motors.largeD.run(50, 1, MoveUnit.Rotations);
+    motors.largeD.run(-50, 1, MoveUnit.Rotations);
 })
 ```

@ -176,13 +176,13 @@ loops.forever(() => {

 ```blocks
 for(let i = 0; i < 10; i++) {
-    motors.largeD.setSpeed(50, 1, MoveUnit.Rotations);
-    motors.largeD.setSpeed(-50, 1, MoveUnit.Rotations);
+    motors.largeD.run(50, 1, MoveUnit.Rotations);
+    motors.largeD.run(-50, 1, MoveUnit.Rotations);
 }
 let k = 0;
 while(k < 10) {
-    motors.largeD.setSpeed(50, 1, MoveUnit.Rotations);
-    motors.largeD.setSpeed(-50, 1, MoveUnit.Rotations);    
+    motors.largeD.run(50, 1, MoveUnit.Rotations);
+    motors.largeD.run(-50, 1, MoveUnit.Rotations);    
    k++;
 }
 ```
@ -193,9 +193,9 @@ while(k < 10) {

 ```blocks
 let light = 0;
-loops.forever(function () {
+forever(function () {
    light = sensors.color3.light(LightIntensityMode.Reflected);
-    motors.largeD.setSpeed(light)
+    motors.largeD.run(light)
 })
 ```

@ -206,15 +206,15 @@ You can start up multiple ``||loops:forever||`` loops that will run at the same
 ![Multiple loops running at the same time](/static/labview/multipleloops.png)

 ```blocks
-loops.forever(() => {
-    motors.largeD.setSpeed(50, 1, MoveUnit.Rotations);
-    motors.largeD.setSpeed(-50, 1, MoveUnit.Rotations);
+forever(() => {
+    motors.largeD.run(50, 1, MoveUnit.Rotations);
+    motors.largeD.run(-50, 1, MoveUnit.Rotations);
 })
-loops.forever(() => {
+forever(() => {
    brick.showImage(images.eyesMiddleRight)
-    loops.pause(1000)
+    pause(1000)
    brick.showImage(images.eyesMiddleLeft)
-    loops.pause(1000)
+    pause(1000)
 })
 ```

@ -225,9 +225,9 @@ The ``||logic:if||`` block allows you to run different code depending on whether
 ![Brake block](/static/labview/ife.png)

 ```blocks
-loops.forever(function() {
+forever(function() {
    if(sensors.touch1.isPressed()) {
-        motors.largeD.setSpeed(50)
+        motors.largeD.run(50)
    } else {
        motors.largeD.stop()
    }
@ -241,8 +241,8 @@ The ``||math:pick random||`` block returns a random number selected from a range
 ![Brake block](/static/labview/random.png)

 ```blocks
-loops.forever(function () {
+forever(function () {
    motors.largeBC.steer(Math.randomRange(-5, 5), 50)
-    loops.pause(100)
+    pause(100)
 })
 ```
--- a/docs/lessons/line-detection.md
+++ b/docs/lessons/line-detection.md
@ -81,7 +81,7 @@ Study the program...what do you think the program will do?
 motors.largeBC.steer(0, 20)
 while (true) {
    sensors.color3.pauseForColor(ColorSensorColor.Red)
-    motors.stopAllMotors()
+    motors.stopAll()
 }
 ```

@ -148,7 +148,7 @@ while (true) {
    motors.largeBC.steer(0, 20)
    while (true) {
        sensors.color3.pauseForColor(ColorSensorColor.Red)
-        motors.stopAllMotors()
+        motors.stopAll()
    }
 }
 ```
@ -162,7 +162,7 @@ while (true) {
    motors.largeBC.steer(0, 20)
    while (true) {
        sensors.color3.pauseForColor(ColorSensorColor.Red)
-        motors.stopAllMotors()
+        motors.stopAll()
    }
    while (true) {
        
@ -183,7 +183,7 @@ while (true) {
    motors.largeBC.steer(0, 20)
    while (true) {
        sensors.color3.pauseForColor(ColorSensorColor.Red)
-        motors.stopAllMotors()
+        motors.stopAll()
    }
    while (true) {
        sensors.color3.pauseForColor(ColorSensorColor.Red)
@ -213,13 +213,13 @@ music.playSoundEffect(sounds.systemGeneralAlert)
 }
 while (true) {
    while (true) {      sensors.color3.pauseForLight(LightIntensityMode.Reflected, LightCondition.Bright)
-        motors.largeB.setSpeed(10)
-        motors.largeC.setSpeed(-10)
+        motors.largeB.run(10)
+        motors.largeC.run(-10)
    }
    while (true) {
        sensors.color3.pauseForLight(LightIntensityMode.Reflected, LightCondition.Bright)
-        motors.largeA.setSpeed(-10)
-        motors.largeA.setSpeed(10)
+        motors.largeA.run(-10)
+        motors.largeA.run(10)
    }
 }
 ```
@ -235,13 +235,13 @@ You will need to constantly debug your program in order to make your robot trave
 ```blocks
 while (true) {
    while (true) {   sensors.color3.pauseForLight(LightIntensityMode.Reflected, LightCondition.Bright)
-        motors.largeB.setSpeed(10)
-        motors.largeC.setSpeed(-10)
+        motors.largeB.run(10)
+        motors.largeC.run(-10)
    }
    while (true) {
        sensors.color3.pauseForLight(LightIntensityMode.Reflected, LightCondition.Bright)
-        motors.largeB.setSpeed(-10)
-        motors.largeC.setSpeed(10)
+        motors.largeB.run(-10)
+        motors.largeC.run(10)
    }
 }
 ```
--- a/docs/lessons/make-it-move-tutorial.md
+++ b/docs/lessons/make-it-move-tutorial.md
@ -51,7 +51,7 @@ The ``||motors:tank large B+C||`` block will run for `9` rotations when the **ce

 ```blocks
 motors.largeBC.tank(-60, 60, 9, MoveUnit.Rotations)
-motors.stopAllMotors()
+motors.stopAll()
 ```

 ## Program 3 @fullscreen
@ -63,7 +63,7 @@ The ``||motors:tank large B+C||`` will run for `9` rotations when the **center**

 ```blocks
 motors.largeBC.tank(-60, 60, 9, MoveUnit.Rotations)
-motors.stopAllMotors()
+motors.stopAll()
 brick.showString("30 cm", 1)
 ```

--- a/docs/maker.md
+++ b/docs/maker.md
@ -9,39 +9,12 @@ These six activities require the LEGO® MINDSTORMS® Education EV3 Core Set (455
 ```codecard
 [
 {
-  "name": "Sound Machine",
+  "name": "Make A Sound Machine",
  "description": "Create instruments with your EV3 Brick!",
  "url":"/maker/sound-machine",
  "cardType": "example",
-  "imageUrl": "/static/maker/sound-machine.png"
-},
-{
-  "name": "Sound Of Color",
-  "description": "Play different sounds based on the color",
-  "url":"/maker/sound-of-color",
-  "cardType": "example",
-  "imageUrl": "/static/maker/sound-of-color.png"
-},
-{
-  "name": "Security Gadget",
-  "description": "Raise the alarm when your brick is lifted!",
-  "url":"/maker/security-gadget",
-  "cardType": "example",
-  "imageUrl": "/static/maker/security-gadget.png"
-},
-{
-  "name": "Intruder Detector",
-  "description": "Raise the alarm when an intruder sneaks in",
-  "url":"/maker/intruder-detector",
-  "cardType": "example",
-  "imageUrl": "/static/maker/intruder-detector.png"
-},
-{
-  "name": "Puppet",
-  "description": "Build an automated puppet",
-  "url":"/maker/puppet",
-  "cardType": "example",
-  "imageUrl": "/static/maker/puppet.png"
+  "imageUrl": "/static/maker/sound-machine.png",
+  "cardType": "side"  
 }
 ]
 ```
--- a/docs/maker/puppet.md
+++ b/docs/maker/puppet.md
@ -3,13 +3,13 @@
 Use this program with the Programmable Brick and Large Motor.

 ```blocks
-loops.forever(function () {
-    motors.largeA.setSpeed(30)
-    loops.pause(100)
+forever(function () {
+    motors.largeA.run(30)
+    pause(100)
    motors.largeA.stop()
    music.playSoundEffectUntilDone(sounds.animalsCatPurr)
-    motors.largeA.setSpeed(-30)
-    loops.pause(100)
+    motors.largeA.run(-30)
+    pause(100)
    motors.largeA.stop()
 })
 ```
--- a/docs/maker/sound-machine.md
+++ b/docs/maker/sound-machine.md
@ -3,10 +3,10 @@
 This example program combined with the small model will make a beat and rhythm on any surface when the program is run.

 ```blocks
-loops.forever(function () {
-    motors.largeA.setSpeed(50)
-    loops.pause(200)
-    motors.largeA.setSpeed(100)
-    loops.pause(200)
+forever(function () {
+    motors.largeA.run(50)
+    pause(200)
+    motors.largeA.run(100)
+    pause(200)
 })
 ``` 
--- a/docs/reference.md
+++ b/docs/reference.md
@ -1,9 +1,16 @@
 # Reference

 ```namespaces
-brick.showMood(moods.sleeping);
 sensors.color(null);
-motors.stopAllMotors();
+motors.stopAll();
+brick.showMood(moods.sleeping);
+```
+
+## Advanced
+
+```namespaces
+console.log("");
+control.runInParallel(function(){});
 ```

 ## See Also
@ -11,5 +18,5 @@ motors.stopAllMotors();
 [brick](/reference/brick),
 [sensors](/reference/sensors),
 [motors](/reference/motors),
-[touch sensor](/reference/sensors/touch-sensor),
-[color sensor](/reference/sensors/color-sensor)
+[control](/reference/control),
+[console](/reference/console)
--- a/docs/reference/brick/battery-level.md
+++ b/docs/reference/brick/battery-level.md
@ -16,7 +16,7 @@ Show the battery level percentage on the screen. Also, show a green light if the

 ```blocks
 let battery = 0;
-loops.forever(function() {
+forever(function() {
    brick.showString("Battery level:", 1)
    brick.showNumber(battery, 2)
    battery = brick.batteryLevel();
@ -28,6 +28,6 @@ loops.forever(function() {
    } else {
        brick.setStatusLight(StatusLight.RedPulse)
    }
-    loops.pause(30000)
+    pause(30000)
 })
 ```
--- a/docs/reference/brick/button/is-pressed.md
+++ b/docs/reference/brick/button/is-pressed.md
@ -32,7 +32,7 @@ Set the brick light to green when the `down` is pressed. When the button is not

 ```blocks
 let isRed = false;
-loops.forever(function() {
+forever(function() {
    if (brick.buttonLeft.isPressed()) {
        brick.setStatusLight(StatusLight.Green);
        isRed = false;
--- a/docs/reference/brick/clear-screen.md
+++ b/docs/reference/brick/clear-screen.md
@ -16,7 +16,7 @@ brick.showString("self-destruct in:", 2);
 brick.showString("seconds", 5);
 for (let i = 0; i < 10; i++) {
    brick.showNumber(10 - i, 4);
-    loops.pause(1000);
+    pause(1000);
 }
 brick.clearScreen();
 ```
--- a/docs/reference/brick/set-status-light.md
+++ b/docs/reference/brick/set-status-light.md
@ -24,14 +24,14 @@ brick.setStatusLight(StatusLight.Red);
 Repeatedly show a different color pattern for the brick light.

 ```blocks
-loops.forever(function () {
+forever(function () {
    brick.setStatusLight(StatusLight.Orange)
-    loops.pause(1000)
+    pause(1000)
    brick.setStatusLight(StatusLight.GreenFlash)
-    loops.pause(2000)
+    pause(2000)
    brick.setStatusLight(StatusLight.RedPulse)
-    loops.pause(2000)
+    pause(2000)
    brick.setStatusLight(StatusLight.Off)
-    loops.pause(500)
+    pause(500)
 })
 ```
--- a/docs/reference/console.md
+++ b/docs/reference/console.md
@ -0,0 +1,15 @@
+# Console
+
+Output text and data values to the console.
+
+```cards
+console.log("");
+console.logValue("x", 0);
+console.sendToScreen();
+```
+
+## See also
+
+[log](/reference/console/log),
+[log value](/reference/console/log-value),
+[send to screen](/reference/console/send-to-screen)
--- a/docs/reference/console/send-to-screen.md
+++ b/docs/reference/console/send-to-screen.md
@ -0,0 +1,26 @@
+# send To Screen
+
+Direct the console output to go to the @boardname@ screen.
+
+```sig
+console.sendToScreen();
+```
+
+A "console" is a place for a user to see special messages from a device. It could be  something connected to a serial port, a display that shows text, or even a text file. A console is typically used as a place to send information that is added to a message _log_ (a record of messages that are sent from a device). Your program can send log messages using the [console](/reference/console) functions. The MakeCode editor has a console view that lets you see the console output when your program runs in the simulator.
+
+On the @boardname@, the screen can serve as a console too and you can make your console output go there. Before using the console log functions, set the screen as the console output location.
+
+## Example
+
+Direct the console output to go to the screen. Show 20 values on the screen. Use the up and down buttons to scroll through the values.
+
+```blocks
+console.sendToScreen()
+for (let index = 0; index <= 20; index++) {
+    console.logValue("index", index)
+}
+```
+
+## See also
+
+[log](reference/console/log), [log value](/reference/console/log-value)
--- a/docs/reference/control.md
+++ b/docs/reference/control.md
@ -0,0 +1,33 @@
+# Control
+
+Program controls and events.
+
+```cards
+control.millis();
+control.runInParallel(() => {
+    
+});
+control.reset();
+control.waitMicros(4);
+control.deviceSerialNumber();
+```
+
+## Timer
+
+```cards
+control.timer1.reset()
+control.timer1.pauseUntil(5)
+control.timer1.millis()
+control.timer1.seconds()
+```
+
+## Advanced #advanced
+
+```cards
+control.raiseEvent(0, 0);
+control.onEvent(0, 0, () => {
+    
+});
+control.assert(false, 0);
+control.panic(0);
+```
--- a/docs/reference/control/timer.md
+++ b/docs/reference/control/timer.md
@ -0,0 +1,8 @@
+# Timer
+
+```cards
+control.timer1.reset()
+control.timer1.pauseUntil(5)
+control.timer1.millis()
+control.timer1.seconds()
+```
--- a/docs/reference/control/timer/millis.md
+++ b/docs/reference/control/timer/millis.md
@ -0,0 +1,25 @@
+# millis
+
+Get the amount of time counted by the timer in milliseconds.
+
+The timer count begins from `0` when you program starts or is [reset](/reference/control/timer/reset). 
+
+## Returns
+
+* a [number](/types/number) that is the amount of time elapsed, in milliseconds, since the timer was started or reset.
+
+## Example
+
+Find out how many milliseconds go by between presses of the `down` button on the brick.
+
+```blocks
+brick.buttonDown.onEvent(ButtonEvent.Pressed, function () {
+    brick.showValue("DownButtonTime", control.timer1.millis(), 1)
+    control.timer1.reset()
+})
+```
+
+## See also
+
+[seconds](/reference/control/timer/seconds), [reset](/reference/control/timer/reset)
+
--- a/docs/reference/control/timer/pause-until.md
+++ b/docs/reference/control/timer/pause-until.md
@ -0,0 +1,32 @@
+# pauseUntil
+
+Pause until the timer counts up to a number of milliseconds.
+
+```sig
+control.timer1.pauseUntil(0)
+```
+
+When code in a block comes to a **pauseUntil**, it will wait until the timer count reaches the number of milliseconds you say. Code in blocks like **forever** and **runInParallel** will keep running while the current code is paused.
+
+The time number you give is the number of milliseconds past the running timer count. If the timer is currently at `25000` milliseconds and you want to pause for `10` seconds, then use a pause time of `35000`. If you want your pause time number to match the actual wait time, then [reset](/reference/control/timer/reset) the timer first.
+
+## Parameters
+
+* **ms**: the [number](/types/number) of milliseconds that you want the timer to count up to. For seconds, convert to milliseconds: 100 milliseconds = 1/10 second and 1000 milliseconds = 1 second.
+
+## Example
+
+Pause between messages on the screen by `5` seconds.
+
+```blocks
+brick.clearScreen()
+brick.showString("Testing my pause...", 1)
+let startTime = control.timer1.millis()
+brick.showValue("StartTime", startTime, 3)
+control.timer1.pauseUntil(startTime + 5000)
+brick.showValue("EndTime", control.timer1.millis() - startTime, 4)
+```
+
+## See also
+
+[millis](/reference/control/timer/millis), [reset](/reference/control/timer/reset)
--- a/docs/reference/control/timer/reset.md
+++ b/docs/reference/control/timer/reset.md
@ -0,0 +1,49 @@
+# reset
+
+Reset the elapsed time of the timer back to `0`.
+
+```sig
+control.timer1.reset()
+```
+
+A timer starts counting from `0` when your program starts. It's time value always gets larger as your program runs. Maybe you want to meausure how long some task takes to finish or you want to do some action  only for a little while. A timer can keep track of the time it takes to do it.
+
+Resetting the timer sets the time value to `0` so the next time you check the time it's exactly the amount of time that has _elapsed_. Otherwise, you need to remember a start time value and then subtract it from the current time. 
+
+## Examples
+
+### Press time
+
+Find out how much time goes by between presses of the `enter` button on the brick.
+
+```blocks
+brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
+    brick.showValue("PressTime", control.timer1.seconds(), 1)
+    control.timer1.reset()
+})
+```
+
+### Difference timer
+
+Use a difference timer and compare it to a timer that resets. Use the ``left`` button to start timing and the ``right`` button to stop.
+
+```blocks
+let startTime = 0
+let timing = false
+brick.buttonLeft.onEvent(ButtonEvent.Pressed, function () {
+    brick.clearScreen()
+    brick.showString("Starting timers...", 1)
+    startTime = control.timer1.seconds()
+    control.timer2.reset()
+    timing = true
+})
+brick.buttonRight.onEvent(ButtonEvent.Pressed, function () {
+    if (timing) {
+        brick.clearScreen()
+        brick.showString("Timer results...", 1)
+        brick.showValue("timer 1", control.timer1.seconds() - startTime, 3)
+        brick.showValue("timer 2", control.timer2.seconds(), 4)
+        timing = false;
+    }
+})
+```
--- a/docs/reference/control/timer/seconds.md
+++ b/docs/reference/control/timer/seconds.md
@ -0,0 +1,25 @@
+# seconds
+
+Get the amount of time counted by the timer in seconds.
+
+The timer count begins from `0` when you program starts or is [reset](/reference/control/timer/reset). The number of seconds returned also includes milliseconds if there is a fractional part of a second too.
+
+## Returns
+
+* a [number](/types/number) that is the amount of time elapsed, in seconds, since the timer was started or reset.
+
+## Example
+
+Find out how many seconds go by between presses of the `down` button on the brick.
+
+```blocks
+brick.buttonDown.onEvent(ButtonEvent.Pressed, function () {
+    brick.showValue("DownButtonTime", control.timer1.seconds(), 1)
+    control.timer1.reset()
+})
+```
+
+## See also
+
+[millis](/reference/control/timer/millis), [reset](/reference/control/timer/reset)
+
--- a/docs/reference/motors.md
+++ b/docs/reference/motors.md
@ -3,7 +3,7 @@
 ## Motion

 ```cards
-motors.largeA.setSpeed(50)
+motors.largeA.run(50)
 motors.largeAB.tank(50, 50)
 motors.largeAB.steer(0, 50)
 motors.largeA.pauseUntilReady()
@ -12,7 +12,7 @@ motors.largeA.setInverted(true)
 motors.largeA.setRegulated(false)
 motors.largeA.stop()
 motors.largeA.reset()
-motors.stopAllMotors()
+motors.stopAll()
 ```
 ## Counters

--- a/docs/reference/motors/motor/angle.md
+++ b/docs/reference/motors/motor/angle.md
@ -19,8 +19,8 @@ Reset the motor connected to port **A** and run it for for 2 seconds at a speed
 ```blocks
 let motorAngle = 0;
 motors.largeA.reset()
-motors.largeA.setSpeed(45)
-loops.pause(2000)
+motors.largeA.run(45)
+pause(2000)
 motors.largeA.stop()
 motorAngle = motors.largeA.angle()
 ```
--- a/docs/reference/motors/motor/clear-counts.md
+++ b/docs/reference/motors/motor/clear-counts.md
@ -15,12 +15,12 @@ See if the motor turns the same number of times for each of two count periods. R
 ```blocks
 let tachoCount = 0;
 motors.largeA.reset()
-motors.largeA.setSpeed(50)
-loops.pause(10000)
+motors.largeA.run(50)
+pause(10000)
 tachoCount = motors.largeA.tacho()
 motors.largeA.clearCounts()
-motors.largeA.setSpeed(50)
-loops.pause(10000)
+motors.largeA.run(50)
+pause(10000)
 if (tachoCount == motors.largeA.tacho()) {
    brick.showString("Motor turns equal.", 1)
 } else {
--- a/docs/reference/motors/motor/reset.md
+++ b/docs/reference/motors/motor/reset.md
@ -13,13 +13,13 @@ The motor's speed is set back to `0` and the **tacho**, **angle**, and **speed**
 See what the angle count is when a motor is stopped. Then, try it again after a reset.

 ```blocks
-motors.largeA.setSpeed(30)
-loops.pause(2000)
+motors.largeA.run(30)
+pause(2000)
 motors.largeA.stop()
 brick.showString("Angle count:", 1)
 brick.showNumber(motors.largeA.angle(), 2)
-motors.largeA.setSpeed(30)
-loops.pause(2000)
+motors.largeA.run(30)
+pause(2000)
 motors.largeA.reset()
 brick.showString("Angle count:", 4)
 brick.showNumber(motors.largeA.angle(), 5)
--- a/docs/reference/motors/motor/set-speed.md
+++ b/docs/reference/motors/motor/set-speed.md
@ -1,9 +1,9 @@
-# set Speed
+# run

 Set the rotation speed of the motor as a percentage of maximum speed.

 ```sig
-motors.largeA.setSpeed(50)
+motors.largeA.run(50)
 ```

 The speed setting is a pecentage of the motor's full speed. Full speed is the speed that the motor runs when the brick supplies maximum output voltage to the port.
@ -19,28 +19,28 @@ If you use a number of milliseconds as movement units, then you don't need to in
 To run the motor for 500 milliseconds:

 ```block
-motors.largeA.setSpeed(50, 500)
+motors.largeA.run(50, 500)
 ```

 ## ~

 Here is how you use each different movement unit to run the motor for a fixed rotation distance.

-```typescript
+```blocks
 // Run motor for 700 Milliseconds. 
-motors.largeA.setSpeed(25, 700, MoveUnit.MilliSeconds);
+motors.largeA.run(25, 700, MoveUnit.MilliSeconds);

 // Run motor for 700 Milliseconds again but no units specified. 
-motors.largeA.setSpeed(25, 700);
+motors.largeA.run(25, 700);

 // Run the motor for 45 seconds
-motors.largeA.setSpeed(50, 45, MoveUnit.Seconds);
+motors.largeA.run(50, 45, MoveUnit.Seconds);

 // Turn the motor for 270 degrees
-motors.largeA.setSpeed(50, 270, MoveUnit.Degrees)
+motors.largeA.run(50, 270, MoveUnit.Degrees)

 // Turn the motor at full speed for 9 full rotations
-motors.largeA.setSpeed(100, 9, MoveUnit.Rotations);
+motors.largeA.run(100, 9, MoveUnit.Rotations);
 ```

 ## Parameters
@ -56,7 +56,7 @@ motors.largeA.setSpeed(100, 9, MoveUnit.Rotations);
 Turning the motor in the opposite direction (reverse) is simple. Reverse is just a negative speed setting. To drive the motor in reverse at 25% speed:

 ```block
-motors.largeB.setSpeed(-25)
+motors.largeB.run(-25)
 ```

 ## ~
@ -68,8 +68,8 @@ motors.largeB.setSpeed(-25)
 Run the motor connected to port **A** continuously. Pause 20 seconds and then stop the motor.

 ```blocks
-motors.largeA.setSpeed(75)
-loops.pause(20000)
+motors.largeA.run(75)
+pause(20000)
 motors.largeA.stop()
 ```

@ -78,8 +78,8 @@ motors.largeA.stop()
 Run the motor connected to port **A** in reverse. Pause 5 seconds and then stop the motor.

 ```blocks
-motors.largeA.setSpeed(-60)
-loops.pause(5000)
+motors.largeA.run(-60)
+pause(5000)
 motors.largeA.stop()
 ```

@ -88,7 +88,7 @@ motors.largeA.stop()
 Run the motor connected to port **B** for 35 full rotations and then stop.

 ```blocks
-motors.largeB.setSpeed(50, 35, MoveUnit.Rotations)
+motors.largeB.run(50, 35, MoveUnit.Rotations)
 ```

 ## See also
--- a/docs/reference/motors/motor/set-brake.md
+++ b/docs/reference/motors/motor/set-brake.md
@ -19,8 +19,8 @@ Also, you can use the brake to do simple skid steering for your brick.
 Run the motor connected to port **A** for 2 seconds at a speed of `30`. Stop and set the brake.

 ```blocks
-motors.largeA.setSpeed(30)
-loops.pause(2000)
+motors.largeA.run(30)
+pause(2000)
 motors.largeA.stop()
 motors.largeA.setBrake(true)
 ```
--- a/docs/reference/motors/motor/set-inverted.md
+++ b/docs/reference/motors/motor/set-inverted.md
@ -17,13 +17,13 @@ You use a positive value (some number greater than `0`) to drive you motor in th
 Run the motor connected to port **A** for 2 seconds at a speed of `30`. Stop and switch the direciton of rotation. Run the motor at a speed of `-30`. Watch and see if the motor turns in the same direction as before.

 ```blocks
-motors.largeA.setSpeed(30)
-loops.pause(2000)
+motors.largeA.run(30)
+pause(2000)
 motors.largeA.stop()
-loops.pause(2000)
+pause(2000)
 motors.largeA.setInverted(true)
-motors.largeA.setSpeed(-30)
-loops.pause(2000)
+motors.largeA.run(-30)
+pause(2000)
 motors.largeA.stop()
 ```

--- a/docs/reference/motors/motor/set-regulated.md
+++ b/docs/reference/motors/motor/set-regulated.md
@ -22,11 +22,11 @@ Turn off the speed regulation for the motor connected to port **A**.

 ```blocks
 motors.largeA.setRegulated(false)
-motors.largeA.setSpeed(75)
-loops.pause(20000)
+motors.largeA.run(75)
+pause(20000)
 motors.largeA.stop()
 ```

 ## See also

-[set speed](/reference/motors/motor/set-speed), [stop](/reference/motors/motor/stop)
+[run](/reference/motors/motor/run), [stop](/reference/motors/motor/stop)
--- a/docs/reference/motors/motor/speed.md
+++ b/docs/reference/motors/motor/speed.md
@ -6,7 +6,7 @@ Get the current speed of motor rotation as a percentage of maximum speed.
 motors.largeA.speed()
 ```

-The actual speed of the motor is the same or very close to it's current speed setting when the motor is regulated. If not regulated, the actual speed can change from the set speed when a force, or load, is applied to it.
+The actual speed of the motor is the same or very close to it's current speed setting when the motor is regulated. If not regulated, the actual speed can change from the speed you told it to run at (your desired or _set point_ speed) when a force, or load, is applied to it.

 ## Returns

@ -18,10 +18,10 @@ Turn speed regulation off and report the actual speed of the large motor in the

 ```blocks
 motors.largeA.setRegulated(false)
-motors.largeA.setSpeed(55)
+motors.largeA.run(55)
 brick.showString("Actual speed:", 1)
 for (let i = 0; i < 30; i++) {
-    loops.pause(500)
+    pause(500)
    brick.showNumber(motors.largeA.speed(), 3)
 }
 motors.largeA.stop()
--- a/docs/reference/motors/motor/stop.md
+++ b/docs/reference/motors/motor/stop.md
@ -13,11 +13,11 @@ The motor stops but any motion caused from previously running the motor continue
 Run the motor connected to port **A** for 2 seconds at a speed of `30`. Stop and wait for 2 seconds, then continue at a speed of `50`.

 ```blocks
-motors.largeA.setSpeed(30)
-loops.pause(2000)
+motors.largeA.run(30)
+pause(2000)
 motors.largeA.stop()
-loops.pause(2000)
-motors.largeA.setSpeed(50)
+pause(2000)
+motors.largeA.run(50)
 ```

 ## See also
--- a/docs/reference/motors/motor/tacho.md
+++ b/docs/reference/motors/motor/tacho.md
@ -33,12 +33,12 @@ A standard way to know how fast a motor is turning is by measuring its _revoluti
 Run the motor connected to port **A** at half speed for 5 seconds. Display the number of full rotations on the screen.

 ```blocks
-motors.largeA.setSpeed(50)
-loops.pause(5000)
+motors.largeA.run(50)
+pause(5000)
 motors.largeA.stop()
 brick.showString("Motor rotations:", 1)
 brick.showNumber(motors.largeA.tacho() / 360, 3)
-motors.largeA.setSpeed(50)
+motors.largeA.run(50)
 ```

 ## See also
--- a/docs/reference/motors/stop-all-motors.md
+++ b/docs/reference/motors/stop-all-motors.md
@ -3,7 +3,7 @@
 Stops all motors currently running on the brick.

 ```sig
-motors.stopAllMotors();
+motors.stopAll();
 ```

 The motors stops but any motion caused from previously running the motors continues until it runs down. If you are driving your brick and then stop the motors, it will coast for awhile before stopping. 
@ -14,8 +14,8 @@ Tank the @boardname@ forward at half speed for 5 seconds and then stop.

 ```blocks
 motors.largeAB.tank(50, 50);
-loops.pause(5000);
-motors.stopAllMotors();
+pause(5000);
+motors.stopAll();
 ```

 ## See also
--- a/docs/reference/motors/synced/steer.md
+++ b/docs/reference/motors/synced/steer.md
@ -18,7 +18,7 @@ The speed setting is a pecentage of the motor's full speed. Full speed is the sp

 If you use just the **speed** number, the motors run continously and won't stop unless you tell them to. You can also give a value for a certain amount of distance you want the motors to rotate for. The **value** can be an amount of time, a turn angle in degrees, or a number of full rotations.

-If you decide to use a **value** of rotation distance, you need to choose a type of movement **unit**. Also, if you use a number of milliseconds as movement units, then you don't need to include the unit type. The description in [set speed](/reference/motors/motor/set-speed) shows how to use different movement units.
+If you decide to use a **value** of rotation distance, you need to choose a type of movement **unit**. Also, if you use a number of milliseconds as movement units, then you don't need to include the unit type. The description in [run](/reference/motors/motor/run) shows how to use different movement units.

 ## Parameters

@ -72,13 +72,13 @@ Steer the brick in a snake pattern for a short time.
 ```block
 for (let i = 0; i < 4; i++) {
    motors.largeBC.steer(30, 30)
-    loops.pause(5000)
+    pause(5000)
    motors.largeBC.steer(-30, 30)
-    loops.pause(5000)
+    pause(5000)
 }
-motors.stopAllMotors()
+motors.stopAll()
 ```

 ## See also

-[tank](/reference/motors/synced/tank), [set speed](/reference/motors/motor/set-speed)
+[tank](/reference/motors/synced/tank), [run](/reference/motors/motor/run)
--- a/docs/reference/motors/synced/tank.md
+++ b/docs/reference/motors/synced/tank.md
@ -14,7 +14,7 @@ The speed setting is a pecentage of the motor's full speed. Full speed is the sp

 If you use just the **speed** number, the motors run continously and won't stop unless you tell them to. You can also give a value for a certain amount of distance you want the motors to rotate for. The **value** can be an amount of time, a turn angle in degrees, or a number of full rotations.

-If you decide to use a **value** of rotation distance, you need to choose a type of movement **unit**. Also, if you use a number of milliseconds as movement units, then you don't need to include the unit type. The description in [set speed](/reference/motors/motor/set-speed) shows how to use different movement units.
+If you decide to use a **value** of rotation distance, you need to choose a type of movement **unit**. Also, if you use a number of milliseconds as movement units, then you don't need to include the unit type. The description in [run](/reference/motors/motor/run) shows how to use different movement units.

 ## Parameters

@ -43,10 +43,10 @@ Move the brick straight ahead and then go backward.

 ```blocks
 motors.largeAB.tank(75, 75)
-loops.pause(10000)
+pause(10000)
 motors.largeAB.tank(-55, -55)
-loops.pause(10000)
-motors.stopAllMotors()
+pause(10000)
+motors.stopAll()
 ```

 ### Slip steer
@ -72,10 +72,10 @@ Run both motors in opposite directions to spin the brick around to the left.

 ```blocks
 motors.largeAB.tank(-30, 30)
-loops.pause(5000)
-motors.stopAllMotors()
+pause(5000)
+motors.stopAll()
 ```

 ## See also

-[steer](/reference/motors/synced/steer), [set speed](/reference/motors/motor/set-speed)
+[steer](/reference/motors/synced/steer), [run](/reference/motors/motor/run)
--- a/docs/reference/sensors.md
+++ b/docs/reference/sensors.md
@ -1,5 +1,17 @@
 # Sensors

+# Color
+
+```cards
+sensors.color1.onColorDetected(ColorSensorColor.Blue, function () {})
+sensors.color1.onLightChanged(LightIntensityMode.Reflected, LightCondition.Dark, function () {})
+sensors.color1.pauseForLight(LightIntensityMode.Reflected, LightCondition.Dark)
+sensors.color1.pauseForColor(ColorSensorColor.Blue)
+sensors.color1.color();
+sensors.color1.light(LightIntensityMode.Ambient)
+sensors.color(ColorSensorColor.Blue)
+```
+
 ## Touch

 ```cards
@ -24,3 +36,22 @@ sensors.ultrasonic4.onEvent(UltrasonicSensorEvent.ObjectDetected, function () {}
 sensors.ultrasonic1.distance();
 sensors.ultrasonic1.pauseUntil(UltrasonicSensorEvent.ObjectDetected);
 ```
+
+## Infrared
+
+```cards
+sensors.infrared1.onEvent(null, function () {});
+sensors.infrared1.pauseUntil(null);
+sensors.infrared1.proximity();
+
+```
+
+## Infrared beacon button
+
+```cards
+sensors.remoteButtonCenter.onEvent(ButtonEvent.Pressed, function () {})
+sensors.remoteButtonCenter.pauseUntil(ButtonEvent.Pressed);
+sensors.remoteButtonCenter.isPressed()
+sensors.remoteButtonCenter.wasPressed()
+sensors.infrared1.setRemoteChannel(null)
+```
--- a/docs/static/avatar.svg
+++ b/docs/static/avatar.svg
@ -5,105 +5,53 @@
 	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 32 32"
 	 style="enable-background:new 0 0 32 32;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#303030;}
+	.st0{fill:#DE0612;}
+	.st1{fill:#FFFFFF;stroke:#FFFFFF;stroke-width:0.4;stroke-miterlimit:10;}
 </style>
 <sodipodi:namedview  bordercolor="#666666" borderopacity="1" gridtolerance="10" guidetolerance="10" id="namedview15" inkscape:current-layer="svg2" inkscape:cx="16" inkscape:cy="16" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-height="661" inkscape:window-maximized="0" inkscape:window-width="997" inkscape:window-x="0" inkscape:window-y="0" inkscape:zoom="5.2149125" objecttolerance="10" pagecolor="#ffffff" showgrid="false">
 	</sodipodi:namedview>
-<g id="avatar_mf" transform="translate(-5304.979 8145.745)">
-	<path id="Path_180" class="st0" d="M5317.1-8125.6c0.2,0,0.3-0.1,0.5-0.1l2.9-0.6c1.3-0.3,2.5-0.5,3.8-0.8c0.5-0.1,1-0.2,1.5-0.3
-		c0.1,0,0.1,0,0.1-0.1c0-0.5,0-1-0.1-1.5c-0.1-0.6-0.2-1.1-0.3-1.7c-0.1-0.4-0.1-0.8-0.2-1.2c-0.1-0.7-0.2-1.4-0.3-2
-		c-0.1-0.6-0.2-1.1-0.3-1.7c0-0.2-0.2-0.4-0.4-0.4c0,0,0,0-0.1,0c-0.2,0-0.5,0.1-0.7,0.1c-0.5,0.1-1,0.1-1.5,0.2
-		c-0.5,0.1-1,0.1-1.6,0.2c-0.5,0.1-1,0.1-1.4,0.2c-0.2,0-0.3,0-0.5,0.1c-0.2,0-0.4,0.2-0.5,0.4c0,0.2-0.1,0.4-0.1,0.5
-		c0,0.4-0.1,0.8-0.1,1.2c-0.1,0.5-0.1,1-0.2,1.5c0,0.4-0.1,0.9-0.1,1.3l-0.1,1.3l-0.1,1.3c-0.1,0.5-0.1,1-0.2,1.5
-		C5317.1-8126,5317.1-8125.8,5317.1-8125.6z"/>
-	<path id="Path_181" class="st0" d="M5316.1-8140c0,0.6,0.1,1.2,0.1,1.8c0,0.4,0.2,0.8,0.6,1c0.3,0.2,0.7,0.3,1.1,0.3
-		c0.7,0.1,1.4,0.1,2.1,0c0.6,0,1.2-0.1,1.8-0.2c0.4,0,0.9-0.2,1.2-0.5c0.3-0.3,0.5-0.7,0.5-1.1c0-1.2,0-2.3-0.1-3.5
-		c0-0.3-0.1-0.6-0.3-0.8c-0.3-0.4-0.8-0.6-1.4-0.6c0,0,0,0-0.1,0c-0.2,0.1-0.4,0.1-0.6,0.1c-0.9,0-1.8,0.1-2.7,0.1
-		c-0.1,0-0.3,0-0.4,0c-0.4-0.1-0.8,0-1.2,0.2c-0.4,0.2-0.6,0.6-0.7,1c0,0.1,0,0.2,0,0.3C5316-8141.2,5316.1-8140.6,5316.1-8140
-		L5316.1-8140z"/>
-	<path id="Path_182" class="st0" d="M5312-8129.2c0,0.6,0,1.2,0,1.8c0,0.1,0,0.1,0.1,0.1c0.3,0,0.6,0.1,0.9,0.1c0.3,0,0.7,0,1,0
-		c0.1,0,0.2,0,0.3,0c0.1,0,0.1,0,0.1-0.1c0.1-0.4,0.2-0.8,0.2-1.2c0.1-0.5,0.2-1,0.3-1.4c0-0.1,0.1-0.1,0.1-0.1
-		c0.4-0.2,0.8-0.5,1.2-0.8c0.4-0.4,0.7-0.9,0.8-1.5c0.1-0.6,0-1.2-0.4-1.7c-0.2-0.3-0.6-0.4-0.9-0.3c-0.3,0.1-0.6,0.3-0.9,0.5
-		c-0.7,0.6-1.5,1.2-2.2,1.8c-0.3,0.2-0.5,0.5-0.6,0.8c0,0.2-0.1,0.4-0.1,0.6C5311.9-8130.2,5311.9-8129.7,5312-8129.2
-		C5311.9-8129.2,5312-8129.2,5312-8129.2z"/>
-	<path id="Path_183" class="st0" d="M5315.5-8124.7c0,0.2-0.1,0.5-0.1,0.7c-0.1,0.5-0.4,0.9-0.8,1.1c0,0,0,0,0,0
-		c-0.1,0-0.2,0.2-0.2,0.3c-0.4,1.4-0.9,2.7-1.3,4.1c0,0,0,0.1,0,0.1c0.8,1.1,1.6,2.2,2.4,3.3c0,0,0,0,0.1,0.1
-		c0.1-0.2,0.1-0.3,0.2-0.5c0.1-0.3,0.2-0.5,0.3-0.8c0,0,0-0.1,0-0.1c-0.2-0.3-0.5-0.7-0.7-1c0,0,0-0.1,0-0.2
-		c0.3-0.9,0.6-1.7,0.9-2.6c0,0,0-0.1,0.1-0.1c0.5-0.2,0.9-0.6,1.1-1.1c0.1-0.3,0.1-0.7,0.1-1.1c0-0.4-0.1-0.8-0.3-1.2
-		c-0.2-0.4-0.5-0.8-1-1C5315.9-8124.7,5315.7-8124.7,5315.5-8124.7z"/>
-	<path id="Path_184" class="st0" d="M5314.7-8134.2c0.1-0.1,0.2-0.1,0.3-0.2c0.3-0.2,0.7-0.3,1-0.3c0.4,0,0.7,0.2,0.8,0.6
-		c0.6,1.1,0.5,2.4-0.4,3.3c-0.4,0.4-0.8,0.7-1.3,1c0,0-0.1,0.1-0.1,0.1c-0.2,0.8-0.3,1.6-0.5,2.5c0,0,0,0.1,0,0.1
-		c0,0.2,0,0.2-0.2,0.2c-0.1,0-0.1,0-0.2,0c0,0.1,0,0.2,0,0.3c0,0,0,0,0.1,0.1l1.9,0.7c0.2,0.1,0.4,0.2,0.7,0.2c0-0.1,0-0.2,0-0.2
-		c0-0.3,0-0.6,0-0.8l0.2-1.5l0.2-1.5c0.1-0.5,0.1-1,0.2-1.5c0.1-0.5,0.1-1.1,0.2-1.6c0.1-0.5,0.1-1,0.2-1.5c0-0.2,0-0.4,0-0.6
-		c0-0.2-0.1-0.4-0.3-0.4c0,0,0,0,0,0c-0.1,0-0.1,0-0.2,0c-0.6-0.1-1.2-0.2-1.9-0.3c-0.1,0-0.2,0-0.3,0c-0.1,0-0.2,0.1-0.3,0.3
-		C5314.8-8135,5314.7-8134.6,5314.7-8134.2z"/>
-	<path id="Path_185" class="st0" d="M5324.5-8117.2c-0.2-0.7-0.5-1.3-0.7-2l-0.7,0.3c0,0-0.1,0-0.1,0c-0.1,0.1-0.2,0-0.2-0.1
-		c-0.1-0.3-0.2-0.5-0.3-0.8c-0.2-0.7-0.5-1.4-0.7-2.1c0,0,0-0.1,0-0.1c0,0,0,0.1-0.1,0.1c-0.1,0.2-0.3,0.3-0.5,0.5c0,0-0.1,0-0.1,0
-		c-0.3,0.1-0.6,0.1-0.8,0.2c0,0-0.1,0-0.1,0c0,0.2-0.1,0.3-0.1,0.5c0.6,1.5,1.1,3.1,1.7,4.6c0,0,0,0,0,0.1
-		C5322.7-8116.3,5323.6-8116.7,5324.5-8117.2z"/>
-	<path id="Path_186" class="st0" d="M5325.4-8123.1c-0.7,0.2-1.3,0.3-2,0.5c-0.5,0.1-0.9,0.2-1.4,0.3c-0.1,0-0.2,0.1-0.1,0.2
-		c0,0,0,0,0,0.1c0.2,0.5,0.3,0.9,0.5,1.4c0.2,0.5,0.4,1.1,0.6,1.6c0,0,0,0,0,0c0.1-0.1,0.2-0.1,0.3-0.2c0.2-0.1,0.3-0.2,0.5-0.2
-		c0.2-0.1,0.4-0.1,0.6-0.2c0.7-0.2,1.5-0.4,2.2-0.6c0,0,0,0,0.1,0C5326.3-8121.1,5325.9-8122.1,5325.4-8123.1z"/>
-	<path id="Path_187" class="st0" d="M5320.7-8124.4c-0.4,0.1-0.8,0.2-1.2,0.3c-0.6,0.1-1.3,0.3-1.9,0.4c0,0-0.1,0-0.1,0
-		c-0.1,0-0.2-0.1-0.3-0.1c0,0,0,0.1,0,0.1c0.3,0.7,0.4,1.5,0.3,2.2c-0.1,0.4-0.3,0.8-0.5,1.1c0,0,0,0-0.1,0.1
-		c0.2-0.1,0.4-0.1,0.6-0.1l2.5-0.6c0.5-0.1,0.9-0.6,1-1.1c0.1-0.5,0-1-0.1-1.5C5320.8-8124,5320.8-8124.2,5320.7-8124.4z"/>
-	<path id="Path_188" class="st0" d="M5325.5-8127c-2.7,0.5-5.3,1.1-7.9,1.6c0,0.5,0,0.9,0.1,1.4c0.1,0,0.2,0,0.3-0.1
-		c1.2-0.3,2.3-0.5,3.5-0.8c1.2-0.3,2.4-0.5,3.6-0.8c0.1,0,0.3-0.1,0.4-0.1c0,0,0.1,0,0.1-0.1
-		C5325.6-8126.2,5325.5-8126.6,5325.5-8127z"/>
-	<path id="Path_189" class="st0" d="M5328.6-8118.4c-0.2-0.4-0.3-0.7-0.5-1.1c-0.1-0.2-0.2-0.5-0.3-0.7c0-0.1,0-0.1-0.1,0
-		c-1.2,0.3-2.4,0.6-3.6,1c0,0,0,0-0.1,0c0.2,0.7,0.5,1.3,0.7,2C5326-8117.6,5327.3-8118,5328.6-8118.4z"/>
-	<path id="Path_190" class="st0" d="M5319.9-8120.9l-0.6,0.1c-1,0.2-2,0.5-3,0.7c-0.1,0-0.1,0.1-0.1,0.1c-0.3,0.7-0.5,1.5-0.8,2.2
-		c0,0,0,0,0,0.1c0.2,0,0.4-0.1,0.5-0.1c1-0.3,2-0.5,3.1-0.8c0.1,0,0.2-0.1,0.3-0.2C5319.5-8119.5,5319.7-8120.2,5319.9-8120.9z"/>
-	<path id="Path_191" class="st0" d="M5325.1-8125.4c-1.1,0.2-2.2,0.5-3.3,0.7c0.3,0.7,0.4,1.4,0.3,2.2c0.2,0,0.4-0.1,0.5-0.1
-		c0.9-0.2,1.8-0.4,2.7-0.6c0.1,0,0.1,0,0.1-0.1c0.1-0.4,0-0.9-0.1-1.3C5325.3-8124.9,5325.2-8125.1,5325.1-8125.4
-		C5325.1-8125.3,5325.1-8125.4,5325.1-8125.4z"/>
-	<path id="Path_192" class="st0" d="M5325.6-8132c0.2,0,0.4,0,0.5,0c0.2,0,0.4,0,0.6,0c0.3,0,0.6-0.2,0.8-0.4c0.3-0.4,0.7-0.8,1-1.2
-		c-0.1-0.1-0.1-0.1-0.1-0.2c0,0,0,0-0.1,0c-0.7-0.1-1.3-0.5-1.4-1.2c-0.1-0.2-0.1-0.4-0.1-0.6c-0.2,0.1-0.3,0.3-0.5,0.4
-		c-0.1,0.1-0.2,0.1-0.3,0.2c0,0-0.1,0.1-0.2,0c-0.2,0-0.5-0.1-0.7-0.1c0,0,0,0-0.1,0C5325.3-8134.1,5325.4-8133.1,5325.6-8132z"/>
-	<path id="Path_193" class="st0" d="M5328.4-8134.2c0.2-0.3,0.5-0.5,0.8-0.7c0.4-0.4,0.6-0.8,0.7-1.4c0-0.1,0-0.2-0.1-0.3
-		c-0.3-0.5-0.7-1.1-1-1.6c0-0.1-0.1-0.1-0.1,0c-0.4,0.2-0.8,0.5-1.1,0.8c-0.2,0.2-0.4,0.4-0.6,0.6c-0.1,0.1-0.1,0.3,0,0.4
-		c0.5,0.7,1,1.5,1.4,2.2C5328.4-8134.2,5328.4-8134.2,5328.4-8134.2z"/>
-	<path id="Path_194" class="st0" d="M5314.3-8126.1c-0.1-0.1-0.1-0.1-0.2-0.2c-0.1,0-0.1-0.1-0.1-0.2c0-0.1,0-0.3,0-0.4h-0.1
-		c-0.6,0-1.2-0.1-1.7-0.2c0,0-0.1,0-0.1,0c-0.4,0.2-0.7,0.4-1,0.8c-0.4,0.6-0.4,1.4,0.1,1.9c0.2,0.2,0.4,0.4,0.6,0.6
-		c0.1,0.1,0.2,0.2,0.3,0.2c-0.2-0.6,0-1.3,0.5-1.8C5313-8125.9,5313.6-8126.2,5314.3-8126.1z"/>
-	<path id="Path_195" class="st0" d="M5315.7-8114.9c0.5-0.1,0.9-0.3,1.4-0.4c0.8-0.2,1.6-0.4,2.4-0.7c0.1,0,0.1,0,0.1-0.1
-		c0.1-0.4,0.2-0.7,0.4-1.1c0,0,0,0,0-0.1c-0.1,0-0.2,0-0.3,0.1c-1.2,0.3-2.3,0.6-3.5,1c-0.1,0-0.1,0.1-0.1,0.1
-		c-0.1,0.4-0.3,0.7-0.4,1.1C5315.7-8115,5315.7-8115,5315.7-8114.9z"/>
-	<path id="Path_196" class="st0" d="M5315.4-8117.4c0.2,0.3,0.4,0.6,0.6,0.9c0,0,0.1,0,0.1,0c1-0.3,1.9-0.5,2.9-0.8
-		c0.3-0.1,0.6-0.2,0.9-0.2c-0.1-0.1-0.1-0.2-0.2-0.2c-0.2-0.2-0.3-0.4-0.5-0.6c0,0-0.1-0.1-0.1,0c-0.9,0.3-1.9,0.5-2.8,0.8
-		C5316-8117.5,5315.7-8117.5,5315.4-8117.4z"/>
-	<path id="Path_197" class="st0" d="M5321.3-8143.6c0-0.3,0-0.7,0-1c0,0-0.1,0-0.1,0c-0.7,0-1.5,0-2.2,0.1c-0.4,0-0.7,0-1.1,0.1
-		c-0.1,0-0.1,0-0.1,0.1c0,0.3,0,0.6,0,0.8c0,0,0,0.1,0.1,0.1c0.4,0,0.8,0,1.1,0c0.5,0,1.1,0,1.6-0.1
-		C5320.9-8143.5,5321.1-8143.6,5321.3-8143.6z"/>
-	<path id="Path_198" class="st0" d="M5329.2-8134.3c0.1,0,0.2,0,0.2-0.1c0.4-0.2,0.8-0.4,1.1-0.7c0.3-0.2,0.4-0.5,0.6-0.8
-		c0.1-0.3,0.1-0.6-0.1-0.9c-0.4-0.5-0.7-1-1.1-1.6c0,0,0,0-0.1-0.1c-0.2,0.2-0.4,0.4-0.6,0.6c0,0,0,0,0,0c0,0,0,0.1,0,0.1
-		c0.2,0.4,0.5,0.7,0.7,1c0.1,0.2,0.2,0.4,0.1,0.6c0,0.5-0.1,0.9-0.4,1.3c-0.1,0.1-0.2,0.2-0.3,0.3
-		C5329.4-8134.5,5329.3-8134.4,5329.2-8134.3C5329.2-8134.3,5329.2-8134.3,5329.2-8134.3z"/>
-	<path id="Path_199" class="st0" d="M5317.5-8136.7c0,0.2,0,0.3,0,0.5c0,0,0,0.1,0.1,0.1c0.2,0,0.3,0.1,0.5,0.1c0.7,0.1,1.4,0.1,2,0
-		c0.4,0,0.8-0.1,1.2-0.1c0.2,0,0.5-0.1,0.7-0.1c0.1,0,0.1,0,0.1-0.1c0-0.2,0-0.3,0-0.5C5320.5-8136.6,5319-8136.5,5317.5-8136.7z"/>
-	<path id="Path_200" class="st0" d="M5312.5-8123.2c0.1-0.4,0.1-0.8,0.2-1.2c0.1-0.6,0.6-1,1.2-1c0.3,0,0.5,0.1,0.7,0.3
-		c0.2,0.2,0.2,0.4,0.2,0.7c-0.1,0.3-0.2,0.6-0.2,0.9c0,0.1-0.1,0.2-0.1,0.4c0,0,0,0,0,0c0.1-0.1,0.2-0.2,0.3-0.3
-		c0.3-0.4,0.4-0.9,0.4-1.4c0-0.6-0.4-1-0.9-1.1c-0.1,0-0.1,0-0.2,0c-0.5,0-1,0.3-1.4,0.7c-0.3,0.3-0.4,0.6-0.5,1
-		c-0.1,0.3,0,0.7,0.2,1C5312.5-8123.2,5312.5-8123.2,5312.5-8123.2z"/>
-	<path id="Path_201" class="st0" d="M5314.3-8123.2c0.1-0.5,0.3-0.9,0.4-1.4c0.1-0.2,0-0.4-0.2-0.5c-0.4-0.2-0.9-0.1-1.2,0.2
-		c0,0,0,0,0,0.1c0,0.2,0,0.4,0.1,0.6c0,0.1,0.1,0.2,0.2,0.3C5313.7-8123.6,5314-8123.4,5314.3-8123.2
-		C5314.2-8123.2,5314.3-8123.2,5314.3-8123.2z"/>
-	<path id="Path_202" class="st0" d="M5317.4-8124.1c0-0.4,0-0.9-0.1-1.3c-0.1,0-0.1,0-0.2,0c-0.1,0-0.2,0-0.3,0
-		c-0.7-0.3-1.4-0.5-2.1-0.8c0,0,0,0,0,0c0.1,0.1,0.1,0.1,0.2,0.2c0.3,0.2,0.5,0.6,0.6,0.9c0,0,0,0,0,0c0.1,0,0.3,0,0.4,0.1
-		c0.3,0.1,0.6,0.3,0.9,0.5c0,0,0.1,0.1,0.1,0.1C5317.1-8124.2,5317.2-8124.1,5317.4-8124.1z"/>
-	<path id="Path_203" class="st0" d="M5321.6-8124.6c-0.2,0-0.4,0.1-0.6,0.1c0.1,0.2,0.1,0.4,0.2,0.6c0.1,0.4,0.2,0.8,0.1,1.2
-		c0,0.5-0.1,0.9-0.4,1.3c0,0,0,0,0,0c0.3,0,0.6-0.2,0.7-0.5c0.2-0.3,0.3-0.6,0.3-0.9C5321.9-8123.4,5321.8-8124,5321.6-8124.6z"/>
-	<path id="Path_204" class="st0" d="M5315.7-8135.8c0.2,0,0.3,0.1,0.5,0.1c0.5,0.1,1,0.2,1.5,0.2c0.2,0,0.5,0,0.7,0
-		c0.7-0.1,1.4-0.2,2.1-0.2c0.6-0.1,1.2-0.2,1.8-0.2c0.5-0.1,1.1-0.1,1.6-0.2l-1.5-0.2c0,0,0,0,0,0c0,0.2-0.1,0.3-0.2,0.3
-		c0,0,0,0,0,0c-0.3,0.1-0.5,0.1-0.8,0.2c-0.8,0.1-1.6,0.1-2.3,0.1c-0.4,0-0.9,0-1.3-0.1c-0.1,0-0.2-0.1-0.3-0.2c0,0-0.1,0-0.1,0
-		c-0.3,0-0.6,0.1-0.9,0.1L5315.7-8135.8L5315.7-8135.8z"/>
-	<path id="Path_205" class="st0" d="M5327.3-8117.7c-0.3,0.1-0.5,0.2-0.8,0.2c-0.6,0.2-1.1,0.3-1.7,0.5c0,0-0.1,0-0.1,0.1
-		c-0.5,0.2-1,0.5-1.5,0.7c0,0,0,0,0,0c0.3-0.1,0.5-0.1,0.8-0.2c0.5-0.2,1.1-0.3,1.6-0.5c0.1,0,0.2-0.1,0.2-0.1
-		C5326.2-8117.2,5326.8-8117.5,5327.3-8117.7C5327.3-8117.7,5327.3-8117.7,5327.3-8117.7C5327.3-8117.7,5327.3-8117.7,5327.3-8117.7
-		z"/>
-	<path id="Path_206" class="st0" d="M5327-8135.8c0,0.1,0,0.2,0,0.4c0.1,0.5,0.3,0.9,0.7,1.1c0.1,0.1,0.3,0.1,0.4,0.2l0,0
-		C5327.8-8134.7,5327.4-8135.2,5327-8135.8L5327-8135.8z"/>
-	<path id="Path_207" class="st0" d="M5329-8134.4c-0.1,0.1-0.2,0.2-0.3,0.4c0,0,0,0,0,0.1c0,0.1,0,0.1,0.1,0.1c0.1,0,0.2,0,0.3-0.1
-		c0.1,0,0.2-0.1,0.3-0.1c-0.1,0-0.1-0.1-0.2-0.1C5329-8134.2,5329-8134.3,5329-8134.4z"/>
+<g>
+	<polygon class="st0" points="2,9.9 5.8,8.2 5.8,8 6.2,7.4 6.9,6.9 8,6.6 9.1,6.5 9.5,6.6 13.1,5 13.1,4.8 13.4,4.3 14,3.9 
+		14.9,3.6 16,3.5 17.1,3.6 18,3.9 18.6,4.3 18.9,4.8 18.9,5 22.4,6.6 23,6.6 24,6.7 25,7 25.8,7.5 26.2,8 26.2,8.3 29.9,10 
+		28.8,19.3 15.9,28.5 3.1,19.2 	"/>
+	<g>
+		<path class="st1" d="M15.9,28.6C15.9,28.6,15.9,28.6,15.9,28.6L15.9,28.6C15.9,28.6,15.9,28.6,15.9,28.6
+			C15.9,28.6,15.9,28.6,15.9,28.6L15.9,28.6C15.9,28.6,15.9,28.6,15.9,28.6L15.9,28.6C15.9,28.6,15.9,28.6,15.9,28.6L15.9,28.6
+			C15.9,28.6,15.9,28.6,15.9,28.6L15.9,28.6C15.9,28.6,15.9,28.6,15.9,28.6C15.9,28.6,15.9,28.6,15.9,28.6
+			C15.9,28.6,15.9,28.6,15.9,28.6C15.9,28.6,15.9,28.6,15.9,28.6L3.1,19.3c0,0,0,0,0,0L2,9.9c0,0,0,0,0,0c0,0,0,0,0,0l0,0
+			c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0v0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0h0c0,0,0,0,0,0c0,0,0,0,0,0
+			c0,0,0,0,0,0l3.8-1.7l0-0.1l0-0.1c0,0,0,0,0,0l0.4-0.6c0,0,0,0,0,0l0.7-0.5c0,0,0,0,0,0l1-0.3c0,0,0,0,0,0l1.2-0.1c0,0,0,0,0,0
+			l0.4,0l3.6-1.6l0-0.1c0,0,0,0,0,0c0,0,0,0,0,0l0,0l0.2-0.5c0,0,0,0,0,0L14,3.8c0,0,0,0,0,0l0.9-0.3c0,0,0,0,0,0L16,3.4
+			c0,0,0,0,0,0l1.1,0.1c0,0,0,0,0,0L18,3.8c0,0,0,0,0,0l0.6,0.4c0,0,0,0,0,0l0.3,0.5c0,0,0,0,0,0v0c0,0,0,0,0,0l0,0.2l3.6,1.6l0.4,0
+			c0,0,0,0,0,0L24,6.6c0,0,0,0,0,0l1,0.3c0,0,0,0,0,0l0.8,0.5c0,0,0,0,0,0L26.2,8c0,0,0,0,0,0c0,0,0,0,0,0l0,0.2L30,9.9c0,0,0,0,0,0
+			l0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
+			c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l-1.2,9.3c0,0,0,0,0,0L15.9,28.6C15.9,28.6,15.9,28.6,15.9,28.6
+			C15.9,28.6,15.9,28.6,15.9,28.6L15.9,28.6C15.9,28.6,15.9,28.6,15.9,28.6z M16,18.5L16,28.4l12.8-9.1l1.2-9.2L16,18.5z M3.2,19.2
+			l12.7,9.2l0.1-9.9L2.1,10L3.2,19.2z M2.1,9.9L16,18.4L29.9,10l-3.6-1.6L26.1,10L26,10.6c0,0,0,0,0,0l-0.6,0.5c0,0,0,0,0,0
+			l-0.9,0.4c0,0,0,0,0,0l-1.2,0.1c0,0,0,0,0,0L22,11.5c0,0,0,0,0,0l-1.1-0.4c0,0,0,0,0,0l-0.7-0.5c0,0,0,0,0,0L19.9,10c0,0,0,0,0,0
+			L20,8c0,0,0,0,0,0v0c0,0,0,0,0,0s0,0,0,0v0c0,0,0,0,0,0l0.2-0.6c0,0,0,0,0,0l0.6-0.5c0,0,0,0,0,0l0.9-0.3c0,0,0,0,0,0l0.5-0.1
+			l-3.3-1.5l0,1.5c0,0,0,0,0,0l-0.2,0.5c0,0,0,0,0,0l-0.6,0.4c0,0,0,0,0,0l-0.9,0.3c0,0,0,0,0,0L16,8c0,0,0,0,0,0l-1.1-0.1
+			c0,0,0,0,0,0l-0.9-0.3c0,0,0,0,0,0l-0.6-0.5c0,0,0,0,0,0l-0.2-0.5c0,0,0,0,0,0l0-1.5L9.7,6.5l0.5,0.1c0,0,0,0,0,0l0.9,0.3
+			c0,0,0,0,0,0l0,0c0,0,0,0,0,0l0.6,0.5c0,0,0,0,0,0L12,8c0,0,0,0,0,0l0.1,1.9c0,0,0,0,0,0l-0.3,0.5l0,0.1c0,0,0,0,0,0L11,11.1
+			c0,0,0,0,0,0L10,11.5c0,0,0,0,0,0l-1.2,0.1c0,0,0,0,0,0l-1.2-0.1c0,0,0,0,0,0l-0.9-0.4c0,0,0,0,0,0L6,10.5c0,0,0,0,0,0L5.9,9.9
+			L5.8,8.3L2.1,9.9z M22,11.4l1.2,0.1l1.2-0.1l0.9-0.3l0.5-0.5L26,9.9l0.1-1.2L26,8.8l-0.1,0.1l-0.3,0.3c0,0,0,0,0,0l-1,0.3
+			c0,0,0,0,0,0l-1.2,0.1c0,0,0,0,0,0l-1.2-0.1c0,0,0,0,0,0L21,9.2c0,0,0,0,0,0l-0.7-0.5c0,0,0,0,0,0l-0.2-0.4L20,9.9l0.3,0.6L21,11
+			L22,11.4z M7.6,11.3l1.2,0.1l1.2-0.1l1-0.3l0.7-0.5l0,0L12,9.9l-0.1-1.7l-0.2,0.4c0,0,0,0,0,0L11,9.2c0,0,0,0,0,0L9.9,9.5
+			c0,0,0,0,0,0L8.7,9.6c0,0,0,0,0,0L7.4,9.5c0,0,0,0,0,0l-1-0.4c0,0,0,0,0,0L5.9,8.7L6,9.9l0.1,0.6L6.7,11L7.6,11.3z M22.1,9.4
+			l1.2,0.1l1.2-0.1l1-0.3l0.3-0.3l0.1-0.1L26,8.6l0.1-0.5l0,0l-0.3-0.5L25,7l-1-0.3l-1.2-0.1l-0.4,0l-0.7,0.1L20.8,7l-0.6,0.5
+			L20.1,8l0.3,0.5l0.7,0.5L22.1,9.4z M7.4,9.4l1.2,0.1l1.2-0.1l1.1-0.3l0.7-0.5L11.9,8l-0.2-0.5L11.1,7l-0.9-0.3L9.5,6.6
+			c0,0,0,0,0,0l-0.4,0l0,0L8,6.7L6.9,7L6.2,7.4L5.9,8l0,0c0,0,0,0,0,0L6,8.5L6.5,9L7.4,9.4z M14.9,7.8L16,7.9l1.1-0.1l0.1,0L18,7.5
+			l0.6-0.4l0.2-0.5l0-1.4l-0.1,0.2c0,0,0,0,0,0l-0.6,0.4c0,0,0,0,0,0l-0.9,0.3c0,0,0,0,0,0L16,6.2c0,0,0,0,0,0l-1.1-0.1c0,0,0,0,0,0
+			l-0.9-0.3c0,0,0,0,0,0l-0.6-0.4c0,0,0,0,0,0l-0.1-0.2l0,1.5l0.2,0.5L14,7.5L14.9,7.8z M14.9,5.9L16,6.1L17.1,6L18,5.7l0.6-0.4
+			l0.2-0.5l-0.2-0.5L18,3.9L17,3.6L16,3.6l-1.1,0.1L14,3.9l-0.6,0.4l-0.2,0.5l0.2,0.5L14,5.7L14.9,5.9z M16,15.8
+			C16,15.8,16,15.8,16,15.8l-1.3-0.2c0,0,0,0,0,0l-1.1-0.4c0,0,0,0,0,0l-0.7-0.6c0,0,0,0,0,0l-0.2-0.7c0,0,0,0,0,0l0-2l0,0
+			c0,0,0,0,0,0l0.3-0.7c0,0,0,0,0,0l0.7-0.6c0,0,0,0,0,0l1.1-0.4c0,0,0,0,0,0L16,10c0,0,0,0,0,0l1.3,0.1c0,0,0,0,0,0l1.1,0.4
+			c0,0,0,0,0,0l0.7,0.6c0,0,0,0,0,0l0.3,0.7c0,0,0,0,0,0l0,0l-0.1,2c0,0,0,0,0,0l-0.2,0.7c0,0,0,0,0,0l-0.7,0.6c0,0,0,0,0,0
+			l-1.1,0.4c0,0,0,0,0,0L16,15.8C16,15.8,16,15.8,16,15.8z M14.7,15.5l1.3,0.1l1.3-0.1l1.1-0.4l0.7-0.6l0.2-0.7v0l0-1.5l-0.1,0.2
+			c0,0,0,0,0,0l-0.7,0.6c0,0,0,0,0,0l-1.1,0.4c0,0,0,0,0,0L16,13.7c0,0,0,0,0,0l-1.3-0.1c0,0,0,0,0,0l-1.1-0.4c0,0,0,0,0,0l-0.7-0.6
+			c0,0,0,0,0,0l-0.1-0.3l0,1.5l0.2,0.7l0.7,0.6L14.7,15.5z M14.7,13.5l1.3,0.1l1.3-0.1l1.1-0.4l0.7-0.6l0.1-0.3l0,0c0,0,0,0,0,0
+			l0-0.1l0,0c0,0,0,0,0,0l0,0l0-0.1L19,11.2l-0.7-0.5l-1.1-0.4L16,10.2l-1.2,0.1l-1.1,0.4L13,11.2l-0.3,0.6l0,0c0,0,0,0,0,0l0.2,0.7
+			l0.7,0.6L14.7,13.5z"/>
+	</g>
 </g>
 </svg>
--- a/docs/static/fonts/icons/iconfont.css
+++ b/docs/static/fonts/icons/iconfont.css
@ -1,8 +1,8 @@
@font-face {
 	font-family: "iconfont";
-	src: url("iconfont.eot?8b7e57577c2d1f1ae9e810b9e010bc84?#iefix") format("embedded-opentype"),
-url("iconfont.woff2?8b7e57577c2d1f1ae9e810b9e010bc84") format("woff2"),
-url("iconfont.woff?8b7e57577c2d1f1ae9e810b9e010bc84") format("woff");
+	src: url("iconfont.eot?92b07c6c5392088e45983d845234d068?#iefix") format("embedded-opentype"),
+url("iconfont.woff2?92b07c6c5392088e45983d845234d068") format("woff2"),
+url("iconfont.woff?92b07c6c5392088e45983d845234d068") format("woff");
 }

 .icon {
@ -91,3 +91,6 @@ url("iconfont.woff?8b7e57577c2d1f1ae9e810b9e010bc84") format("woff");
 .icon-blocks:before {
 	content: "\f119";
 }
+.icon-search:before {
+	content: "\f11a";
+}
--- a/docs/static/fonts/icons/iconfont.eot
+++ b/docs/static/fonts/icons/iconfont.eot
--- a/docs/static/fonts/icons/iconfont.svg
+++ b/docs/static/fonts/icons/iconfont.svg
@ -82,6 +82,9 @@
    <glyph glyph-name="blocks"
      unicode="&#xF119;"
      horiz-adv-x="40" d=" M10.9 23H39V16.9H10.9V23z M39.2 27.1L39.2 33L0.9 33L0.9 31.1L0.9 27.1L0.9 12.9L0.9 7L39.2 7L39.2 12.9L6.9 12.9L6.9 27.1z" />
+    <glyph glyph-name="search"
+      unicode="&#xF11A;"
+      horiz-adv-x="40" d=" M38.6 4.9L29.6 13.9C31.5 16.5 32.7 19.7 32.7 23.1C32.7 31.8 25.7 38.8 17 38.8C8.3 38.8 1.4 31.8 1.4 23.1C1.4 14.4 8.3 7.5 17 7.5C20.3 7.5 23.3 8.5 25.9 10.3L35 1.2L38.6 4.9zM17 12.7C11.3 12.7 6.6 17.4 6.6 23.1S11.3 33.6 17 33.6S27.5 28.9 27.5 23.1S22.8 12.7 17 12.7z" />
  </font>
 </defs>
 </svg>
--- a/docs/static/fonts/icons/iconfont.ttf
+++ b/docs/static/fonts/icons/iconfont.ttf
--- a/docs/static/fonts/icons/iconfont.woff
+++ b/docs/static/fonts/icons/iconfont.woff
--- a/docs/static/fonts/icons/iconfont.woff2
+++ b/docs/static/fonts/icons/iconfont.woff2
--- a/docs/static/lessons/make-a-sound-machine.png
+++ b/docs/static/lessons/make-a-sound-machine.png
--- a/docs/static/lessons/make-a-system.png
+++ b/docs/static/lessons/make-a-system.png
--- a/docs/static/lessons/make-it-communicate.png
+++ b/docs/static/lessons/make-it-communicate.png
--- a/docs/static/lessons/make-it-communicate/hero.png
+++ b/docs/static/lessons/make-it-communicate/hero.png
--- a/docs/static/lessons/make-it-move-1.png
+++ b/docs/static/lessons/make-it-move-1.png
--- a/docs/static/lessons/make-it-move-2.png
+++ b/docs/static/lessons/make-it-move-2.png
--- a/docs/static/lessons/make-it-move-3.png
+++ b/docs/static/lessons/make-it-move-3.png
--- a/docs/static/lessons/make-it-move.jpg
+++ b/docs/static/lessons/make-it-move.jpg
--- a/docs/static/lessons/make-it-move/hero.png
+++ b/docs/static/lessons/make-it-move/hero.png
--- a/docs/static/lessons/make-it-smarter-1.png
+++ b/docs/static/lessons/make-it-smarter-1.png
--- a/docs/static/lessons/make-it-smarter-2.png
+++ b/docs/static/lessons/make-it-smarter-2.png
--- a/docs/static/lessons/make-it-smarter/bricks.png
+++ b/docs/static/lessons/make-it-smarter/bricks.png
--- a/docs/static/lessons/parking.png
+++ b/docs/static/lessons/parking.png
--- a/docs/static/lessons/sound-machine.png
+++ b/docs/static/lessons/sound-machine.png
--- a/docs/static/lessons/try.png
+++ b/docs/static/lessons/try.png
--- a/docs/static/lessons/use.png
+++ b/docs/static/lessons/use.png
--- a/editor/extension.ts
+++ b/editor/extension.ts
@ -7,6 +7,7 @@ import { FieldImages } from "./field_images";
 import { FieldSpeed } from "./field_speed";
 import { FieldBrickButtons } from "./field_brickbuttons";
 import { FieldTurnRatio } from "./field_turnratio";
+import { FieldColorEnum } from "./field_color";

 pxt.editor.initExtensionsAsync = function (opts: pxt.editor.ExtensionOptions): Promise<pxt.editor.ExtensionResult> {
    pxt.debug('loading pxt-ev3 target extensions...')
@ -27,6 +28,9 @@ pxt.editor.initExtensionsAsync = function (opts: pxt.editor.ExtensionOptions): P
        }, {
            selector: "turnratio",
            editor: FieldTurnRatio
+        }, {
+            selector: "colorenum",
+            editor: FieldColorEnum
        }],
        deployCoreAsync,
        showUploadInstructionsAsync: (fn: string, url: string, confirmAsync: (options: any) => Promise<number>) => {
@ -73,7 +77,7 @@ pxt.editor.initExtensionsAsync = function (opts: pxt.editor.ExtensionOptions): P
                                <span class="ui blue circular label">2</span>
                                <strong>${lf("Make sure you have the latest EV3 firmware")}</strong>
                                <br/>
-                                <a href="" target="_blank">${lf("Click here to update to latest firmware")}</a>
+                                <a href="https://ev3manager.education.lego.com/" target="_blank">${lf("Click here to update to latest firmware")}</a>
                            </div>
                        </div>
                    </div>
--- a/editor/field_color.ts
+++ b/editor/field_color.ts
@ -0,0 +1,71 @@
+/// <reference path="../node_modules/pxt-core/localtypings/blockly.d.ts"/>
+/// <reference path="../node_modules/pxt-core/built/pxtsim.d.ts"/>
+
+export interface FieldColorEnumOptions extends pxtblockly.FieldColourNumberOptions {
+}
+
+export class FieldColorEnum extends pxtblockly.FieldColorNumber implements Blockly.FieldCustom {
+    public isFieldCustom_ = true;
+
+    constructor(text: string, params: FieldColorEnumOptions, opt_validator?: Function) {
+        super(text, params, opt_validator);
+    }
+
+    mapColour(enumString: string) {
+        switch(enumString) {
+            case '#000000': return 'ColorSensorColor.Black';
+            case '#006db3': return 'ColorSensorColor.Blue';
+            case '#00934b': return 'ColorSensorColor.Green';
+            case '#ffd01b': return 'ColorSensorColor.Yellow';
+            case '#f12a21': return 'ColorSensorColor.Red';
+            case '#ffffff': return 'ColorSensorColor.White';
+            case '#6c2d00': return 'ColorSensorColor.Brown';
+            default: return 'ColorSensorColor.None';
+        }
+    }
+
+    mapEnum(colorString: string) {
+        console.log(colorString);
+        switch(colorString) {
+            case 'ColorSensorColor.Black': return '#000000';
+            case 'ColorSensorColor.Blue': return '#006db3';
+            case 'ColorSensorColor.Green': return '#00934b';
+            case 'ColorSensorColor.Yellow': return '#ffd01b';
+            case 'ColorSensorColor.Red': return '#f12a21';
+            case 'ColorSensorColor.White': return '#ffffff';
+            case 'ColorSensorColor.Brown': return '#6c2d00';
+            case 'ColorSensorColor.None': return '#dfe6e9'; // Grey
+            default: return colorString;
+        }
+    }
+
+    /**
+     * Return the current colour.
+     * @param {boolean} opt_asHex optional field if the returned value should be a hex
+     * @return {string} Current colour in '#rrggbb' format.
+     */
+    getValue(opt_asHex?: boolean) {
+        var colour = this.mapColour(this.colour_);
+        if (!opt_asHex && colour.indexOf('#') > -1) {
+            return `0x${colour.replace(/^#/, '')}`;
+        }
+        return colour;
+    }
+
+    /**
+     * Set the colour.
+     * @param {string} colour The new colour in '#rrggbb' format.
+     */
+    setValue(colorStr: string) {
+        var colour = this.mapEnum(colorStr);
+        if (this.sourceBlock_ && Blockly.Events.isEnabled() &&
+            this.colour_ != colour) {
+            Blockly.Events.fire(new (Blockly as any).Events.BlockChange(
+                this.sourceBlock_, 'field', this.name, this.colour_, colour));
+        }
+        this.colour_ = colour;
+        if (this.sourceBlock_) {
+            this.sourceBlock_.setColour(colour, colour, colour);
+        }
+    }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Peli de Halleux	f8b8fbb1b4	0.1.2	2018-02-26 15:59:57 -08:00
Peli de Halleux	594ead703c	fixing mood block (#349 )	2018-02-26 15:59:36 -08:00
Peli de Halleux	5f05934dda	0.1.1	2018-02-26 15:17:14 -08:00
Peli de Halleux	3e0ca1acb9	bump minor	2018-02-26 15:17:06 -08:00
Michał Moskal	c2d26a8418	Integrate screen APIs from common packages (#343 ) * starting screen api intergration * Further image integration * Aligning with new screen apis * Build fixes * Adjust to common screen state * Fix unpackPNG * Add game library * Optimize screen rendering * bumping common packages * updated shims * moving images into ev3 * upgrading to common packages * added try/use * cap * fixed tryp age	2018-02-26 15:16:17 -08:00
Sam El-Husseini	5bd9705966	0.0.109	2018-02-26 14:49:15 -08:00
Sam El-Husseini	1160d73b16	bump pxt-core to 3.4.9, bump pxt-common-packages to 0.20.3,	2018-02-26 14:49:00 -08:00
Sam El-Husseini	a2218d9ba5	Fix canvas (screen) user select options to disable selection in Safari, Mozilla, etc. (#348 )	2018-02-26 13:58:51 -08:00
Sam El-Husseini	54576ae77a	Fix authoring of the mood field editor. (#347 )	2018-02-26 13:52:26 -08:00
Sam El-Husseini	f16549d7cd	0.0.108	2018-02-26 13:38:20 -08:00
Sam El-Husseini	a021c0b292	Use a color picker for the color field (color enum picker) (#346 )	2018-02-26 13:37:58 -08:00
Peli de Halleux	cda7013e96	fixing links	2018-02-26 13:27:03 -08:00
Peli de Halleux	2f0fefbeaf	updated images	2018-02-26 13:25:53 -08:00
Peli de Halleux	b5303a660b	0.0.107	2018-02-26 11:22:44 -08:00
Sam El-Husseini	a60958f72a	Update search icon and avatar SVG (#345 )	2018-02-26 10:43:29 -08:00
Peli de Halleux	33dcb6deee	renaming infraredSensor to infrared (#344 )	2018-02-26 10:39:15 -08:00
Guillaume Jenkins	130a47d684	Sensor names are now part of the block text (#341 ) * Sensor names are now part of the block text * Use ports field editor	2018-02-26 11:33:50 -05:00
Peli de Halleux	2d355bb2ca	Merge branch 'master' of https://github.com/microsoft/pxt-ev3	2018-02-23 20:38:53 -08:00
Galen Nickel	8ee63df325	Add in 'console' doc stuff (#342 ) * Add 'playSound' api docs * Add in 'console' doc stuff * Add 'send to screen' in summary\	2018-02-23 14:13:08 -08:00
Peli de Halleux	7d16cf10ac	added make it smarter	2018-02-23 07:37:32 -08:00
Galen Nickel	60ec3f1c99	Add 'playSound' api docs (#340 ) * Add 'playSound' api docs * Linkup summary	2018-02-22 16:23:07 -08:00
Galen Nickel	6524b0a841	Add 'timer' api docs (#339 )	2018-02-22 14:56:15 -08:00
Peli de Halleux	d778232155	removing .mp4 file	2018-02-22 10:24:40 -08:00
Peli de Halleux	c157b4d922	0.0.106	2018-02-22 10:18:13 -08:00
Peli de Halleux	0837123828	bumping pxt	2018-02-22 10:15:58 -08:00
Peli de Halleux	e51a32b69f	use full motor names (#338 )	2018-02-22 10:03:25 -08:00
Peli de Halleux	029066000d	updated style	2018-02-22 08:28:42 -08:00
Peli de Halleux	7e35abeff3	lock on 0.0.104	2018-02-22 06:54:18 -08:00
Peli de Halleux	0166785c1b	0.0.105	2018-02-22 06:36:41 -08:00
Peli de Halleux	ea0f6a4734	updated pxt	2018-02-22 06:36:26 -08:00
Peli de Halleux	271721561d	turn sample into blocks	2018-02-21 22:39:35 -08:00
Galen Nickel	ed8f8bafa7	Add 'infrared beacon' api topics (#330 ) * Add 'infrared beacon' api topics * Include note about channel selection	2018-02-21 22:35:51 -08:00
Galen Nickel	8cfb70c97b	Threshold api docs - 01 (#336 ) * Local commit * Throw on more topics * Throw in threshold topics for infrared	2018-02-21 22:35:25 -08:00
Galen Nickel	84c8e31ff5	First burst of 'color' pages (#335 ) * Add 'color sensor' api topics * Last set of edits/adds	2018-02-21 14:03:55 -08:00
Peli de Halleux	ceb9b7fabf	0.0.104	2018-02-21 06:45:29 -08:00
Peli de Halleux	9e0670551f	upgrading pxt	2018-02-21 06:45:14 -08:00
Peli de Halleux	6613607503	Make it comm lesson (#331 ) * integrating lego lesson * fixed link * adding various solutions * updatring to 3.4.6 * using play sound effect until done * revert pxtversion * fixing link	2018-02-21 06:43:53 -08:00
Galen Nickel	3a67190914	Add some 'infrared' api docs (#326 ) * Add some 'infrared' api docs * Fix display messages * Change discussion of distance to relative * Include motor speed note	2018-02-20 10:38:41 -08:00
Peli de Halleux	05e916e247	0.0.103	2018-02-19 07:35:38 -08:00
Peli de Halleux	fad4ca98db	renaming 'set speed' to 'run' (#327 )	2018-02-19 07:35:08 -08:00
Peli de Halleux	3b6cfed5b2	added distance measurer	2018-02-15 13:56:50 -08:00
Peli de Halleux	472ea170d0	fixing default light	2018-02-15 13:49:04 -08:00
Peli de Halleux	80f24948ec	0.0.102	2018-02-14 16:05:40 -08:00
Peli de Halleux	daa88b299d	replacing loops.pause -> pause, loops.forever -> forever	2018-02-14 16:05:31 -08:00
Peli de Halleux	0384eb4d9d	upgrading common packages	2018-02-14 15:59:08 -08:00
Peli de Halleux	f33f88e87c	fixing struture	2018-02-14 11:20:56 -08:00
Peli de Halleux	239827c259	0.0.101	2018-02-14 11:06:56 -08:00
Peli de Halleux	cd0097749a	updated readme	2018-02-14 11:00:12 -08:00
Peli de Halleux	94db31beb7	bring back the shims	2018-02-14 10:56:50 -08:00
Peli de Halleux	408631d426	upgrading common packages	2018-02-14 10:32:09 -08:00
Peli de Halleux	2407e7e179	0.0.100	2018-02-14 10:16:57 -08:00
Peli de Halleux	f63b447fee	upgraded to v3.4.3	2018-02-14 10:16:27 -08:00
Peli de Halleux	bbd1a9d215	Merge branch 'master' of https://github.com/microsoft/pxt-ev3	2018-02-14 10:15:28 -08:00
Peli de Halleux	cfc4688fbe	adding targetconfig to package	2018-02-14 09:49:47 -08:00
Peli de Halleux	24d48c0171	update firmware url	2018-02-14 09:36:20 -08:00
Peli de Halleux	523c507c35	Projectupdate1 (#325 ) * integrating test lesson from lego * adding side card annotations	2018-02-14 08:56:12 -08:00
Peli de Halleux	d6cbbcc3d9	support for importing urls	2018-02-13 21:41:49 -08:00
Peli de Halleux	2b5cedb404	0.0.99	2018-02-13 11:26:41 -08:00
Peli de Halleux	224e9c54f0	color dropdown for color sensor (#324 )	2018-02-13 10:44:46 -08:00
Richard Knoll	f3f33828f3	Fixed the dropdown for colors (#323 )	2018-02-12 21:23:16 -08:00