diff --git a/.gitignore b/.gitignore
index e294893b..34cfeb96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,7 @@ clients/electron/projects
 *.db
 *.suo
 *.log
+
+.DS_Store
+.idea
+*.iml
diff --git a/libs/calliope-test/calliope.ts b/libs/calliope-test/calliope.ts
new file mode 100644
index 00000000..60c5632f
--- /dev/null
+++ b/libs/calliope-test/calliope.ts
@@ -0,0 +1,42 @@
+basic.showString("RGB LED")
+basic.setLedColor(Colors.Blue)
+basic.pause(500)
+basic.setLedColor(Colors.Red)
+basic.pause(500)
+basic.setLedColor(Colors.Green)
+basic.pause(500)
+basic.setLedColor(Colors.Violet)
+basic.pause(500)
+basic.setLedColor(0);
+basic.showString("Gestures")
+input.onGesture(Gesture.Shake, () => {
+    basic.showString("S")
+})
+input.onGesture(Gesture.LogoUp, () => {
+    basic.showString("U")
+})
+input.onGesture(Gesture.LogoDown, () => {
+    basic.showString("D")
+})
+input.onGesture(Gesture.ScreenUp, () => {
+    basic.showString("+")
+})
+input.onGesture(Gesture.TiltRight, () => {
+    basic.showString("R")
+})
+input.onGesture(Gesture.FreeFall, () => {
+    basic.showString("F")
+})
+input.onGesture(Gesture.ScreenDown, () => {
+    basic.showString("-")
+})
+input.onGesture(Gesture.TiltLeft, () => {
+    basic.showString("L")
+})
+input.onGesture(Gesture.ThreeG, () => {
+    basic.showString("3")
+})
+input.onGesture(Gesture.SixG, () => {
+    basic.showString("6")
+})
+
diff --git a/libs/calliope-test/pxt.json b/libs/calliope-test/pxt.json
new file mode 100644
index 00000000..917d19d8
--- /dev/null
+++ b/libs/calliope-test/pxt.json
@@ -0,0 +1,11 @@
+{
+    "name": "calliope",
+    "description": "Test of Calliope Parts",
+    "files": [
+        "calliope.ts"
+    ],
+    "public": true,
+    "dependencies": {
+        "core": "file:../core"
+    }
+}
diff --git a/libs/core/dal.d.ts b/libs/core/dal.d.ts
index 905f189d..581f0bfa 100644
--- a/libs/core/dal.d.ts
+++ b/libs/core/dal.d.ts
@@ -426,6 +426,7 @@ declare const enum DAL {
     MICROBIT_ACCELEROMETER_TILT_TOLERANCE = 200,
     MICROBIT_ACCELEROMETER_FREEFALL_TOLERANCE = 400,
     MICROBIT_ACCELEROMETER_SHAKE_TOLERANCE = 400,
+    MICROBIT_ACCELEROMETER_2G_TOLERANCE = 2048,
     MICROBIT_ACCELEROMETER_3G_TOLERANCE = 3072,
     MICROBIT_ACCELEROMETER_6G_TOLERANCE = 6144,
     MICROBIT_ACCELEROMETER_8G_TOLERANCE = 8192,
diff --git a/libs/core/input.cpp b/libs/core/input.cpp
index 5e6a7f11..90c59f61 100644
--- a/libs/core/input.cpp
+++ b/libs/core/input.cpp
@@ -130,7 +130,7 @@ namespace input {
     //% parts="accelerometer"
     void onGesture(Gesture gesture, Action body) {
         if ((int)gesture == MICROBIT_ACCELEROMETER_EVT_3G && uBit.accelerometer.getRange() < 3)
-            uBit.accelerometer.setRange(4);
+            uBit.accelerometer.setRange(6);
         else if ((int)gesture == MICROBIT_ACCELEROMETER_EVT_6G && uBit.accelerometer.getRange() < 6)
             uBit.accelerometer.setRange(8);
         registerWithDal(MICROBIT_ID_GESTURE, (int)gesture, body);