diff --git a/examples/toys/ping_pong_gun/pingPongGun.js b/examples/toys/ping_pong_gun/pingPongGun.js
index 1e87eb76ce..879d467293 100644
--- a/examples/toys/ping_pong_gun/pingPongGun.js
+++ b/examples/toys/ping_pong_gun/pingPongGun.js
@@ -24,7 +24,7 @@
     var RELOAD_THRESHOLD = 0.95;
     var GUN_TIP_FWD_OFFSET =-0.35;
     var GUN_TIP_UP_OFFSET = 0.040;
-    var GUN_FORCE = 5;
+    var GUN_FORCE = 9;
     var BALL_RESTITUTION = 0.6;
     var BALL_LINEAR_DAMPING = 0.4;
     var BALL_GRAVITY = {
@@ -168,4 +168,4 @@
 
     // entity scripts always need to return a newly constructed object of our type
     return new PingPongGun();
-});
\ No newline at end of file
+});
diff --git a/unpublishedScripts/hiddenEntityReset.js b/unpublishedScripts/hiddenEntityReset.js
index a9e97db518..9b443fc1ae 100644
--- a/unpublishedScripts/hiddenEntityReset.js
+++ b/unpublishedScripts/hiddenEntityReset.js
@@ -12,1161 +12,1300 @@
 
 (function() {
 
-    var _this;
+  var _this;
 
-    var sprayPaintScriptURL = Script.resolvePath("../examples/toys/sprayPaintCan.js");
-    var catScriptURL = Script.resolvePath("../examples/toys/cat.js");
-    var flashlightScriptURL = Script.resolvePath('../examples/toys/flashlight/flashlight.js');
-    var pingPongScriptURL = Script.resolvePath('../examples/toys/ping_pong_gun/pingPongGun.js');
-    var wandScriptURL = Script.resolvePath("../examples/toys/bubblewand/wand.js");
-    var dollScriptURL = Script.resolvePath("../examples/toys/doll/doll.js");
-    var lightsScriptURL = Script.resolvePath("../examples/toys/lightSwitch.js");
+  var sprayPaintScriptURL = Script.resolvePath("../examples/toys/sprayPaintCan.js");
+  var catScriptURL = Script.resolvePath("../examples/toys/cat.js");
+  var flashlightScriptURL = Script.resolvePath('../examples/toys/flashlight/flashlight.js');
+  var pingPongScriptURL = Script.resolvePath('../examples/toys/ping_pong_gun/pingPongGun.js');
+  var wandScriptURL = Script.resolvePath("../examples/toys/bubblewand/wand.js");
+  var dollScriptURL = Script.resolvePath("../examples/toys/doll/doll.js");
+  var lightsScriptURL = Script.resolvePath("../examples/toys/lightSwitch.js");
+  var targetsScriptURL = Script.resolvePath('../examples/toys/ping_pong_gun/wallTarget.js');
 
-    ResetSwitch = function() {
-        _this = this;
-    };
+  ResetSwitch = function() {
+    _this = this;
+  };
 
-    ResetSwitch.prototype = {
+  ResetSwitch.prototype = {
 
-        clickReleaseOnEntity: function(entityId, mouseEvent) {
-            if (!mouseEvent.isLeftButton) {
-                return;
-            }
-            this.triggerReset();
+    clickReleaseOnEntity: function(entityId, mouseEvent) {
+      if (!mouseEvent.isLeftButton) {
+        return;
+      }
+      this.triggerReset();
 
+    },
+
+    startNearGrabNonColliding: function() {
+      this.triggerReset();
+    },
+
+    triggerReset: function() {
+      MasterReset();
+    },
+
+    preload: function(entityID) {
+      this.entityID = entityID;
+    }
+
+  };
+
+
+
+  MasterReset = function() {
+    var resetKey = "resetMe";
+    var GRABBABLE_DATA_KEY = "grabbableKey";
+
+    var HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
+
+    var shouldDeleteOnEndScript = false;
+
+    //Before creating anything, first search a radius and delete all the things that should be deleted
+    deleteAllToys();
+    createAllToys();
+
+    function createAllToys() {
+      createBlocks({
+        x: 548.3,
+        y: 495.55,
+        z: 504.4
+      });
+
+      createBasketBall({
+        x: 547.73,
+        y: 495.5,
+        z: 505.47
+      });
+
+      createDoll({
+        x: 546.67,
+        y: 495.41,
+        z: 505.09
+      });
+
+      createWand({
+        x: 546.71,
+        y: 495.55,
+        z: 506.15
+      });
+
+      createDice();
+
+      createFlashlight({
+        x: 545.72,
+        y: 495.41,
+        z: 505.78
+      });
+
+
+
+      createCombinedArmChair({
+        x: 549.29,
+        y: 494.9,
+        z: 508.22
+      });
+
+      createPottedPlant({
+        x: 554.26,
+        y: 495.2,
+        z: 504.53
+      });
+
+      createPingPongBallGun();
+
+      createBasketballHoop();
+      createBasketballRack();
+
+      createGates();
+
+      createFire();
+      // Handles toggling of all sconce lights 
+      createLights();
+
+
+
+      createCat({
+        x: 551.09,
+        y: 494.98,
+        z: 503.49
+      });
+
+
+      createSprayCan({
+        x: 549.7,
+        y: 495.6,
+        z: 503.91
+      });
+
+      createTargets();
+
+    }
+
+    function deleteAllToys() {
+      var entities = Entities.findEntities(MyAvatar.position, 100);
+
+      entities.forEach(function(entity) {
+        //params: customKey, id, defaultValue
+        var shouldReset = getEntityCustomData(resetKey, entity, {}).resetMe;
+        if (shouldReset === true) {
+          Entities.deleteEntity(entity);
+        }
+      });
+    }
+
+    function createFire() {
+
+
+      var myOrientation = Quat.fromPitchYawRollDegrees(-90, 0, 0.0);
+
+      var animationSettings = JSON.stringify({
+        fps: 30,
+        running: true,
+        loop: true,
+        firstFrame: 1,
+        lastFrame: 10000
+      });
+
+
+      var fire = Entities.addEntity({
+        type: "ParticleEffect",
+        name: "fire",
+        animationSettings: animationSettings,
+        textures: "https://hifi-public.s3.amazonaws.com/alan/Particles/Particle-Sprite-Smoke-1.png",
+        position: {
+          x: 551.45,
+          y: 494.82,
+          z: 502.05
+        },
+        emitRate: 100,
+        colorStart: {
+          red: 70,
+          green: 70,
+          blue: 137
+        },
+        color: {
+          red: 200,
+          green: 99,
+          blue: 42
+        },
+        colorFinish: {
+          red: 255,
+          green: 99,
+          blue: 32
+        },
+        radiusSpread: 0.01,
+        radiusStart: 0.02,
+        radiusEnd: 0.001,
+        particleRadius: 0.05,
+        radiusFinish: 0.0,
+        emitOrientation: myOrientation,
+        emitSpeed: 0.3,
+        speedSpread: 0.1,
+        alphaStart: 0.05,
+        alpha: 0.1,
+        alphaFinish: 0.05,
+        emitDimensions: {
+          x: 1,
+          y: 1,
+          z: 0.1
+        },
+        polarFinish: 0.1,
+        emitAcceleration: {
+          x: 0.0,
+          y: 0.0,
+          z: 0.0
+        },
+        accelerationSpread: {
+          x: 0.1,
+          y: 0.01,
+          z: 0.1
+        },
+        lifespan: 1,
+        userData: JSON.stringify({
+          resetMe: {
+            resetMe: true
+          }
+        })
+      });
+    }
+
+    function createBasketballRack() {
+      var NUMBER_OF_BALLS = 4;
+      var DIAMETER = 0.30;
+      var RESET_DISTANCE = 1;
+      var MINIMUM_MOVE_LENGTH = 0.05;
+      var basketballURL = HIFI_PUBLIC_BUCKET + "models/content/basketball2.fbx";
+      var basketballCollisionSoundURL = HIFI_PUBLIC_BUCKET + "sounds/basketball/basketball.wav";
+      var rackURL = HIFI_PUBLIC_BUCKET + "models/basketball_hoop/basketball_rack.fbx";
+      var rackCollisionHullURL = HIFI_PUBLIC_BUCKET + "models/basketball_hoop/rack_collision_hull.obj";
+
+      var rackRotation = Quat.fromPitchYawRollDegrees(0, -90, 0);
+
+      var rackStartPosition = {
+        x: 542.86,
+        y: 494.84,
+        z: 475.06
+      };
+      var rack = Entities.addEntity({
+        name: 'Basketball Rack',
+        type: "Model",
+        modelURL: rackURL,
+        position: rackStartPosition,
+        rotation: rackRotation,
+        shapeType: 'compound',
+        gravity: {
+          x: 0,
+          y: -9.8,
+          z: 0
+        },
+        linearDamping: 1,
+        dimensions: {
+          x: 0.4,
+          y: 1.37,
+          z: 1.73
+        },
+        collisionsWillMove: true,
+        ignoreForCollisions: false,
+        compoundShapeURL: rackCollisionHullURL,
+        userData: JSON.stringify({
+          resetMe: {
+            resetMe: true
+          },
+          grabbableKey: {
+            grabbable: false
+          }
+
+        })
+      });
+
+      var collidingBalls = [];
+      var originalBallPositions = [];
+
+      function createCollidingBalls() {
+        var position = rackStartPosition;
+
+        var i;
+        for (i = 0; i < NUMBER_OF_BALLS; i++) {
+          var ballPosition = {
+            x: position.x,
+            y: position.y + DIAMETER * 2,
+            z: position.z + (DIAMETER) - (DIAMETER * i)
+          };
+
+          var collidingBall = Entities.addEntity({
+            type: "Model",
+            name: 'Colliding Basketball',
+            shapeType: 'Sphere',
+            position: {
+              x: position.x + (DIAMETER * 2) - (DIAMETER * i),
+              y: position.y + DIAMETER * 2,
+              z: position.z
+            },
+            dimensions: {
+              x: DIAMETER,
+              y: DIAMETER,
+              z: DIAMETER
+            },
+            restitution: 1.0,
+            linearDamping: 0.00001,
+            gravity: {
+              x: 0,
+              y: -9.8,
+              z: 0
+            },
+            collisionsWillMove: true,
+            ignoreForCollisions: false,
+            modelURL: basketballURL,
+            userData: JSON.stringify({
+              resetMe: {
+                resetMe: true
+              }
+            })
+          });
+
+          collidingBalls.push(collidingBall);
+          originalBallPositions.push(position);
+        }
+      }
+
+      function testBallDistanceFromStart() {
+        var resetCount = 0;
+
+        collidingBalls.forEach(function(ball, index) {
+          var currentPosition = Entities.getEntityProperties(ball, "position").position;
+          var originalPosition = originalBallPositions[index];
+          var distance = Vec3.subtract(originalPosition, currentPosition);
+          var length = Vec3.length(distance);
+
+          if (length > RESET_DISTANCE) {
+            Script.setTimeout(function() {
+              var newPosition = Entities.getEntityProperties(ball, "position").position;
+              var moving = Vec3.length(Vec3.subtract(currentPosition, newPosition));
+              if (moving < MINIMUM_MOVE_LENGTH) {
+                resetCount++;
+                if (resetCount === NUMBER_OF_BALLS) {
+                  deleteCollidingBalls();
+                  createCollidingBalls();
+                }
+              }
+            }, 200);
+          }
+        });
+      }
+
+      function deleteEntity(entityID) {
+        if (entityID === rack) {
+          deleteCollidingBalls();
+          Script.clearInterval(distanceCheckInterval);
+          Entities.deletingEntity.disconnect(deleteEntity);
+        }
+      }
+
+      function deleteCollidingBalls() {
+        while (collidingBalls.length > 0) {
+          Entities.deleteEntity(collidingBalls.pop());
+        }
+      }
+
+      createCollidingBalls();
+      Entities.deletingEntity.connect(deleteEntity);
+
+      var distanceCheckInterval = Script.setInterval(testBallDistanceFromStart, 1000);
+    }
+
+    function createTargets() {
+
+      var MODEL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/target.fbx';
+      var COLLISION_HULL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/target_collision_hull.obj';
+
+      var RESET_DISTANCE = 1;
+      var TARGET_USER_DATA_KEY = 'hifi-ping_pong_target';
+      var NUMBER_OF_TARGETS = 6;
+      var TARGETS_PER_ROW = 3;
+
+      var TARGET_DIMENSIONS = {
+        x: 0.06,
+        y: 0.42,
+        z: 0.42
+      };
+
+      var VERTICAL_SPACING = TARGET_DIMENSIONS.y + 0.5;
+      var HORIZONTAL_SPACING = TARGET_DIMENSIONS.z + 0.5;
+
+
+      var startPosition = {
+        x: 548.68,
+        y: 497.30,
+        z: 509.74
+      };
+
+      var rotation = Quat.fromPitchYawRollDegrees(0, -55.25, 0);
+
+      var targetIntervalClearer = Entities.addEntity({
+        name: 'Target Interval Clearer - delete me to clear',
+        type: 'Box',
+        position: startPosition,
+        dimensions: TARGET_DIMENSIONS,
+        color: {
+          red: 0,
+          green: 255,
+          blue: 0
+        },
+        rotation: rotation,
+        visible: false,
+        collisionsWillMove: false,
+        ignoreForCollisions: true,
+        userData: JSON.stringify({
+          resetMe: {
+            resetMe: true
+          }
+        })
+      });
+
+      var targets = [];
+
+      var originalPositions = [];
+
+      function addTargets() {
+        var i;
+        var row = -1;
+        for (i = 0; i < NUMBER_OF_TARGETS; i++) {
+
+          if (i % TARGETS_PER_ROW === 0) {
+            row++;
+          }
+
+          var vHat = Quat.getFront(rotation);
+          var spacer = HORIZONTAL_SPACING * (i % TARGETS_PER_ROW) + (row * HORIZONTAL_SPACING / 2);
+          var multiplier = Vec3.multiply(spacer, vHat);
+          var position = Vec3.sum(startPosition, multiplier);
+          position.y = startPosition.y - (row * VERTICAL_SPACING);
+
+          originalPositions.push(position);
+
+          var targetProperties = {
+            name: 'Target',
+            type: 'Model',
+            modelURL: MODEL_URL,
+            shapeType: 'compound',
+            collisionsWillMove: true,
+            dimensions: TARGET_DIMENSIONS,
+            compoundShapeURL: COLLISION_HULL_URL,
+            position: position,
+            rotation: rotation,
+            script: targetsScriptURL,
+            userData: JSON.stringify({
+              resetMe: {
+                resetMe: true
+              }
+            })
+          };
+          var target = Entities.addEntity(targetProperties);
+          targets.push(target);
+        }
+      }
+
+      function testTargetDistanceFromStart() {
+        targets.forEach(function(target, index) {
+
+          var currentPosition = Entities.getEntityProperties(target, "position").position;
+          var originalPosition = originalPositions[index];
+          var distance = Vec3.subtract(originalPosition, currentPosition);
+          var length = Vec3.length(distance);
+
+          if (length > RESET_DISTANCE) {
+
+            Entities.deleteEntity(target);
+
+            var targetProperties = {
+              name: 'Target',
+              type: 'Model',
+              modelURL: MODEL_URL,
+              shapeType: 'compound',
+              collisionsWillMove: true,
+              dimensions: TARGET_DIMENSIONS,
+              compoundShapeURL: COLLISION_HULL_URL,
+              position: originalPositions[index],
+              rotation: rotation,
+              script: targetsScriptURL,
+              userData: JSON.stringify({
+                resetMe: {
+                  resetMe: true
+                }
+              })
+            };
+            var target = Entities.addEntity(targetProperties);
+            targets[index] = target;
+
+          }
+        });
+      }
+
+
+      function deleteEntity(entityID) {
+        if (entityID === targetIntervalClearer) {
+          deleteTargets();
+          Script.clearInterval(distanceCheckInterval);
+          Entities.deletingEntity.disconnect(deleteEntity);
+        }
+      }
+
+      function deleteTargets() {
+        while (targets.length > 0) {
+          Entities.deleteEntity(targets.pop());
+        }
+        Entities.deleteEntity(targetIntervalClearer);
+      }
+
+      Entities.deletingEntity.connect(deleteEntity);
+      var distanceCheckInterval = Script.setInterval(testTargetDistanceFromStart, 1000);
+
+      addTargets();
+
+    }
+
+    function createCat(position) {
+
+      var modelURL = "http://hifi-public.s3.amazonaws.com/ryan/Dark_Cat.fbx";
+      var animationURL = "http://hifi-public.s3.amazonaws.com/ryan/sleeping.fbx";
+      var animationSettings = JSON.stringify({
+        running: true,
+      });
+      var cat = Entities.addEntity({
+        type: "Model",
+        modelURL: modelURL,
+        name: "cat",
+        script: catScriptURL,
+        animationURL: animationURL,
+        animationSettings: animationSettings,
+        position: position,
+        rotation: {
+          w: 0.35020983219146729,
+          x: -4.57763671875e-05,
+          y: 0.93664455413818359,
+          z: -1.52587890625e-05
+        },
+        dimensions: {
+          x: 0.15723302960395813,
+          y: 0.50762706995010376,
+          z: 0.90716040134429932
+        },
+        userData: JSON.stringify({
+          resetMe: {
+            resetMe: true
+          }
+        })
+      });
+
+    }
+
+    function createFlashlight(position) {
+      var modelURL = "https://hifi-public.s3.amazonaws.com/models/props/flashlight.fbx";
+
+      var flashlight = Entities.addEntity({
+        type: "Model",
+        modelURL: modelURL,
+        name: "flashlight",
+        script: flashlightScriptURL,
+        position: position,
+        dimensions: {
+          x: 0.08,
+          y: 0.30,
+          z: 0.08
+        },
+        collisionsWillMove: true,
+        gravity: {
+          x: 0,
+          y: -3.5,
+          z: 0
+        },
+        velocity: {
+          x: 0,
+          y: -0.01,
+          z: 0
+        },
+        shapeType: 'box',
+        userData: JSON.stringify({
+          resetMe: {
+            resetMe: true
+          }
+        })
+      });
+
+
+    }
+
+    function createLights() {
+      var modelURL = "http://hifi-public.s3.amazonaws.com/ryan/lightswitch.fbx";
+
+
+      var rotation = {
+        w: 0.63280689716339111,
+        x: 0.63280689716339111,
+        y: -0.31551080942153931,
+        z: 0.31548023223876953
+      };
+      var axis = {
+        x: 0,
+        y: 1,
+        z: 0
+      };
+      var dQ = Quat.angleAxis(180, axis);
+      rotation = Quat.multiply(rotation, dQ);
+
+      var lightSwitchHall = Entities.addEntity({
+        type: "Model",
+        modelURL: modelURL,
+        name: "Light Switch Hall",
+        script: lightsScriptURL,
+        position: {
+          x: 543.27764892578125,
+          y: 495.67999267578125,
+          z: 511.00564575195312
+        },
+        rotation: rotation,
+        dimensions: {
+          x: 0.10546875,
+          y: 0.032372996211051941,
+          z: 0.16242524981498718
+        },
+        userData: JSON.stringify({
+          resetMe: {
+            resetMe: true,
+            on: true,
+            type: "Hall Light"
+          }
+        })
+      });
+
+      var sconceLight1 = Entities.addEntity({
+        type: "Light",
+        position: {
+          x: 543.75,
+          y: 496.24,
+          z: 511.13
+        },
+        name: "Sconce 1 Light",
+        dimensions: {
+          x: 2.545,
+          y: 2.545,
+          z: 2.545
+        },
+        cutoff: 90,
+        color: {
+          red: 217,
+          green: 146,
+          blue: 24
+        },
+        userData: JSON.stringify({
+          resetMe: {
+            resetMe: true,
+            type: "Hall Light"
+          }
+        })
+      });
+
+      var sconceLight2 = Entities.addEntity({
+        type: "Light",
+        position: {
+          x: 540.1,
+          y: 496.24,
+          z: 505.57
+        },
+        name: "Sconce 2 Light",
+        dimensions: {
+          x: 2.545,
+          y: 2.545,
+          z: 2.545
+        },
+        cutoff: 90,
+        color: {
+          red: 217,
+          green: 146,
+          blue: 24
+        },
+        userData: JSON.stringify({
+          resetMe: {
+            resetMe: true,
+            type: "Hall Light"
+          }
+        })
+      });
+
+      rotation = {
+        w: 0.20082402229309082,
+        x: 0.20082402229309082,
+        y: -0.67800414562225342,
+        z: 0.67797362804412842
+      };
+      axis = {
+        x: 0,
+        y: 1,
+        z: 0
+      };
+      dQ = Quat.angleAxis(180, axis);
+      rotation = Quat.multiply(rotation, dQ);
+
+      var lightSwitchGarage = Entities.addEntity({
+        type: "Model",
+        modelURL: modelURL,
+        name: "Light Switch Garage",
+        script: lightsScriptURL,
+        position: {
+          x: 545.62,
+          y: 495.68,
+          z: 500.21
+        },
+        rotation: rotation,
+        dimensions: {
+          x: 0.10546875,
+          y: 0.032372996211051941,
+          z: 0.16242524981498718
+        },
+        userData: JSON.stringify({
+          resetMe: {
+            resetMe: true,
+            on: true,
+            type: "Garage Light"
+          }
+        })
+      });
+
+
+
+
+      var sconceLight3 = Entities.addEntity({
+        type: "Light",
+        position: {
+          x: 545.49468994140625,
+          y: 496.24026489257812,
+          z: 500.63516235351562
         },
 
-        startNearGrabNonColliding: function() {
-            this.triggerReset();
+        name: "Sconce 3 Light",
+        dimensions: {
+          x: 2.545,
+          y: 2.545,
+          z: 2.545
         },
-
-        triggerReset: function() {
-            MasterReset();
+        cutoff: 90,
+        color: {
+          red: 217,
+          green: 146,
+          blue: 24
         },
+        userData: JSON.stringify({
+          resetMe: {
+            resetMe: true,
+            type: "Garage Light"
+          }
+        })
+      });
 
-        preload: function(entityID) {
-            this.entityID = entityID;
+
+      var sconceLight4 = Entities.addEntity({
+        type: "Light",
+        position: {
+          x: 550.90399169921875,
+          y: 496.24026489257812,
+          z: 507.90237426757812
+        },
+        name: "Sconce 4 Light",
+        dimensions: {
+          x: 2.545,
+          y: 2.545,
+          z: 2.545
+        },
+        cutoff: 90,
+        color: {
+          red: 217,
+          green: 146,
+          blue: 24
+        },
+        userData: JSON.stringify({
+          resetMe: {
+            resetMe: true,
+            type: "Garage Light"
+          }
+        })
+      });
+
+      var sconceLight5 = Entities.addEntity({
+        type: "Light",
+        position: {
+          x: 548.407958984375,
+          y: 496.24026489257812,
+          z: 509.5504150390625
+        },
+        name: "Sconce 5 Light",
+        dimensions: {
+          x: 2.545,
+          y: 2.545,
+          z: 2.545
+        },
+        cutoff: 90,
+        color: {
+          red: 217,
+          green: 146,
+          blue: 24
+        },
+        userData: JSON.stringify({
+          resetMe: {
+            resetMe: true,
+            type: "Garage Light"
+          }
+        })
+      });
+
+    }
+
+
+
+    function createDice() {
+      var diceProps = {
+        type: "Model",
+        modelURL: "http://s3.amazonaws.com/hifi-public/models/props/Dice/goldDie.fbx",
+        collisionSoundURL: "http://s3.amazonaws.com/hifi-public/sounds/dice/diceCollide.wav",
+        name: "dice",
+        position: {
+          x: 541,
+          y: 494.96,
+          z: 509.1
+        },
+        dimensions: {
+          x: 0.09,
+          y: 0.09,
+          z: 0.09
+        },
+        gravity: {
+          x: 0,
+          y: -3.5,
+          z: 0
+        },
+        velocity: {
+          x: 0,
+          y: -0.01,
+          z: 0
+        },
+        shapeType: "box",
+        collisionsWillMove: true,
+        userData: JSON.stringify({
+          resetMe: {
+            resetMe: true,
+          }
+        })
+      };
+      var dice1 = Entities.addEntity(diceProps);
+
+      diceProps.position = {
+        x: 541.05,
+        y: 494.96,
+        z: 509.0
+      };
+
+      var dice2 = Entities.addEntity(diceProps);
+
+    }
+
+
+    function createGates() {
+      var MODEL_URL = 'http://hifi-public.s3.amazonaws.com/ryan/fence.fbx';
+
+      var rotation = Quat.fromPitchYawRollDegrees(0, -16, 0);
+      var gate = Entities.addEntity({
+        name: 'Front Door Fence',
+        type: 'Model',
+        modelURL: MODEL_URL,
+        shapeType: 'box',
+        position: {
+          x: 531.15,
+          y: 495.11,
+          z: 520.20
+        },
+        dimensions: {
+          x: 1.42,
+          y: 1.13,
+          z: 0.2
+        },
+        rotation: rotation2,
+        collisionsWillMove: true,
+        gravity: {
+          x: 0,
+          y: -100,
+          z: 0
+        },
+        linearDamping: 1,
+        angularDamping: 10,
+        mass: 10,
+        userData: JSON.stringify({
+          resetMe: {
+            resetMe: true,
+          },
+          grabbableKey: {
+            grabbable: false
+          }
+        })
+      });
+    }
+
+    function createPingPongBallGun() {
+      var MODEL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/ping_pong_gun.fbx';
+      var COLLISION_HULL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/ping_pong_gun_collision_hull.obj';
+
+      var position = {
+        x: 548.6,
+        y: 495.4,
+        z: 503.39
+      };
+
+      var rotation = Quat.fromPitchYawRollDegrees(0, 36, 0);
+
+      var pingPongGun = Entities.addEntity({
+        type: "Model",
+        modelURL: MODEL_URL,
+        shapeType: 'box',
+        script: pingPongScriptURL,
+        position: position,
+        rotation: rotation,
+        gravity: {
+          x: 0,
+          y: -9.8,
+          z: 0
+        },
+        dimensions: {
+          x: 0.08,
+          y: 0.21,
+          z: 0.47
+        },
+        collisionsWillMove: true,
+        userData: JSON.stringify({
+          resetMe: {
+            resetMe: true,
+          }
+        })
+      });
+    }
+
+    function createBasketballHoop() {
+      var position = {
+        x: 539.23,
+        y: 496.13,
+        z: 475.89
+      };
+      var rotation = Quat.fromPitchYawRollDegrees(0, 58.49, 0);
+
+      var hoopURL = "http://hifi-public.s3.amazonaws.com/models/basketball_hoop/basketball_hoop.fbx";
+      var hoopCollisionHullURL = "http://hifi-public.s3.amazonaws.com/models/basketball_hoop/basketball_hoop_collision_hull.obj";
+
+      var hoop = Entities.addEntity({
+        type: "Model",
+        modelURL: hoopURL,
+        position: position,
+        rotation: rotation,
+        shapeType: 'compound',
+        gravity: {
+          x: 0,
+          y: -9.8,
+          z: 0
+        },
+        dimensions: {
+          x: 1.89,
+          y: 3.99,
+          z: 3.79
+        },
+        compoundShapeURL: hoopCollisionHullURL,
+        userData: JSON.stringify({
+          resetMe: {
+            resetMe: true,
+          },
+          grabbaleKey: {
+            grabbable: false
+          }
+        })
+      });
+    }
+
+    function createWand(position) {
+      var WAND_MODEL = 'http://hifi-public.s3.amazonaws.com/james/bubblewand/models/wand/wand.fbx';
+      var WAND_COLLISION_SHAPE = 'http://hifi-public.s3.amazonaws.com/james/bubblewand/models/wand/actual_no_top_collision_hull.obj';
+
+      var entity = Entities.addEntity({
+        name: 'Bubble Wand',
+        type: "Model",
+        modelURL: WAND_MODEL,
+        position: position,
+        gravity: {
+          x: 0,
+          y: -9.8,
+          z: 0
+        },
+        dimensions: {
+          x: 0.05,
+          y: 0.25,
+          z: 0.05
+        },
+        //must be enabled to be grabbable in the physics engine
+        shapeType: 'compound',
+        collisionsWillMove: true,
+        compoundShapeURL: WAND_COLLISION_SHAPE,
+        //Look into why bubble wand is going through table when gravity is enabled
+        // gravity: {x: 0, y: -3.5, z: 0},
+        // velocity: {x: 0, y: -0.01, z:0},
+        script: wandScriptURL,
+        userData: JSON.stringify({
+          resetMe: {
+            resetMe: true,
+          }
+        })
+      });
+
+
+    }
+
+    function createBasketBall(position) {
+
+      var modelURL = "http://s3.amazonaws.com/hifi-public/models/content/basketball2.fbx";
+
+      var entity = Entities.addEntity({
+        type: "Model",
+        modelURL: modelURL,
+        position: position,
+        collisionsWillMove: true,
+        shapeType: "sphere",
+        name: "basketball",
+        dimensions: {
+          x: 0.25,
+          y: 0.26,
+          z: 0.25
+        },
+        gravity: {
+          x: 0,
+          y: -7,
+          z: 0
+        },
+        restitution: 10,
+        linearDamping: 0.0,
+        velocity: {
+          x: 0,
+          y: -0.01,
+          z: 0
+        },
+        collisionSoundURL: "http://s3.amazonaws.com/hifi-public/sounds/basketball/basketball.wav",
+        userData: JSON.stringify({
+          resetMe: {
+            resetMe: true,
+          }
+        })
+      });
+
+    }
+
+    function createDoll(position) {
+      var modelURL = "http://hifi-public.s3.amazonaws.com/models/Bboys/bboy2/bboy2.fbx";
+
+      var naturalDimensions = {
+        x: 1.63,
+        y: 1.67,
+        z: 0.26
+      };
+      var desiredDimensions = Vec3.multiply(naturalDimensions, 0.15);
+      var entity = Entities.addEntity({
+        type: "Model",
+        name: "doll",
+        modelURL: modelURL,
+        script: dollScriptURL,
+        position: position,
+        shapeType: 'box',
+        dimensions: desiredDimensions,
+        gravity: {
+          x: 0,
+          y: -5,
+          z: 0
+        },
+        velocity: {
+          x: 0,
+          y: -0.1,
+          z: 0
+        },
+        collisionsWillMove: true,
+        userData: JSON.stringify({
+          resetMe: {
+            resetMe: true,
+          }
+        })
+      });
+
+    }
+
+    function createSprayCan(position) {
+
+      var modelURL = "https://hifi-public.s3.amazonaws.com/eric/models/paintcan.fbx";
+
+      var entity = Entities.addEntity({
+        type: "Model",
+        name: "spraycan",
+        script: sprayPaintScriptURL,
+        modelURL: modelURL,
+        position: position,
+        dimensions: {
+          x: 0.07,
+          y: 0.17,
+          z: 0.07
+        },
+        collisionsWillMove: true,
+        shapeType: 'box',
+        gravity: {
+          x: 0,
+          y: -0.5,
+          z: 0
+        },
+        velocity: {
+          x: 0,
+          y: -1,
+          z: 0
+        },
+        userData: JSON.stringify({
+          resetMe: {
+            resetMe: true,
+          }
+        })
+      });
+
+    }
+
+    function createPottedPlant(position) {
+      var modelURL = "http://hifi-public.s3.amazonaws.com/models/potted_plant/potted_plant.fbx";
+
+      var entity = Entities.addEntity({
+        type: "Model",
+        name: "Potted Plant",
+        modelURL: modelURL,
+        position: position,
+        dimensions: {
+          x: 1.10,
+          y: 2.18,
+          z: 1.07
+        },
+        collisionsWillMove: true,
+        shapeType: 'box',
+        gravity: {
+          x: 0,
+          y: -9.8,
+          z: 0
+        },
+        velocity: {
+          x: 0,
+          y: 0,
+          z: 0
+        },
+        linearDamping: 0.4,
+        userData: JSON.stringify({
+          resetMe: {
+            resetMe: true,
+          },
+          grabbableKey: {
+            grabbale: false
+          }
+        })
+      });
+    }
+
+
+    function createCombinedArmChair(position) {
+      var modelURL = "http://hifi-public.s3.amazonaws.com/models/red_arm_chair/combined_chair.fbx";
+      var RED_ARM_CHAIR_COLLISION_HULL = "http://hifi-public.s3.amazonaws.com/models/red_arm_chair/red_arm_chair_collision_hull.obj";
+
+      var rotation = Quat.fromPitchYawRollDegrees(0, -143, 0);
+
+      var entity = Entities.addEntity({
+        type: "Model",
+        name: "Red Arm Chair",
+        modelURL: modelURL,
+        shapeType: 'compound',
+        compoundShapeURL: RED_ARM_CHAIR_COLLISION_HULL,
+        position: position,
+        rotation: rotation,
+        dimensions: {
+          x: 1.26,
+          y: 1.56,
+          z: 1.35
+        },
+        collisionsWillMove: true,
+        gravity: {
+          x: 0,
+          y: -0.8,
+          z: 0
+        },
+        velocity: {
+          x: 0,
+          y: 0,
+          z: 0
+        },
+        linearDamping: 0.2,
+        userData: JSON.stringify({
+          resetMe: {
+            resetMe: true,
+          },
+          grabbaleKey: {
+            grabbable: false
+          }
+        })
+      });
+
+    }
+
+    function createBlocks(position) {
+      var baseURL = HIFI_PUBLIC_BUCKET + "models/content/planky/";
+      var collisionSoundURL = "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/ToyWoodBlock.L.wav";
+      var NUM_BLOCKS_PER_COLOR = 4;
+      var i, j;
+
+      var blockTypes = [{
+        url: "planky_blue.fbx",
+        dimensions: {
+          x: 0.05,
+          y: 0.05,
+          z: 0.25
         }
-
-    };
-
-
-    MasterReset = function() {
-        var resetKey = "resetMe";
-        var GRABBABLE_DATA_KEY = "grabbableKey";
-
-        var HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
-
-        var shouldDeleteOnEndScript = false;
-
-        //Before creating anything, first search a radius and delete all the things that should be deleted
-        deleteAllToys();
-        createAllToys();
-
-        function createAllToys() {
-            createBlocks({
-                x: 548.3,
-                y: 495.55,
-                z: 504.4
-            });
-
-            createBasketBall({
-                x: 547.73,
-                y: 495.5,
-                z: 505.47
-            });
-
-            createDoll({
-                x: 546.67,
-                y: 495.41,
-                z: 505.09
-            });
-
-            createWand({
-                x: 546.71,
-                y: 495.55,
-                z: 506.15
-            });
-
-            createDice();
-
-            createFlashlight({
-                x: 545.72,
-                y: 495.41,
-                z: 505.78
-            });
-
-
-
-            createCombinedArmChair({
-                x: 549.29,
-                y: 494.9,
-                z: 508.22
-            });
-
-            createPottedPlant({
-                x: 554.26,
-                y: 495.2,
-                z: 504.53
-            });
-
-            createPingPongBallGun();
-
-            createBasketballHoop();
-            createBasketballRack();
-
-            createGates();
-
-            createFire();
-            // Handles toggling of all sconce lights 
-            createLights();
-
-
-
-            createCat({
-                x: 551.09,
-                y: 494.98,
-                z: 503.49
-            });
-
-
-            createSprayCan({
-                x: 549.7,
-                y: 495.6,
-                z: 503.91
-            });
-
+      }, {
+        url: "planky_green.fbx",
+        dimensions: {
+          x: 0.1,
+          y: 0.1,
+          z: 0.25
         }
-
-        function deleteAllToys() {
-            var entities = Entities.findEntities(MyAvatar.position, 100);
-
-            entities.forEach(function(entity) {
-                //params: customKey, id, defaultValue
-                var shouldReset = getEntityCustomData(resetKey, entity, {}).resetMe;
-                if (shouldReset === true) {
-                    Entities.deleteEntity(entity);
-                }
-            });
+      }, {
+        url: "planky_natural.fbx",
+        dimensions: {
+          x: 0.05,
+          y: 0.05,
+          z: 0.05
         }
-
-        function createFire() {
-
-
-            var myOrientation = Quat.fromPitchYawRollDegrees(-90, 0, 0.0);
-
-            var animationSettings = JSON.stringify({
-                fps: 30,
-                running: true,
-                loop: true,
-                firstFrame: 1,
-                lastFrame: 10000
-            });
-
-
-            var fire = Entities.addEntity({
-                type: "ParticleEffect",
-                name: "fire",
-                animationSettings: animationSettings,
-                textures: "https://hifi-public.s3.amazonaws.com/alan/Particles/Particle-Sprite-Smoke-1.png",
-                position: {
-                    x: 551.45,
-                    y: 494.82,
-                    z: 502.05
-                },
-                emitRate: 100,
-                colorStart: {
-                    red: 70,
-                    green: 70,
-                    blue: 137
-                },
-                color: {
-                    red: 200,
-                    green: 99,
-                    blue: 42
-                },
-                colorFinish: {
-                    red: 255,
-                    green: 99,
-                    blue: 32
-                },
-                radiusSpread: 0.01,
-                radiusStart: 0.02,
-                radiusEnd: 0.001,
-                particleRadius: 0.05,
-                radiusFinish: 0.0,
-                emitOrientation: myOrientation,
-                emitSpeed: 0.3,
-                speedSpread: 0.1,
-                alphaStart: 0.05,
-                alpha: 0.1,
-                alphaFinish: 0.05,
-                emitDimensions: {
-                    x: 1,
-                    y: 1,
-                    z: 0.1
-                },
-                polarFinish: 0.1,
-                emitAcceleration: {
-                    x: 0.0,
-                    y: 0.0,
-                    z: 0.0
-                },
-                accelerationSpread: {
-                    x: 0.1,
-                    y: 0.01,
-                    z: 0.1
-                },
-                lifespan: 1
-            });
-
-
-            setEntityCustomData(resetKey, fire, {
-                resetMe: true
-            });
+      }, {
+        url: "planky_yellow.fbx",
+        dimensions: {
+          x: 0.03,
+          y: 0.05,
+          z: 0.25
         }
-
-        function createBasketballRack() {
-            var NUMBER_OF_BALLS = 4;
-            var DIAMETER = 0.30;
-            var RESET_DISTANCE = 1;
-            var MINIMUM_MOVE_LENGTH = 0.05;
-            var basketballURL = HIFI_PUBLIC_BUCKET + "models/content/basketball2.fbx";
-            var basketballCollisionSoundURL = HIFI_PUBLIC_BUCKET + "sounds/basketball/basketball.wav";
-            var rackURL = HIFI_PUBLIC_BUCKET + "models/basketball_hoop/basketball_rack.fbx";
-            var rackCollisionHullURL = HIFI_PUBLIC_BUCKET + "models/basketball_hoop/rack_collision_hull.obj";
-
-            var rackRotation = Quat.fromPitchYawRollDegrees(0, -90, 0);
-
-            var rackStartPosition = {
-                x: 542.86,
-                y: 494.84,
-                z: 475.06
-            };
-            var rack = Entities.addEntity({
-                name: 'Basketball Rack',
-                type: "Model",
-                modelURL: rackURL,
-                position: rackStartPosition,
-                rotation: rackRotation,
-                shapeType: 'compound',
-                gravity: {
-                    x: 0,
-                    y: -9.8,
-                    z: 0
-                },
-                linearDamping: 1,
-                dimensions: {
-                    x: 0.4,
-                    y: 1.37,
-                    z: 1.73
-                },
-                collisionsWillMove: true,
-                ignoreForCollisions: false,
-                compoundShapeURL: rackCollisionHullURL
-            });
-
-            setEntityCustomData(resetKey, rack, {
-                resetMe: true
-            });
-
-            setEntityCustomData(GRABBABLE_DATA_KEY, rack, {
-                grabbable: false
-            });
-
-            var collidingBalls = [];
-            var originalBallPositions = [];
-
-            function createCollidingBalls() {
-                var position = rackStartPosition;
-
-                var i;
-                for (i = 0; i < NUMBER_OF_BALLS; i++) {
-                    var ballPosition = {
-                        x: position.x,
-                        y: position.y + DIAMETER * 2,
-                        z: position.z + (DIAMETER) - (DIAMETER * i)
-                    };
-
-                    var collidingBall = Entities.addEntity({
-                        type: "Model",
-                        name: 'Colliding Basketball',
-                        shapeType: 'Sphere',
-                        position: {
-                            x: position.x + (DIAMETER * 2) - (DIAMETER * i),
-                            y: position.y + DIAMETER * 2,
-                            z: position.z
-                        },
-                        dimensions: {
-                            x: DIAMETER,
-                            y: DIAMETER,
-                            z: DIAMETER
-                        },
-                        restitution: 1.0,
-                        linearDamping: 0.00001,
-                        gravity: {
-                            x: 0,
-                            y: -9.8,
-                            z: 0
-                        },
-                        collisionsWillMove: true,
-                        ignoreForCollisions: false,
-                        modelURL: basketballURL,
-                    });
-
-                    collidingBalls.push(collidingBall);
-                    originalBallPositions.push(position);
-
-                    setEntityCustomData(resetKey, collidingBall, {
-                        resetMe: true
-                    });
-                }
-            }
-
-            function testBallDistanceFromStart() {
-                var resetCount = 0;
-
-                collidingBalls.forEach(function(ball, index) {
-                    var currentPosition = Entities.getEntityProperties(ball, "position").position;
-                    var originalPosition = originalBallPositions[index];
-                    var distance = Vec3.subtract(originalPosition, currentPosition);
-                    var length = Vec3.length(distance);
-
-                    if (length > RESET_DISTANCE) {
-                        Script.setTimeout(function() {
-                            var newPosition = Entities.getEntityProperties(ball, "position").position;
-                            var moving = Vec3.length(Vec3.subtract(currentPosition, newPosition));
-                            if (moving < MINIMUM_MOVE_LENGTH) {
-                                resetCount++;
-                                if (resetCount === NUMBER_OF_BALLS) {
-                                    deleteCollidingBalls();
-                                    createCollidingBalls();
-                                }
-                            }
-                        }, 200);
-                    }
-                });
-            }
-
-            function deleteEntity(entityID) {
-                if (entityID === rack) {
-                    deleteCollidingBalls();
-                    Script.clearInterval(distanceCheckInterval);
-                    Entities.deletingEntity.disconnect(deleteEntity);
-                }
-            }
-
-            function deleteCollidingBalls() {
-                while (collidingBalls.length > 0) {
-                    Entities.deleteEntity(collidingBalls.pop());
-                }
-            }
-
-            createCollidingBalls();
-            Entities.deletingEntity.connect(deleteEntity);
-
-            var distanceCheckInterval = Script.setInterval(testBallDistanceFromStart, 1000);
+      }, {
+        url: "planky_red.fbx",
+        dimensions: {
+          x: 0.1,
+          y: 0.05,
+          z: 0.25
         }
+      },];
 
-        function createCat(position) {
-
-            var modelURL = "http://hifi-public.s3.amazonaws.com/ryan/Dark_Cat.fbx";
-            var animationURL = "http://hifi-public.s3.amazonaws.com/ryan/sleeping.fbx";
-            var animationSettings = JSON.stringify({
-                running: true,
-            });
-            var cat = Entities.addEntity({
-                type: "Model",
-                modelURL: modelURL,
-                name: "cat",
-                script: catScriptURL,
-                animationURL: animationURL,
-                animationSettings: animationSettings,
-                position: position,
-                rotation: {
-                    w: 0.35020983219146729,
-                    x: -4.57763671875e-05,
-                    y: 0.93664455413818359,
-                    z: -1.52587890625e-05
-                },
-                dimensions: {
-                    x: 0.15723302960395813,
-                    y: 0.50762706995010376,
-                    z: 0.90716040134429932
-                },
-            });
-
-            setEntityCustomData(resetKey, cat, {
-                resetMe: true
-            });
-        }
-
-        function createFlashlight(position) {
-            var modelURL = "https://hifi-public.s3.amazonaws.com/models/props/flashlight.fbx";
-
-            var flashlight = Entities.addEntity({
-                type: "Model",
-                modelURL: modelURL,
-                name: "flashlight",
-                script: flashlightScriptURL,
-                position: position,
-                dimensions: {
-                    x: 0.08,
-                    y: 0.30,
-                    z: 0.08
-                },
-                collisionsWillMove: true,
-                gravity: {
-                    x: 0,
-                    y: -3.5,
-                    z: 0
-                },
-                velocity: {
-                    x: 0,
-                    y: -0.01,
-                    z: 0
-                },
-                shapeType: 'box',
-            });
-
-            setEntityCustomData(resetKey, flashlight, {
-                resetMe: true
-            });
-
-        }
-
-        function createLights() {
-            var modelURL = "http://hifi-public.s3.amazonaws.com/ryan/lightswitch.fbx";
-
-
-            var rotation = {
-                w: 0.63280689716339111,
-                x: 0.63280689716339111,
-                y: -0.31551080942153931,
-                z: 0.31548023223876953
-            };
-            var axis = {
-                x: 0,
-                y: 1,
-                z: 0
-            };
-            var dQ = Quat.angleAxis(180, axis);
-            rotation = Quat.multiply(rotation, dQ);
-
-            var lightSwitchHall = Entities.addEntity({
-                type: "Model",
-                modelURL: modelURL,
-                name: "Light Switch Hall",
-                script: lightsScriptURL,
-                position: {
-                    x: 543.27764892578125,
-                    y: 495.67999267578125,
-                    z: 511.00564575195312
-                },
-                rotation: rotation,
-                dimensions: {
-                    x: 0.10546875,
-                    y: 0.032372996211051941,
-                    z: 0.16242524981498718
-                }
-            });
-            setEntityCustomData(resetKey, lightSwitchHall, {
+      var modelURL, entity;
+      for (i = 0; i < blockTypes.length; i++) {
+        for (j = 0; j < NUM_BLOCKS_PER_COLOR; j++) {
+          modelURL = baseURL + blockTypes[i].url;
+          entity = Entities.addEntity({
+            type: "Model",
+            modelURL: modelURL,
+            position: Vec3.sum(position, {
+              x: j / 10,
+              y: i / 10,
+              z: 0
+            }),
+            shapeType: 'box',
+            name: "block",
+            dimensions: blockTypes[i].dimensions,
+            collisionsWillMove: true,
+            collisionSoundURL: collisionSoundURL,
+            gravity: {
+              x: 0,
+              y: -2.5,
+              z: 0
+            },
+            velocity: {
+              x: 0,
+              y: -0.01,
+              z: 0
+            },
+            userData: JSON.stringify({
+              resetMe: {
                 resetMe: true,
-                on: true,
-                type: "Hall Light"
-            });
-
-            var sconceLight1 = Entities.addEntity({
-                type: "Light",
-                position: {
-                    x: 543.75,
-                    y: 496.24,
-                    z: 511.13
-                },
-                name: "Sconce 1 Light",
-                dimensions: {
-                    x: 2.545,
-                    y: 2.545,
-                    z: 2.545
-                },
-                cutoff: 90,
-                color: {
-                    red: 217,
-                    green: 146,
-                    blue: 24
-                }
-            });
-
-            setEntityCustomData(resetKey, sconceLight1, {
-                resetMe: true,
-                type: "Hall Light",
-            });
-
-            var sconceLight2 = Entities.addEntity({
-                type: "Light",
-                position: {
-                    x: 540.1,
-                    y: 496.24,
-                    z: 505.57
-                },
-                name: "Sconce 2 Light",
-                dimensions: {
-                    x: 2.545,
-                    y: 2.545,
-                    z: 2.545
-                },
-                cutoff: 90,
-                color: {
-                    red: 217,
-                    green: 146,
-                    blue: 24
-                }
-            });
-
-            setEntityCustomData(resetKey, sconceLight2, {
-                resetMe: true,
-                type: "Hall Light",
-            });
-
-
-            rotation = {
-                w: 0.20082402229309082,
-                x: 0.20082402229309082,
-                y: -0.67800414562225342,
-                z: 0.67797362804412842
-            };
-            axis = {
-                x: 0,
-                y: 1,
-                z: 0
-            };
-            dQ = Quat.angleAxis(180, axis);
-            rotation = Quat.multiply(rotation, dQ);
-
-            var lightSwitchGarage = Entities.addEntity({
-                type: "Model",
-                modelURL: modelURL,
-                name: "Light Switch Garage",
-                script: lightsScriptURL,
-                position: {
-                    x: 545.62,
-                    y: 495.68,
-                    z: 500.21
-                },
-                rotation: rotation,
-                dimensions: {
-                    x: 0.10546875,
-                    y: 0.032372996211051941,
-                    z: 0.16242524981498718
-                }
-            });
-
-            setEntityCustomData(resetKey, lightSwitchGarage, {
-                resetMe: true,
-                on: true,
-                type: "Garage Light"
-            });
-
-
-            var sconceLight3 = Entities.addEntity({
-                type: "Light",
-                position: {
-                    x: 545.49468994140625,
-                    y: 496.24026489257812,
-                    z: 500.63516235351562
-                },
-
-                name: "Sconce 3 Light",
-                dimensions: {
-                    x: 2.545,
-                    y: 2.545,
-                    z: 2.545
-                },
-                cutoff: 90,
-                color: {
-                    red: 217,
-                    green: 146,
-                    blue: 24
-                }
-            });
-
-
-
-            setEntityCustomData(resetKey, sconceLight3, {
-                resetMe: true,
-                type: "Garage Light",
-            });
-
-            var sconceLight4 = Entities.addEntity({
-                type: "Light",
-                position: {
-                    x: 550.90399169921875,
-                    y: 496.24026489257812,
-                    z: 507.90237426757812
-                },
-                name: "Sconce 4 Light",
-                dimensions: {
-                    x: 2.545,
-                    y: 2.545,
-                    z: 2.545
-                },
-                cutoff: 90,
-                color: {
-                    red: 217,
-                    green: 146,
-                    blue: 24
-                }
-            });
-
-            setEntityCustomData(resetKey, sconceLight4, {
-                resetMe: true,
-                type: "Garage Light",
-            });
-
-            var sconceLight5 = Entities.addEntity({
-                type: "Light",
-                position: {
-                    x: 548.407958984375,
-                    y: 496.24026489257812,
-                    z: 509.5504150390625
-                },
-                name: "Sconce 5 Light",
-                dimensions: {
-                    x: 2.545,
-                    y: 2.545,
-                    z: 2.545
-                },
-                cutoff: 90,
-                color: {
-                    red: 217,
-                    green: 146,
-                    blue: 24
-                }
-            });
-
-            setEntityCustomData(resetKey, sconceLight5, {
-                resetMe: true,
-                type: "Garage Light",
-            });
+              }
+            })
+          });
 
         }
+      }
+    }
 
+    function cleanup() {
+      deleteAllToys();
+    }
 
+    if (shouldDeleteOnEndScript) {
 
-        function createDice() {
-            var diceProps = {
-                type: "Model",
-                modelURL: "http://s3.amazonaws.com/hifi-public/models/props/Dice/goldDie.fbx",
-                collisionSoundURL: "http://s3.amazonaws.com/hifi-public/sounds/dice/diceCollide.wav",
-                name: "dice",
-                position: {
-                    x: 541,
-                    y: 494.96,
-                    z: 509.1
-                },
-                dimensions: {
-                    x: 0.09,
-                    y: 0.09,
-                    z: 0.09
-                },
-                gravity: {
-                    x: 0,
-                    y: -3.5,
-                    z: 0
-                },
-                velocity: {
-                    x: 0,
-                    y: -0.01,
-                    z: 0
-                },
-                shapeType: "box",
-                collisionsWillMove: true
-            };
-            var dice1 = Entities.addEntity(diceProps);
+      Script.scriptEnding.connect(cleanup);
+    }
+  };
 
-            diceProps.position = {
-                x: 541.05,
-                y: 494.96,
-                z: 509.0
-            };
-
-            var dice2 = Entities.addEntity(diceProps);
-
-            setEntityCustomData(resetKey, dice1, {
-                resetMe: true
-            });
-
-            setEntityCustomData(resetKey, dice2, {
-                resetMe: true
-            });
-        }
-
-
-        function createGates() {
-            var MODEL_URL = 'http://hifi-public.s3.amazonaws.com/ryan/fence.fbx';
-
-            var rotation1 = Quat.fromPitchYawRollDegrees(0, 36, 0);
-
-            var gate1 = Entities.addEntity({
-                name: 'Back Door Gate',
-                type: 'Model',
-                shapeType: 'box',
-                modelURL: MODEL_URL,
-                position: {
-                    x: 546.52,
-                    y: 494.76,
-                    z: 498.87
-                },
-                dimensions: {
-                    x: 1.42,
-                    y: 1.13,
-                    z: 0.25
-                },
-                rotation: rotation1,
-                collisionsWillMove: true,
-                gravity: {
-                    x: 0,
-                    y: -50,
-                    z: 0
-                },
-                linearDamping: 1,
-                angularDamping: 10,
-                mass: 10,
-
-            });
-
-            setEntityCustomData(resetKey, gate1, {
-                resetMe: true
-            });
-
-            setEntityCustomData(GRABBABLE_DATA_KEY, gate1, {
-                grabbable: false
-            });
-
-            var rotation2 = Quat.fromPitchYawRollDegrees(0, -16, 0);
-            var gate2 = Entities.addEntity({
-                name: 'Front Door Fence',
-                type: 'Model',
-                modelURL: MODEL_URL,
-                shapeType: 'box',
-                position: {
-                    x: 531.15,
-                    y: 495.11,
-                    z: 520.20
-                },
-                dimensions: {
-                    x: 1.42,
-                    y: 1.13,
-                    z: 0.2
-                },
-                rotation: rotation2,
-                collisionsWillMove: true,
-                gravity: {
-                    x: 0,
-                    y: -100,
-                    z: 0
-                },
-                linearDamping: 1,
-                angularDamping: 10,
-                mass: 10,
-            });
-
-            setEntityCustomData(resetKey, gate2, {
-                resetMe: true
-            });
-
-            setEntityCustomData(GRABBABLE_DATA_KEY, gate2, {
-                grabbable: false
-            });
-        }
-
-        function createPingPongBallGun() {
-            var MODEL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/ping_pong_gun.fbx';
-            var COLLISION_HULL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/ping_pong_gun_collision_hull.obj';
-
-            var position = {
-                x: 548.6,
-                y: 495.4,
-                z: 503.39
-            };
-
-            var rotation = Quat.fromPitchYawRollDegrees(0, 36, 0);
-
-            var pingPongGun = Entities.addEntity({
-                type: "Model",
-                modelURL: MODEL_URL,
-                shapeType: 'box',
-                script: pingPongScriptURL,
-                position: position,
-                rotation: rotation,
-                gravity: {
-                    x: 0,
-                    y: -9.8,
-                    z: 0
-                },
-                dimensions: {
-                    x: 0.08,
-                    y: 0.21,
-                    z: 0.47
-                },
-                collisionsWillMove: true,
-            });
-
-            setEntityCustomData(resetKey, pingPongGun, {
-                resetMe: true
-            });
-        }
-
-        function createBasketballHoop() {
-            var position = {
-                x: 539.23,
-                y: 496.13,
-                z: 475.89
-            };
-            var rotation = Quat.fromPitchYawRollDegrees(0, 58.49, 0);
-
-            var hoopURL = "http://hifi-public.s3.amazonaws.com/models/basketball_hoop/basketball_hoop.fbx";
-            var hoopCollisionHullURL = "http://hifi-public.s3.amazonaws.com/models/basketball_hoop/basketball_hoop_collision_hull.obj";
-
-            var hoop = Entities.addEntity({
-                type: "Model",
-                modelURL: hoopURL,
-                position: position,
-                rotation: rotation,
-                shapeType: 'compound',
-                gravity: {
-                    x: 0,
-                    y: -9.8,
-                    z: 0
-                },
-                dimensions: {
-                    x: 1.89,
-                    y: 3.99,
-                    z: 3.79
-                },
-                compoundShapeURL: hoopCollisionHullURL
-            });
-
-            setEntityCustomData(resetKey, hoop, {
-                resetMe: true
-            });
-
-            setEntityCustomData(GRABBABLE_DATA_KEY, hoop, {
-                grabbable: false
-            });
-        }
-
-        function createWand(position) {
-            var WAND_MODEL = 'http://hifi-public.s3.amazonaws.com/james/bubblewand/models/wand/wand.fbx';
-            var WAND_COLLISION_SHAPE = 'http://hifi-public.s3.amazonaws.com/james/bubblewand/models/wand/actual_no_top_collision_hull.obj';
-
-            var entity = Entities.addEntity({
-                name: 'Bubble Wand',
-                type: "Model",
-                modelURL: WAND_MODEL,
-                position: position,
-                gravity: {
-                    x: 0,
-                    y: -9.8,
-                    z: 0
-                },
-                dimensions: {
-                    x: 0.05,
-                    y: 0.25,
-                    z: 0.05
-                },
-                //must be enabled to be grabbable in the physics engine
-                shapeType: 'compound',
-                collisionsWillMove: true,
-                compoundShapeURL: WAND_COLLISION_SHAPE,
-                //Look into why bubble wand is going through table when gravity is enabled
-                // gravity: {x: 0, y: -3.5, z: 0},
-                // velocity: {x: 0, y: -0.01, z:0},
-                script: wandScriptURL
-            });
-
-            setEntityCustomData(resetKey, entity, {
-                resetMe: true
-            });
-        }
-
-        function createBasketBall(position) {
-
-            var modelURL = "http://s3.amazonaws.com/hifi-public/models/content/basketball2.fbx";
-
-            var entity = Entities.addEntity({
-                type: "Model",
-                modelURL: modelURL,
-                position: position,
-                collisionsWillMove: true,
-                shapeType: "sphere",
-                name: "basketball",
-                dimensions: {
-                    x: 0.25,
-                    y: 0.26,
-                    z: 0.25
-                },
-                gravity: {
-                    x: 0,
-                    y: -7,
-                    z: 0
-                },
-                restitution: 10,
-                linearDamping: 0.0,
-                velocity: {
-                    x: 0,
-                    y: -0.01,
-                    z: 0
-                },
-                collisionSoundURL: "http://s3.amazonaws.com/hifi-public/sounds/basketball/basketball.wav"
-            });
-
-            setEntityCustomData(resetKey, entity, {
-                resetMe: true
-            });
-        }
-
-        function createDoll(position) {
-            var modelURL = "http://hifi-public.s3.amazonaws.com/models/Bboys/bboy2/bboy2.fbx";
-
-            var naturalDimensions = {
-                x: 1.63,
-                y: 1.67,
-                z: 0.26
-            };
-            var desiredDimensions = Vec3.multiply(naturalDimensions, 0.15);
-            var entity = Entities.addEntity({
-                type: "Model",
-                name: "doll",
-                modelURL: modelURL,
-                script: dollScriptURL,
-                position: position,
-                shapeType: 'box',
-                dimensions: desiredDimensions,
-                gravity: {
-                    x: 0,
-                    y: -5,
-                    z: 0
-                },
-                velocity: {
-                    x: 0,
-                    y: -0.1,
-                    z: 0
-                },
-                collisionsWillMove: true
-            });
-
-            setEntityCustomData(resetKey, entity, {
-                resetMe: true
-            });
-        }
-
-        function createSprayCan(position) {
-
-            var modelURL = "https://hifi-public.s3.amazonaws.com/eric/models/paintcan.fbx";
-
-            var entity = Entities.addEntity({
-                type: "Model",
-                name: "spraycan",
-                script: sprayPaintScriptURL,
-                modelURL: modelURL,
-                position: position,
-                dimensions: {
-                    x: 0.07,
-                    y: 0.17,
-                    z: 0.07
-                },
-                collisionsWillMove: true,
-                shapeType: 'box',
-                gravity: {
-                    x: 0,
-                    y: -0.5,
-                    z: 0
-                },
-                velocity: {
-                    x: 0,
-                    y: -1,
-                    z: 0
-                }
-            });
-
-            setEntityCustomData(resetKey, entity, {
-                resetMe: true
-            });
-
-        }
-
-        function createPottedPlant(position) {
-            var modelURL = "http://hifi-public.s3.amazonaws.com/models/potted_plant/potted_plant.fbx";
-
-            var entity = Entities.addEntity({
-                type: "Model",
-                name: "Potted Plant",
-                modelURL: modelURL,
-                position: position,
-                dimensions: {
-                    x: 1.10,
-                    y: 2.18,
-                    z: 1.07
-                },
-                collisionsWillMove: true,
-                shapeType: 'box',
-                gravity: {
-                    x: 0,
-                    y: -9.8,
-                    z: 0
-                },
-                velocity: {
-                    x: 0,
-                    y: 0,
-                    z: 0
-                },
-                linearDamping: 0.4
-            });
-
-            setEntityCustomData(resetKey, entity, {
-                resetMe: true
-            });
-
-
-            setEntityCustomData(GRABBABLE_DATA_KEY, entity, {
-                grabbable: false
-            });
-        }
-
-
-        function createCombinedArmChair(position) {
-            var modelURL = "http://hifi-public.s3.amazonaws.com/models/red_arm_chair/combined_chair.fbx";
-            var RED_ARM_CHAIR_COLLISION_HULL = "http://hifi-public.s3.amazonaws.com/models/red_arm_chair/red_arm_chair_collision_hull.obj";
-
-            var rotation = Quat.fromPitchYawRollDegrees(0, -143, 0);
-
-            var entity = Entities.addEntity({
-                type: "Model",
-                name: "Red Arm Chair",
-                modelURL: modelURL,
-                shapeType: 'compound',
-                compoundShapeURL: RED_ARM_CHAIR_COLLISION_HULL,
-                position: position,
-                rotation: rotation,
-                dimensions: {
-                    x: 1.26,
-                    y: 1.56,
-                    z: 1.35
-                },
-                collisionsWillMove: true,
-                gravity: {
-                    x: 0,
-                    y: -0.8,
-                    z: 0
-                },
-                velocity: {
-                    x: 0,
-                    y: 0,
-                    z: 0
-                },
-                linearDamping: 0.2
-            });
-
-            setEntityCustomData(resetKey, entity, {
-                resetMe: true
-            });
-
-            setEntityCustomData(GRABBABLE_DATA_KEY, entity, {
-                grabbable: false
-            });
-        }
-
-        function createBlocks(position) {
-            var baseURL = HIFI_PUBLIC_BUCKET + "models/content/planky/";
-            var collisionSoundURL = "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/ToyWoodBlock.L.wav";
-            var NUM_BLOCKS_PER_COLOR = 4;
-            var i, j;
-
-            var blockTypes = [{
-                url: "planky_blue.fbx",
-                dimensions: {
-                    x: 0.05,
-                    y: 0.05,
-                    z: 0.25
-                }
-            }, {
-                url: "planky_green.fbx",
-                dimensions: {
-                    x: 0.1,
-                    y: 0.1,
-                    z: 0.25
-                }
-            }, {
-                url: "planky_natural.fbx",
-                dimensions: {
-                    x: 0.05,
-                    y: 0.05,
-                    z: 0.05
-                }
-            }, {
-                url: "planky_yellow.fbx",
-                dimensions: {
-                    x: 0.03,
-                    y: 0.05,
-                    z: 0.25
-                }
-            }, {
-                url: "planky_red.fbx",
-                dimensions: {
-                    x: 0.1,
-                    y: 0.05,
-                    z: 0.25
-                }
-            }, ];
-
-            var modelURL, entity;
-            for (i = 0; i < blockTypes.length; i++) {
-                for (j = 0; j < NUM_BLOCKS_PER_COLOR; j++) {
-                    modelURL = baseURL + blockTypes[i].url;
-                    entity = Entities.addEntity({
-                        type: "Model",
-                        modelURL: modelURL,
-                        position: Vec3.sum(position, {
-                            x: j / 10,
-                            y: i / 10,
-                            z: 0
-                        }),
-                        shapeType: 'box',
-                        name: "block",
-                        dimensions: blockTypes[i].dimensions,
-                        collisionsWillMove: true,
-                        collisionSoundURL: collisionSoundURL,
-                        gravity: {
-                            x: 0,
-                            y: -2.5,
-                            z: 0
-                        },
-                        velocity: {
-                            x: 0,
-                            y: -0.01,
-                            z: 0
-                        }
-                    });
-
-                    //customKey, id, data
-                    setEntityCustomData(resetKey, entity, {
-                        resetMe: true
-                    });
-                }
-            }
-        }
-
-        function cleanup() {
-            deleteAllToys();
-        }
-
-        if (shouldDeleteOnEndScript) {
-
-            Script.scriptEnding.connect(cleanup);
-        }
-    };
-
-    // entity scripts always need to return a newly constructed object of our type
-    return new ResetSwitch();
-});
\ No newline at end of file
+  // entity scripts always need to return a newly constructed object of our type
+  return new ResetSwitch();
+});
diff --git a/unpublishedScripts/masterReset.js b/unpublishedScripts/masterReset.js
index c7fcd69e30..6b4a2528cf 100644
--- a/unpublishedScripts/masterReset.js
+++ b/unpublishedScripts/masterReset.js
@@ -26,1254 +26,1249 @@ var targetsScriptURL = Script.resolvePath('../examples/toys/ping_pong_gun/wallTa
 
 
 MasterReset = function() {
-    var resetKey = "resetMe";
-    var GRABBABLE_DATA_KEY = "grabbableKey";
+  var resetKey = "resetMe";
+  var GRABBABLE_DATA_KEY = "grabbableKey";
 
-    var HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
+  var HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
 
-    var shouldDeleteOnEndScript = false;
+  var shouldDeleteOnEndScript = false;
 
-    //Before creating anything, first search a radius and delete all the things that should be deleted
-    deleteAllToys();
-    createAllToys();
+  //Before creating anything, first search a radius and delete all the things that should be deleted
+  deleteAllToys();
+  createAllToys();
 
-    function createAllToys() {
-        createBlocks({
-            x: 548.3,
-            y: 495.55,
-            z: 504.4
-        });
+  function createAllToys() {
+    createBlocks({
+      x: 548.3,
+      y: 495.55,
+      z: 504.4
+    });
 
-        createBasketBall({
-            x: 547.73,
-            y: 495.5,
-            z: 505.47
-        });
+    createBasketBall({
+      x: 547.73,
+      y: 495.5,
+      z: 505.47
+    });
 
-        createDoll({
-            x: 546.67,
-            y: 495.41,
-            z: 505.09
-        });
+    createDoll({
+      x: 546.67,
+      y: 495.41,
+      z: 505.09
+    });
 
-        createWand({
-            x: 546.71,
-            y: 495.55,
-            z: 506.15
-        });
+    createWand({
+      x: 546.71,
+      y: 495.55,
+      z: 506.15
+    });
 
-        createDice();
+    createDice();
 
-        createFlashlight({
-            x: 545.72,
-            y: 495.41,
-            z: 505.78
-        });
+    createFlashlight({
+      x: 545.72,
+      y: 495.41,
+      z: 505.78
+    });
 
 
 
-        createCombinedArmChair({
-            x: 549.29,
-            y: 494.9,
-            z: 508.22
-        });
+    createCombinedArmChair({
+      x: 549.29,
+      y: 494.9,
+      z: 508.22
+    });
 
-        createPottedPlant({
-            x: 554.26,
-            y: 495.2,
-            z: 504.53
-        });
+    createPottedPlant({
+      x: 554.26,
+      y: 495.2,
+      z: 504.53
+    });
 
-        createPingPongBallGun();
+    createPingPongBallGun();
 
-        createBasketballHoop();
-        createBasketballRack();
+    createBasketballHoop();
+    createBasketballRack();
 
-        createGates();
+    createGates();
 
-        createFire();
-        // Handles toggling of all sconce lights 
-        createLights();
+    createFire();
+    // Handles toggling of all sconce lights 
+    createLights();
 
 
 
-        createCat({
-            x: 551.09,
-            y: 494.98,
-            z: 503.49
-        });
+    createCat({
+      x: 551.09,
+      y: 494.98,
+      z: 503.49
+    });
 
 
-        createSprayCan({
-            x: 549.7,
-            y: 495.6,
-            z: 503.91
-        });
+    createSprayCan({
+      x: 549.7,
+      y: 495.6,
+      z: 503.91
+    });
 
-        createTargets();
+    createTargets();
 
-    }
+  }
 
-    function deleteAllToys() {
-        var entities = Entities.findEntities(MyAvatar.position, 100);
+  function deleteAllToys() {
+    var entities = Entities.findEntities(MyAvatar.position, 100);
 
-        entities.forEach(function(entity) {
-            //params: customKey, id, defaultValue
-            var shouldReset = getEntityCustomData(resetKey, entity, {}).resetMe;
-            if (shouldReset === true) {
-                Entities.deleteEntity(entity);
-            }
-        });
-    }
+    entities.forEach(function(entity) {
+      //params: customKey, id, defaultValue
+      var shouldReset = getEntityCustomData(resetKey, entity, {}).resetMe;
+      if (shouldReset === true) {
+        Entities.deleteEntity(entity);
+      }
+    });
+  }
 
-    function createFire() {
+  function createFire() {
 
 
-        var myOrientation = Quat.fromPitchYawRollDegrees(-90, 0, 0.0);
+    var myOrientation = Quat.fromPitchYawRollDegrees(-90, 0, 0.0);
 
-        var animationSettings = JSON.stringify({
-            fps: 30,
-            running: true,
-            loop: true,
-            firstFrame: 1,
-            lastFrame: 10000
-        });
+    var animationSettings = JSON.stringify({
+      fps: 30,
+      running: true,
+      loop: true,
+      firstFrame: 1,
+      lastFrame: 10000
+    });
 
 
-        var fire = Entities.addEntity({
-            type: "ParticleEffect",
-            name: "fire",
-            animationSettings: animationSettings,
-            textures: "https://hifi-public.s3.amazonaws.com/alan/Particles/Particle-Sprite-Smoke-1.png",
-            position: {
-                x: 551.45,
-                y: 494.82,
-                z: 502.05
-            },
-            emitRate: 100,
-            colorStart: {
-                red: 70,
-                green: 70,
-                blue: 137
-            },
-            color: {
-                red: 200,
-                green: 99,
-                blue: 42
-            },
-            colorFinish: {
-                red: 255,
-                green: 99,
-                blue: 32
-            },
-            radiusSpread: 0.01,
-            radiusStart: 0.02,
-            radiusEnd: 0.001,
-            particleRadius: 0.05,
-            radiusFinish: 0.0,
-            emitOrientation: myOrientation,
-            emitSpeed: 0.3,
-            speedSpread: 0.1,
-            alphaStart: 0.05,
-            alpha: 0.1,
-            alphaFinish: 0.05,
-            emitDimensions: {
-                x: 1,
-                y: 1,
-                z: 0.1
-            },
-            polarFinish: 0.1,
-            emitAcceleration: {
-                x: 0.0,
-                y: 0.0,
-                z: 0.0
-            },
-            accelerationSpread: {
-                x: 0.1,
-                y: 0.01,
-                z: 0.1
-            },
-            lifespan: 1
-        });
+    var fire = Entities.addEntity({
+      type: "ParticleEffect",
+      name: "fire",
+      animationSettings: animationSettings,
+      textures: "https://hifi-public.s3.amazonaws.com/alan/Particles/Particle-Sprite-Smoke-1.png",
+      position: {
+        x: 551.45,
+        y: 494.82,
+        z: 502.05
+      },
+      emitRate: 100,
+      colorStart: {
+        red: 70,
+        green: 70,
+        blue: 137
+      },
+      color: {
+        red: 200,
+        green: 99,
+        blue: 42
+      },
+      colorFinish: {
+        red: 255,
+        green: 99,
+        blue: 32
+      },
+      radiusSpread: 0.01,
+      radiusStart: 0.02,
+      radiusEnd: 0.001,
+      particleRadius: 0.05,
+      radiusFinish: 0.0,
+      emitOrientation: myOrientation,
+      emitSpeed: 0.3,
+      speedSpread: 0.1,
+      alphaStart: 0.05,
+      alpha: 0.1,
+      alphaFinish: 0.05,
+      emitDimensions: {
+        x: 1,
+        y: 1,
+        z: 0.1
+      },
+      polarFinish: 0.1,
+      emitAcceleration: {
+        x: 0.0,
+        y: 0.0,
+        z: 0.0
+      },
+      accelerationSpread: {
+        x: 0.1,
+        y: 0.01,
+        z: 0.1
+      },
+      lifespan: 1,
+      userData: JSON.stringify({
+        resetMe: {
+          resetMe: true
+        }
+      })
+    });
+  }
 
+  function createBasketballRack() {
+    var NUMBER_OF_BALLS = 4;
+    var DIAMETER = 0.30;
+    var RESET_DISTANCE = 1;
+    var MINIMUM_MOVE_LENGTH = 0.05;
+    var basketballURL = HIFI_PUBLIC_BUCKET + "models/content/basketball2.fbx";
+    var basketballCollisionSoundURL = HIFI_PUBLIC_BUCKET + "sounds/basketball/basketball.wav";
+    var rackURL = HIFI_PUBLIC_BUCKET + "models/basketball_hoop/basketball_rack.fbx";
+    var rackCollisionHullURL = HIFI_PUBLIC_BUCKET + "models/basketball_hoop/rack_collision_hull.obj";
 
-        setEntityCustomData(resetKey, fire, {
-            resetMe: true
-        });
-    }
+    var rackRotation = Quat.fromPitchYawRollDegrees(0, -90, 0);
 
-    function createBasketballRack() {
-        var NUMBER_OF_BALLS = 4;
-        var DIAMETER = 0.30;
-        var RESET_DISTANCE = 1;
-        var MINIMUM_MOVE_LENGTH = 0.05;
-        var basketballURL = HIFI_PUBLIC_BUCKET + "models/content/basketball2.fbx";
-        var basketballCollisionSoundURL = HIFI_PUBLIC_BUCKET + "sounds/basketball/basketball.wav";
-        var rackURL = HIFI_PUBLIC_BUCKET + "models/basketball_hoop/basketball_rack.fbx";
-        var rackCollisionHullURL = HIFI_PUBLIC_BUCKET + "models/basketball_hoop/rack_collision_hull.obj";
+    var rackStartPosition = {
+      x: 542.86,
+      y: 494.84,
+      z: 475.06
+    };
+    var rack = Entities.addEntity({
+      name: 'Basketball Rack',
+      type: "Model",
+      modelURL: rackURL,
+      position: rackStartPosition,
+      rotation: rackRotation,
+      shapeType: 'compound',
+      gravity: {
+        x: 0,
+        y: -9.8,
+        z: 0
+      },
+      linearDamping: 1,
+      dimensions: {
+        x: 0.4,
+        y: 1.37,
+        z: 1.73
+      },
+      collisionsWillMove: true,
+      ignoreForCollisions: false,
+      compoundShapeURL: rackCollisionHullURL,
+      userData: JSON.stringify({
+        resetMe: {
+          resetMe: true
+        },
+        grabbableKey: {
+          grabbable: false
+        }
 
-        var rackRotation = Quat.fromPitchYawRollDegrees(0, -90, 0);
+      })
+    });
 
-        var rackStartPosition = {
-            x: 542.86,
-            y: 494.84,
-            z: 475.06
+    var collidingBalls = [];
+    var originalBallPositions = [];
+
+    function createCollidingBalls() {
+      var position = rackStartPosition;
+
+      var i;
+      for (i = 0; i < NUMBER_OF_BALLS; i++) {
+        var ballPosition = {
+          x: position.x,
+          y: position.y + DIAMETER * 2,
+          z: position.z + (DIAMETER) - (DIAMETER * i)
         };
-        var rack = Entities.addEntity({
-            name: 'Basketball Rack',
-            type: "Model",
-            modelURL: rackURL,
-            position: rackStartPosition,
-            rotation: rackRotation,
-            shapeType: 'compound',
-            gravity: {
-                x: 0,
-                y: -9.8,
-                z: 0
-            },
-            linearDamping: 1,
-            dimensions: {
-                x: 0.4,
-                y: 1.37,
-                z: 1.73
-            },
-            collisionsWillMove: true,
-            ignoreForCollisions: false,
-            compoundShapeURL: rackCollisionHullURL
-        });
 
-        setEntityCustomData(resetKey, rack, {
-            resetMe: true
-        });
-
-        setEntityCustomData(GRABBABLE_DATA_KEY, rack, {
-            grabbable: false
-        });
-
-        var collidingBalls = [];
-        var originalBallPositions = [];
-
-        function createCollidingBalls() {
-            var position = rackStartPosition;
-
-            var i;
-            for (i = 0; i < NUMBER_OF_BALLS; i++) {
-                var ballPosition = {
-                    x: position.x,
-                    y: position.y + DIAMETER * 2,
-                    z: position.z + (DIAMETER) - (DIAMETER * i)
-                };
-
-                var collidingBall = Entities.addEntity({
-                    type: "Model",
-                    name: 'Colliding Basketball',
-                    shapeType: 'Sphere',
-                    position: {
-                        x: position.x + (DIAMETER * 2) - (DIAMETER * i),
-                        y: position.y + DIAMETER * 2,
-                        z: position.z
-                    },
-                    dimensions: {
-                        x: DIAMETER,
-                        y: DIAMETER,
-                        z: DIAMETER
-                    },
-                    restitution: 1.0,
-                    linearDamping: 0.00001,
-                    gravity: {
-                        x: 0,
-                        y: -9.8,
-                        z: 0
-                    },
-                    collisionsWillMove: true,
-                    ignoreForCollisions: false,
-                    modelURL: basketballURL,
-                });
-
-                collidingBalls.push(collidingBall);
-                originalBallPositions.push(position);
-
-                setEntityCustomData(resetKey, collidingBall, {
-                    resetMe: true
-                });
+        var collidingBall = Entities.addEntity({
+          type: "Model",
+          name: 'Colliding Basketball',
+          shapeType: 'Sphere',
+          position: {
+            x: position.x + (DIAMETER * 2) - (DIAMETER * i),
+            y: position.y + DIAMETER * 2,
+            z: position.z
+          },
+          dimensions: {
+            x: DIAMETER,
+            y: DIAMETER,
+            z: DIAMETER
+          },
+          restitution: 1.0,
+          linearDamping: 0.00001,
+          gravity: {
+            x: 0,
+            y: -9.8,
+            z: 0
+          },
+          collisionsWillMove: true,
+          ignoreForCollisions: false,
+          modelURL: basketballURL,
+          userData: JSON.stringify({
+            resetMe: {
+              resetMe: true
             }
-        }
+          })
+        });
 
-        function testBallDistanceFromStart() {
-            var resetCount = 0;
+        collidingBalls.push(collidingBall);
+        originalBallPositions.push(position);
+      }
+    }
 
-            collidingBalls.forEach(function(ball, index) {
-                var currentPosition = Entities.getEntityProperties(ball, "position").position;
-                var originalPosition = originalBallPositions[index];
-                var distance = Vec3.subtract(originalPosition, currentPosition);
-                var length = Vec3.length(distance);
+    function testBallDistanceFromStart() {
+      var resetCount = 0;
 
-                if (length > RESET_DISTANCE) {
-                    Script.setTimeout(function() {
-                        var newPosition = Entities.getEntityProperties(ball, "position").position;
-                        var moving = Vec3.length(Vec3.subtract(currentPosition, newPosition));
-                        if (moving < MINIMUM_MOVE_LENGTH) {
-                            resetCount++;
-                            if (resetCount === NUMBER_OF_BALLS) {
-                                deleteCollidingBalls();
-                                createCollidingBalls();
-                            }
-                        }
-                    }, 200);
-                }
-            });
-        }
+      collidingBalls.forEach(function(ball, index) {
+        var currentPosition = Entities.getEntityProperties(ball, "position").position;
+        var originalPosition = originalBallPositions[index];
+        var distance = Vec3.subtract(originalPosition, currentPosition);
+        var length = Vec3.length(distance);
 
-        function deleteEntity(entityID) {
-            if (entityID === rack) {
+        if (length > RESET_DISTANCE) {
+          Script.setTimeout(function() {
+            var newPosition = Entities.getEntityProperties(ball, "position").position;
+            var moving = Vec3.length(Vec3.subtract(currentPosition, newPosition));
+            if (moving < MINIMUM_MOVE_LENGTH) {
+              resetCount++;
+              if (resetCount === NUMBER_OF_BALLS) {
                 deleteCollidingBalls();
-                Script.clearInterval(distanceCheckInterval);
-                Entities.deletingEntity.disconnect(deleteEntity);
+                createCollidingBalls();
+              }
             }
+          }, 200);
         }
-
-        function deleteCollidingBalls() {
-            while (collidingBalls.length > 0) {
-                Entities.deleteEntity(collidingBalls.pop());
-            }
-        }
-
-        createCollidingBalls();
-        Entities.deletingEntity.connect(deleteEntity);
-
-        var distanceCheckInterval = Script.setInterval(testBallDistanceFromStart, 1000);
+      });
     }
 
-    function createTargets() {
+    function deleteEntity(entityID) {
+      if (entityID === rack) {
+        deleteCollidingBalls();
+        Script.clearInterval(distanceCheckInterval);
+        Entities.deletingEntity.disconnect(deleteEntity);
+      }
+    }
 
-        var MODEL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/target.fbx';
-        var COLLISION_HULL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/target_collision_hull.obj';
+    function deleteCollidingBalls() {
+      while (collidingBalls.length > 0) {
+        Entities.deleteEntity(collidingBalls.pop());
+      }
+    }
 
-        var RESET_DISTANCE = 1;
-        var TARGET_USER_DATA_KEY = 'hifi-ping_pong_target';
-        var NUMBER_OF_TARGETS = 6;
-        var TARGETS_PER_ROW = 3;
+    createCollidingBalls();
+    Entities.deletingEntity.connect(deleteEntity);
 
-        var TARGET_DIMENSIONS = {
-            x: 0.06,
-            y: 0.42,
-            z: 0.42
+    var distanceCheckInterval = Script.setInterval(testBallDistanceFromStart, 1000);
+  }
+
+  function createTargets() {
+
+    var MODEL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/target.fbx';
+    var COLLISION_HULL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/target_collision_hull.obj';
+
+    var RESET_DISTANCE = 1;
+    var TARGET_USER_DATA_KEY = 'hifi-ping_pong_target';
+    var NUMBER_OF_TARGETS = 6;
+    var TARGETS_PER_ROW = 3;
+
+    var TARGET_DIMENSIONS = {
+      x: 0.06,
+      y: 0.42,
+      z: 0.42
+    };
+
+    var VERTICAL_SPACING = TARGET_DIMENSIONS.y + 0.5;
+    var HORIZONTAL_SPACING = TARGET_DIMENSIONS.z + 0.5;
+
+
+    var startPosition = {
+      x: 548.68,
+      y: 497.30,
+      z: 509.74
+    };
+
+    var rotation = Quat.fromPitchYawRollDegrees(0, -55.25, 0);
+
+    var targetIntervalClearer = Entities.addEntity({
+      name: 'Target Interval Clearer - delete me to clear',
+      type: 'Box',
+      position: startPosition,
+      dimensions: TARGET_DIMENSIONS,
+      rotation: rotation,
+      visible: false,
+      collisionsWillMove: false,
+      ignoreForCollisions: true,
+      userData: JSON.stringify({
+        resetMe: {
+          resetMe: true
+        }
+      })
+    });
+
+    var targets = [];
+
+    var originalPositions = [];
+
+    function addTargets() {
+      var i;
+      var row = -1;
+      for (i = 0; i < NUMBER_OF_TARGETS; i++) {
+
+        if (i % TARGETS_PER_ROW === 0) {
+          row++;
+        }
+
+        var vHat = Quat.getFront(rotation);
+        var spacer = HORIZONTAL_SPACING * (i % TARGETS_PER_ROW) + (row * HORIZONTAL_SPACING / 2);
+        var multiplier = Vec3.multiply(spacer, vHat);
+        var position = Vec3.sum(startPosition, multiplier);
+        position.y = startPosition.y - (row * VERTICAL_SPACING);
+
+        originalPositions.push(position);
+
+        var targetProperties = {
+          name: 'Target',
+          type: 'Model',
+          modelURL: MODEL_URL,
+          shapeType: 'compound',
+          collisionsWillMove: true,
+          dimensions: TARGET_DIMENSIONS,
+          compoundShapeURL: COLLISION_HULL_URL,
+          position: position,
+          rotation: rotation,
+          script: targetsScriptURL,
+          userData: JSON.stringify({
+            resetMe: {
+              resetMe: true
+            }
+          })
         };
+        var target = Entities.addEntity(targetProperties);
+        targets.push(target);
+      }
+    }
 
-        var VERTICAL_SPACING = TARGET_DIMENSIONS.y + 0.5;
-        var HORIZONTAL_SPACING = TARGET_DIMENSIONS.z + 0.5;
+    function testTargetDistanceFromStart() {
+      targets.forEach(function(target, index) {
 
+        var currentPosition = Entities.getEntityProperties(target, "position").position;
+        var originalPosition = originalPositions[index];
+        var distance = Vec3.subtract(originalPosition, currentPosition);
+        var length = Vec3.length(distance);
 
-        var startPosition = {
-            x: 548.68,
-            y: 497.30,
-            z: 509.74
-        };
+        if (length > RESET_DISTANCE) {
 
-        var rotation = Quat.fromPitchYawRollDegrees(0, -55.25, 0);
+          Entities.deleteEntity(target);
 
-        var targetIntervalClearer = Entities.addEntity({
-            name: 'Target Interval Clearer - delete me to clear',
-            type: 'Box',
-            position: startPosition,
+          var targetProperties = {
+            name: 'Target',
+            type: 'Model',
+            modelURL: MODEL_URL,
+            shapeType: 'compound',
+            collisionsWillMove: true,
             dimensions: TARGET_DIMENSIONS,
-            color: {
-                red: 0,
-                green: 255,
-                blue: 0
-            },
+            compoundShapeURL: COLLISION_HULL_URL,
+            position: originalPositions[index],
             rotation: rotation,
-            visible: false,
-            collisionsWillMove: false,
-            ignoreForCollisions: true,
-        });
+            script: targetsScriptURL,
+            userData: JSON.stringify({
+              resetMe: {
+                resetMe: true
+              }
+            })
+          };
+          var target = Entities.addEntity(targetProperties);
+          targets[index] = target;
 
-        var targets = [];
-
-        var originalPositions = [];
-
-        function addTargets() {
-            var i;
-            var row = -1;
-            for (i = 0; i < NUMBER_OF_TARGETS; i++) {
-
-                if (i % TARGETS_PER_ROW === 0) {
-                    row++;
-                }
-
-                var vHat = Quat.getFront(rotation);
-                var spacer = HORIZONTAL_SPACING * (i % TARGETS_PER_ROW) + (row * HORIZONTAL_SPACING / 2);
-                var multiplier = Vec3.multiply(spacer, vHat);
-                var position = Vec3.sum(startPosition, multiplier);
-                position.y = startPosition.y - (row * VERTICAL_SPACING);
-
-                originalPositions.push(position);
-
-                var targetProperties = {
-                    name: 'Target',
-                    type: 'Model',
-                    modelURL: MODEL_URL,
-                    shapeType: 'compound',
-                    collisionsWillMove: true,
-                    dimensions: TARGET_DIMENSIONS,
-                    compoundShapeURL: COLLISION_HULL_URL,
-                    position: position,
-                    rotation: rotation,
-                    script: targetsScriptURL
-                };
-
-                targets.push(Entities.addEntity(targetProperties));
-            }
         }
-
-        function testTargetDistanceFromStart() {
-            targets.forEach(function(target, index) {
-
-                var currentPosition = Entities.getEntityProperties(target, "position").position;
-                var originalPosition = originalPositions[index];
-                var distance = Vec3.subtract(originalPosition, currentPosition);
-                var length = Vec3.length(distance);
-
-                if (length > RESET_DISTANCE) {
-
-                    Entities.deleteEntity(target);
-
-                    var targetProperties = {
-                        name: 'Target',
-                        type: 'Model',
-                        modelURL: MODEL_URL,
-                        shapeType: 'compound',
-                        collisionsWillMove: true,
-                        dimensions: TARGET_DIMENSIONS,
-                        compoundShapeURL: COLLISION_HULL_URL,
-                        position: originalPositions[index],
-                        rotation: rotation,
-                        script: targetsScriptURL
-                    };
-
-                    targets[index] = Entities.addEntity(targetProperties);
-                }
-            });
-        }
-
-
-        function deleteEntity(entityID) {
-            if (entityID === targetIntervalClearer) {
-                deleteTargets();
-                Script.clearInterval(distanceCheckInterval);
-                Entities.deletingEntity.disconnect(deleteEntity);
-            }
-        }
-
-        function deleteTargets() {
-            while (targets.length > 0) {
-                Entities.deleteEntity(targets.pop());
-            }
-            Entities.deleteEntity(targetIntervalClearer);
-        }
-
-        Entities.deletingEntity.connect(deleteEntity);
-        var distanceCheckInterval = Script.setInterval(testTargetDistanceFromStart, 1000);
-
-        addTargets();
-
+      });
     }
 
-    function createCat(position) {
 
-        var modelURL = "http://hifi-public.s3.amazonaws.com/ryan/Dark_Cat.fbx";
-        var animationURL = "http://hifi-public.s3.amazonaws.com/ryan/sleeping.fbx";
-        var animationSettings = JSON.stringify({
-            running: true,
-        });
-        var cat = Entities.addEntity({
-            type: "Model",
-            modelURL: modelURL,
-            name: "cat",
-            script: catScriptURL,
-            animationURL: animationURL,
-            animationSettings: animationSettings,
-            position: position,
-            rotation: {
-                w: 0.35020983219146729,
-                x: -4.57763671875e-05,
-                y: 0.93664455413818359,
-                z: -1.52587890625e-05
-            },
-            dimensions: {
-                x: 0.15723302960395813,
-                y: 0.50762706995010376,
-                z: 0.90716040134429932
-            },
-        });
-
-        setEntityCustomData(resetKey, cat, {
-            resetMe: true
-        });
+    function deleteEntity(entityID) {
+      if (entityID === targetIntervalClearer) {
+        deleteTargets();
+        Script.clearInterval(distanceCheckInterval);
+        Entities.deletingEntity.disconnect(deleteEntity);
+      }
     }
 
-    function createFlashlight(position) {
-        var modelURL = "https://hifi-public.s3.amazonaws.com/models/props/flashlight.fbx";
-
-        var flashlight = Entities.addEntity({
-            type: "Model",
-            modelURL: modelURL,
-            name: "flashlight",
-            script: flashlightScriptURL,
-            position: position,
-            dimensions: {
-                x: 0.08,
-                y: 0.30,
-                z: 0.08
-            },
-            collisionsWillMove: true,
-            gravity: {
-                x: 0,
-                y: -3.5,
-                z: 0
-            },
-            velocity: {
-                x: 0,
-                y: -0.01,
-                z: 0
-            },
-            shapeType: 'box',
-        });
-
-        setEntityCustomData(resetKey, flashlight, {
-            resetMe: true
-        });
-
+    function deleteTargets() {
+      while (targets.length > 0) {
+        Entities.deleteEntity(targets.pop());
+      }
+      Entities.deleteEntity(targetIntervalClearer);
     }
 
-    function createLights() {
-        var modelURL = "http://hifi-public.s3.amazonaws.com/ryan/lightswitch.fbx";
+    Entities.deletingEntity.connect(deleteEntity);
+    var distanceCheckInterval = Script.setInterval(testTargetDistanceFromStart, 1000);
+
+    addTargets();
+
+  }
+
+  function createCat(position) {
+
+    var modelURL = "http://hifi-public.s3.amazonaws.com/ryan/Dark_Cat.fbx";
+    var animationURL = "http://hifi-public.s3.amazonaws.com/ryan/sleeping.fbx";
+    var animationSettings = JSON.stringify({
+      running: true,
+    });
+    var cat = Entities.addEntity({
+      type: "Model",
+      modelURL: modelURL,
+      name: "cat",
+      script: catScriptURL,
+      animationURL: animationURL,
+      animationSettings: animationSettings,
+      position: position,
+      rotation: {
+        w: 0.35020983219146729,
+        x: -4.57763671875e-05,
+        y: 0.93664455413818359,
+        z: -1.52587890625e-05
+      },
+      dimensions: {
+        x: 0.15723302960395813,
+        y: 0.50762706995010376,
+        z: 0.90716040134429932
+      },
+      userData: JSON.stringify({
+        resetMe: {
+          resetMe: true
+        }
+      })
+    });
+
+  }
+
+  function createFlashlight(position) {
+    var modelURL = "https://hifi-public.s3.amazonaws.com/models/props/flashlight.fbx";
+
+    var flashlight = Entities.addEntity({
+      type: "Model",
+      modelURL: modelURL,
+      name: "flashlight",
+      script: flashlightScriptURL,
+      position: position,
+      dimensions: {
+        x: 0.08,
+        y: 0.30,
+        z: 0.08
+      },
+      collisionsWillMove: true,
+      gravity: {
+        x: 0,
+        y: -3.5,
+        z: 0
+      },
+      velocity: {
+        x: 0,
+        y: -0.01,
+        z: 0
+      },
+      shapeType: 'box',
+      userData: JSON.stringify({
+        resetMe: {
+          resetMe: true
+        }
+      })
+    });
 
 
-        var rotation = {
-            w: 0.63280689716339111,
-            x: 0.63280689716339111,
-            y: -0.31551080942153931,
-            z: 0.31548023223876953
-        };
-        var axis = {
-            x: 0,
-            y: 1,
+  }
+
+  function createLights() {
+    var modelURL = "http://hifi-public.s3.amazonaws.com/ryan/lightswitch.fbx";
+
+
+    var rotation = {
+      w: 0.63280689716339111,
+      x: 0.63280689716339111,
+      y: -0.31551080942153931,
+      z: 0.31548023223876953
+    };
+    var axis = {
+      x: 0,
+      y: 1,
+      z: 0
+    };
+    var dQ = Quat.angleAxis(180, axis);
+    rotation = Quat.multiply(rotation, dQ);
+
+    var lightSwitchHall = Entities.addEntity({
+      type: "Model",
+      modelURL: modelURL,
+      name: "Light Switch Hall",
+      script: lightsScriptURL,
+      position: {
+        x: 543.27764892578125,
+        y: 495.67999267578125,
+        z: 511.00564575195312
+      },
+      rotation: rotation,
+      dimensions: {
+        x: 0.10546875,
+        y: 0.032372996211051941,
+        z: 0.16242524981498718
+      },
+      userData: JSON.stringify({
+        resetMe: {
+          resetMe: true,
+          on: true,
+          type: "Hall Light"
+        }
+      })
+    });
+
+    var sconceLight1 = Entities.addEntity({
+      type: "Light",
+      position: {
+        x: 543.75,
+        y: 496.24,
+        z: 511.13
+      },
+      name: "Sconce 1 Light",
+      dimensions: {
+        x: 2.545,
+        y: 2.545,
+        z: 2.545
+      },
+      cutoff: 90,
+      color: {
+        red: 217,
+        green: 146,
+        blue: 24
+      },
+      userData: JSON.stringify({
+        resetMe: {
+          resetMe: true,
+          type: "Hall Light"
+        }
+      })
+    });
+
+    var sconceLight2 = Entities.addEntity({
+      type: "Light",
+      position: {
+        x: 540.1,
+        y: 496.24,
+        z: 505.57
+      },
+      name: "Sconce 2 Light",
+      dimensions: {
+        x: 2.545,
+        y: 2.545,
+        z: 2.545
+      },
+      cutoff: 90,
+      color: {
+        red: 217,
+        green: 146,
+        blue: 24
+      },
+      userData: JSON.stringify({
+        resetMe: {
+          resetMe: true,
+          type: "Hall Light"
+        }
+      })
+    });
+
+    rotation = {
+      w: 0.20082402229309082,
+      x: 0.20082402229309082,
+      y: -0.67800414562225342,
+      z: 0.67797362804412842
+    };
+    axis = {
+      x: 0,
+      y: 1,
+      z: 0
+    };
+    dQ = Quat.angleAxis(180, axis);
+    rotation = Quat.multiply(rotation, dQ);
+
+    var lightSwitchGarage = Entities.addEntity({
+      type: "Model",
+      modelURL: modelURL,
+      name: "Light Switch Garage",
+      script: lightsScriptURL,
+      position: {
+        x: 545.62,
+        y: 495.68,
+        z: 500.21
+      },
+      rotation: rotation,
+      dimensions: {
+        x: 0.10546875,
+        y: 0.032372996211051941,
+        z: 0.16242524981498718
+      },
+      userData: JSON.stringify({
+        resetMe: {
+          resetMe: true,
+          on: true,
+          type: "Garage Light"
+        }
+      })
+    });
+
+
+
+
+    var sconceLight3 = Entities.addEntity({
+      type: "Light",
+      position: {
+        x: 545.49468994140625,
+        y: 496.24026489257812,
+        z: 500.63516235351562
+      },
+
+      name: "Sconce 3 Light",
+      dimensions: {
+        x: 2.545,
+        y: 2.545,
+        z: 2.545
+      },
+      cutoff: 90,
+      color: {
+        red: 217,
+        green: 146,
+        blue: 24
+      },
+      userData: JSON.stringify({
+        resetMe: {
+          resetMe: true,
+          type: "Garage Light"
+        }
+      })
+    });
+
+
+    var sconceLight4 = Entities.addEntity({
+      type: "Light",
+      position: {
+        x: 550.90399169921875,
+        y: 496.24026489257812,
+        z: 507.90237426757812
+      },
+      name: "Sconce 4 Light",
+      dimensions: {
+        x: 2.545,
+        y: 2.545,
+        z: 2.545
+      },
+      cutoff: 90,
+      color: {
+        red: 217,
+        green: 146,
+        blue: 24
+      },
+      userData: JSON.stringify({
+        resetMe: {
+          resetMe: true,
+          type: "Garage Light"
+        }
+      })
+    });
+
+    var sconceLight5 = Entities.addEntity({
+      type: "Light",
+      position: {
+        x: 548.407958984375,
+        y: 496.24026489257812,
+        z: 509.5504150390625
+      },
+      name: "Sconce 5 Light",
+      dimensions: {
+        x: 2.545,
+        y: 2.545,
+        z: 2.545
+      },
+      cutoff: 90,
+      color: {
+        red: 217,
+        green: 146,
+        blue: 24
+      },
+      userData: JSON.stringify({
+        resetMe: {
+          resetMe: true,
+          type: "Garage Light"
+        }
+      })
+    });
+
+  }
+
+
+
+  function createDice() {
+    var diceProps = {
+      type: "Model",
+      modelURL: "http://s3.amazonaws.com/hifi-public/models/props/Dice/goldDie.fbx",
+      collisionSoundURL: "http://s3.amazonaws.com/hifi-public/sounds/dice/diceCollide.wav",
+      name: "dice",
+      position: {
+        x: 541,
+        y: 494.96,
+        z: 509.1
+      },
+      dimensions: {
+        x: 0.09,
+        y: 0.09,
+        z: 0.09
+      },
+      gravity: {
+        x: 0,
+        y: -3.5,
+        z: 0
+      },
+      velocity: {
+        x: 0,
+        y: -0.01,
+        z: 0
+      },
+      shapeType: "box",
+      collisionsWillMove: true,
+      userData: JSON.stringify({
+        resetMe: {
+          resetMe: true,
+        }
+      })
+    };
+    var dice1 = Entities.addEntity(diceProps);
+
+    diceProps.position = {
+      x: 541.05,
+      y: 494.96,
+      z: 509.0
+    };
+
+    var dice2 = Entities.addEntity(diceProps);
+
+  }
+
+
+  function createGates() {
+    var MODEL_URL = 'http://hifi-public.s3.amazonaws.com/ryan/fence.fbx';
+
+    var rotation = Quat.fromPitchYawRollDegrees(0, -16, 0);
+    var gate = Entities.addEntity({
+      name: 'Front Door Fence',
+      type: 'Model',
+      modelURL: MODEL_URL,
+      shapeType: 'box',
+      position: {
+        x: 531.15,
+        y: 495.11,
+        z: 520.20
+      },
+      dimensions: {
+        x: 1.42,
+        y: 1.13,
+        z: 0.2
+      },
+      rotation: rotation,
+      collisionsWillMove: true,
+      gravity: {
+        x: 0,
+        y: -100,
+        z: 0
+      },
+      linearDamping: 1,
+      angularDamping: 10,
+      mass: 10,
+      userData: JSON.stringify({
+        resetMe: {
+          resetMe: true,
+        },
+        grabbableKey: {
+          grabbable: false
+        }
+      })
+    });
+  }
+
+  function createPingPongBallGun() {
+    var MODEL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/ping_pong_gun.fbx';
+    var COLLISION_HULL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/ping_pong_gun_collision_hull.obj';
+
+    var position = {
+      x: 548.6,
+      y: 495.4,
+      z: 503.39
+    };
+
+    var rotation = Quat.fromPitchYawRollDegrees(0, 36, 0);
+
+    var pingPongGun = Entities.addEntity({
+      type: "Model",
+      modelURL: MODEL_URL,
+      shapeType: 'box',
+      script: pingPongScriptURL,
+      position: position,
+      rotation: rotation,
+      gravity: {
+        x: 0,
+        y: -9.8,
+        z: 0
+      },
+      dimensions: {
+        x: 0.08,
+        y: 0.21,
+        z: 0.47
+      },
+      collisionsWillMove: true,
+      userData: JSON.stringify({
+        resetMe: {
+          resetMe: true,
+        }
+      })
+    });
+  }
+
+  function createBasketballHoop() {
+    var position = {
+      x: 539.23,
+      y: 496.13,
+      z: 475.89
+    };
+    var rotation = Quat.fromPitchYawRollDegrees(0, 58.49, 0);
+
+    var hoopURL = "http://hifi-public.s3.amazonaws.com/models/basketball_hoop/basketball_hoop.fbx";
+    var hoopCollisionHullURL = "http://hifi-public.s3.amazonaws.com/models/basketball_hoop/basketball_hoop_collision_hull.obj";
+
+    var hoop = Entities.addEntity({
+      type: "Model",
+      modelURL: hoopURL,
+      position: position,
+      rotation: rotation,
+      shapeType: 'compound',
+      gravity: {
+        x: 0,
+        y: -9.8,
+        z: 0
+      },
+      dimensions: {
+        x: 1.89,
+        y: 3.99,
+        z: 3.79
+      },
+      compoundShapeURL: hoopCollisionHullURL,
+      userData: JSON.stringify({
+        resetMe: {
+          resetMe: true,
+        },
+        grabbaleKey: {
+          grabbable: false
+        }
+      })
+    });
+  }
+
+  function createWand(position) {
+    var WAND_MODEL = 'http://hifi-public.s3.amazonaws.com/james/bubblewand/models/wand/wand.fbx';
+    var WAND_COLLISION_SHAPE = 'http://hifi-public.s3.amazonaws.com/james/bubblewand/models/wand/actual_no_top_collision_hull.obj';
+
+    var entity = Entities.addEntity({
+      name: 'Bubble Wand',
+      type: "Model",
+      modelURL: WAND_MODEL,
+      position: position,
+      gravity: {
+        x: 0,
+        y: -9.8,
+        z: 0
+      },
+      dimensions: {
+        x: 0.05,
+        y: 0.25,
+        z: 0.05
+      },
+      //must be enabled to be grabbable in the physics engine
+      shapeType: 'compound',
+      collisionsWillMove: true,
+      compoundShapeURL: WAND_COLLISION_SHAPE,
+      //Look into why bubble wand is going through table when gravity is enabled
+      // gravity: {x: 0, y: -3.5, z: 0},
+      // velocity: {x: 0, y: -0.01, z:0},
+      script: wandScriptURL,
+      userData: JSON.stringify({
+        resetMe: {
+          resetMe: true,
+        }
+      })
+    });
+
+
+  }
+
+  function createBasketBall(position) {
+
+    var modelURL = "http://s3.amazonaws.com/hifi-public/models/content/basketball2.fbx";
+
+    var entity = Entities.addEntity({
+      type: "Model",
+      modelURL: modelURL,
+      position: position,
+      collisionsWillMove: true,
+      shapeType: "sphere",
+      name: "basketball",
+      dimensions: {
+        x: 0.25,
+        y: 0.26,
+        z: 0.25
+      },
+      gravity: {
+        x: 0,
+        y: -7,
+        z: 0
+      },
+      restitution: 10,
+      linearDamping: 0.0,
+      velocity: {
+        x: 0,
+        y: -0.01,
+        z: 0
+      },
+      collisionSoundURL: "http://s3.amazonaws.com/hifi-public/sounds/basketball/basketball.wav",
+      userData: JSON.stringify({
+        resetMe: {
+          resetMe: true,
+        }
+      })
+    });
+
+  }
+
+  function createDoll(position) {
+    var modelURL = "http://hifi-public.s3.amazonaws.com/models/Bboys/bboy2/bboy2.fbx";
+
+    var naturalDimensions = {
+      x: 1.63,
+      y: 1.67,
+      z: 0.26
+    };
+    var desiredDimensions = Vec3.multiply(naturalDimensions, 0.15);
+    var entity = Entities.addEntity({
+      type: "Model",
+      name: "doll",
+      modelURL: modelURL,
+      script: dollScriptURL,
+      position: position,
+      shapeType: 'box',
+      dimensions: desiredDimensions,
+      gravity: {
+        x: 0,
+        y: -5,
+        z: 0
+      },
+      velocity: {
+        x: 0,
+        y: -0.1,
+        z: 0
+      },
+      collisionsWillMove: true,
+      userData: JSON.stringify({
+        resetMe: {
+          resetMe: true,
+        }
+      })
+    });
+
+  }
+
+  function createSprayCan(position) {
+
+    var modelURL = "https://hifi-public.s3.amazonaws.com/eric/models/paintcan.fbx";
+
+    var entity = Entities.addEntity({
+      type: "Model",
+      name: "spraycan",
+      script: sprayPaintScriptURL,
+      modelURL: modelURL,
+      position: position,
+      dimensions: {
+        x: 0.07,
+        y: 0.17,
+        z: 0.07
+      },
+      collisionsWillMove: true,
+      shapeType: 'box',
+      gravity: {
+        x: 0,
+        y: -0.5,
+        z: 0
+      },
+      velocity: {
+        x: 0,
+        y: -1,
+        z: 0
+      },
+      userData: JSON.stringify({
+        resetMe: {
+          resetMe: true,
+        }
+      })
+    });
+
+  }
+
+  function createPottedPlant(position) {
+    var modelURL = "http://hifi-public.s3.amazonaws.com/models/potted_plant/potted_plant.fbx";
+
+    var entity = Entities.addEntity({
+      type: "Model",
+      name: "Potted Plant",
+      modelURL: modelURL,
+      position: position,
+      dimensions: {
+        x: 1.10,
+        y: 2.18,
+        z: 1.07
+      },
+      collisionsWillMove: true,
+      shapeType: 'box',
+      gravity: {
+        x: 0,
+        y: -9.8,
+        z: 0
+      },
+      velocity: {
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      linearDamping: 0.4,
+      userData: JSON.stringify({
+        resetMe: {
+          resetMe: true,
+        },
+        grabbableKey: {
+          grabbale: false
+        }
+      })
+    });
+  }
+
+
+  function createCombinedArmChair(position) {
+    var modelURL = "http://hifi-public.s3.amazonaws.com/models/red_arm_chair/combined_chair.fbx";
+    var RED_ARM_CHAIR_COLLISION_HULL = "http://hifi-public.s3.amazonaws.com/models/red_arm_chair/red_arm_chair_collision_hull.obj";
+
+    var rotation = Quat.fromPitchYawRollDegrees(0, -143, 0);
+
+    var entity = Entities.addEntity({
+      type: "Model",
+      name: "Red Arm Chair",
+      modelURL: modelURL,
+      shapeType: 'compound',
+      compoundShapeURL: RED_ARM_CHAIR_COLLISION_HULL,
+      position: position,
+      rotation: rotation,
+      dimensions: {
+        x: 1.26,
+        y: 1.56,
+        z: 1.35
+      },
+      collisionsWillMove: true,
+      gravity: {
+        x: 0,
+        y: -0.8,
+        z: 0
+      },
+      velocity: {
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      linearDamping: 0.2,
+      userData: JSON.stringify({
+        resetMe: {
+          resetMe: true,
+        },
+        grabbaleKey: {
+          grabbable: false
+        }
+      })
+    });
+
+  }
+
+  function createBlocks(position) {
+    var baseURL = HIFI_PUBLIC_BUCKET + "models/content/planky/";
+    var collisionSoundURL = "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/ToyWoodBlock.L.wav";
+    var NUM_BLOCKS_PER_COLOR = 4;
+    var i, j;
+
+    var blockTypes = [{
+      url: "planky_blue.fbx",
+      dimensions: {
+        x: 0.05,
+        y: 0.05,
+        z: 0.25
+      }
+    }, {
+      url: "planky_green.fbx",
+      dimensions: {
+        x: 0.1,
+        y: 0.1,
+        z: 0.25
+      }
+    }, {
+      url: "planky_natural.fbx",
+      dimensions: {
+        x: 0.05,
+        y: 0.05,
+        z: 0.05
+      }
+    }, {
+      url: "planky_yellow.fbx",
+      dimensions: {
+        x: 0.03,
+        y: 0.05,
+        z: 0.25
+      }
+    }, {
+      url: "planky_red.fbx",
+      dimensions: {
+        x: 0.1,
+        y: 0.05,
+        z: 0.25
+      }
+    },];
+
+    var modelURL, entity;
+    for (i = 0; i < blockTypes.length; i++) {
+      for (j = 0; j < NUM_BLOCKS_PER_COLOR; j++) {
+        modelURL = baseURL + blockTypes[i].url;
+        entity = Entities.addEntity({
+          type: "Model",
+          modelURL: modelURL,
+          position: Vec3.sum(position, {
+            x: j / 10,
+            y: i / 10,
             z: 0
-        };
-        var dQ = Quat.angleAxis(180, axis);
-        rotation = Quat.multiply(rotation, dQ);
-
-        var lightSwitchHall = Entities.addEntity({
-            type: "Model",
-            modelURL: modelURL,
-            name: "Light Switch Hall",
-            script: lightsScriptURL,
-            position: {
-                x: 543.27764892578125,
-                y: 495.67999267578125,
-                z: 511.00564575195312
-            },
-            rotation: rotation,
-            dimensions: {
-                x: 0.10546875,
-                y: 0.032372996211051941,
-                z: 0.16242524981498718
-            }
-        });
-        setEntityCustomData(resetKey, lightSwitchHall, {
-            resetMe: true,
-            on: true,
-            type: "Hall Light"
-        });
-
-        var sconceLight1 = Entities.addEntity({
-            type: "Light",
-            position: {
-                x: 543.75,
-                y: 496.24,
-                z: 511.13
-            },
-            name: "Sconce 1 Light",
-            dimensions: {
-                x: 2.545,
-                y: 2.545,
-                z: 2.545
-            },
-            cutoff: 90,
-            color: {
-                red: 217,
-                green: 146,
-                blue: 24
-            }
-        });
-
-        setEntityCustomData(resetKey, sconceLight1, {
-            resetMe: true,
-            type: "Hall Light",
-        });
-
-        var sconceLight2 = Entities.addEntity({
-            type: "Light",
-            position: {
-                x: 540.1,
-                y: 496.24,
-                z: 505.57
-            },
-            name: "Sconce 2 Light",
-            dimensions: {
-                x: 2.545,
-                y: 2.545,
-                z: 2.545
-            },
-            cutoff: 90,
-            color: {
-                red: 217,
-                green: 146,
-                blue: 24
-            }
-        });
-
-        setEntityCustomData(resetKey, sconceLight2, {
-            resetMe: true,
-            type: "Hall Light",
-        });
-
-
-        rotation = {
-            w: 0.20082402229309082,
-            x: 0.20082402229309082,
-            y: -0.67800414562225342,
-            z: 0.67797362804412842
-        };
-        axis = {
+          }),
+          shapeType: 'box',
+          name: "block",
+          dimensions: blockTypes[i].dimensions,
+          collisionsWillMove: true,
+          collisionSoundURL: collisionSoundURL,
+          gravity: {
             x: 0,
-            y: 1,
+            y: -2.5,
             z: 0
-        };
-        dQ = Quat.angleAxis(180, axis);
-        rotation = Quat.multiply(rotation, dQ);
-
-        var lightSwitchGarage = Entities.addEntity({
-            type: "Model",
-            modelURL: modelURL,
-            name: "Light Switch Garage",
-            script: lightsScriptURL,
-            position: {
-                x: 545.62,
-                y: 495.68,
-                z: 500.21
-            },
-            rotation: rotation,
-            dimensions: {
-                x: 0.10546875,
-                y: 0.032372996211051941,
-                z: 0.16242524981498718
+          },
+          velocity: {
+            x: 0,
+            y: -0.01,
+            z: 0
+          },
+          userData: JSON.stringify({
+            resetMe: {
+              resetMe: true,
             }
+          })
         });
 
-        setEntityCustomData(resetKey, lightSwitchGarage, {
-            resetMe: true,
-            on: true,
-            type: "Garage Light"
-        });
-
-
-        var sconceLight3 = Entities.addEntity({
-            type: "Light",
-            position: {
-                x: 545.49468994140625,
-                y: 496.24026489257812,
-                z: 500.63516235351562
-            },
-
-            name: "Sconce 3 Light",
-            dimensions: {
-                x: 2.545,
-                y: 2.545,
-                z: 2.545
-            },
-            cutoff: 90,
-            color: {
-                red: 217,
-                green: 146,
-                blue: 24
-            }
-        });
-
-
-
-        setEntityCustomData(resetKey, sconceLight3, {
-            resetMe: true,
-            type: "Garage Light",
-        });
-
-        var sconceLight4 = Entities.addEntity({
-            type: "Light",
-            position: {
-                x: 550.90399169921875,
-                y: 496.24026489257812,
-                z: 507.90237426757812
-            },
-            name: "Sconce 4 Light",
-            dimensions: {
-                x: 2.545,
-                y: 2.545,
-                z: 2.545
-            },
-            cutoff: 90,
-            color: {
-                red: 217,
-                green: 146,
-                blue: 24
-            }
-        });
-
-        setEntityCustomData(resetKey, sconceLight4, {
-            resetMe: true,
-            type: "Garage Light",
-        });
-
-        var sconceLight5 = Entities.addEntity({
-            type: "Light",
-            position: {
-                x: 548.407958984375,
-                y: 496.24026489257812,
-                z: 509.5504150390625
-            },
-            name: "Sconce 5 Light",
-            dimensions: {
-                x: 2.545,
-                y: 2.545,
-                z: 2.545
-            },
-            cutoff: 90,
-            color: {
-                red: 217,
-                green: 146,
-                blue: 24
-            }
-        });
-
-        setEntityCustomData(resetKey, sconceLight5, {
-            resetMe: true,
-            type: "Garage Light",
-        });
-
+      }
     }
+  }
 
+  function cleanup() {
+    deleteAllToys();
+  }
 
+  if (shouldDeleteOnEndScript) {
 
-    function createDice() {
-        var diceProps = {
-            type: "Model",
-            modelURL: "http://s3.amazonaws.com/hifi-public/models/props/Dice/goldDie.fbx",
-            collisionSoundURL: "http://s3.amazonaws.com/hifi-public/sounds/dice/diceCollide.wav",
-            name: "dice",
-            position: {
-                x: 541,
-                y: 494.96,
-                z: 509.1
-            },
-            dimensions: {
-                x: 0.09,
-                y: 0.09,
-                z: 0.09
-            },
-            gravity: {
-                x: 0,
-                y: -3.5,
-                z: 0
-            },
-            velocity: {
-                x: 0,
-                y: -0.01,
-                z: 0
-            },
-            shapeType: "box",
-            collisionsWillMove: true
-        };
-        var dice1 = Entities.addEntity(diceProps);
-
-        diceProps.position = {
-            x: 541.05,
-            y: 494.96,
-            z: 509.0
-        };
-
-        var dice2 = Entities.addEntity(diceProps);
-
-        setEntityCustomData(resetKey, dice1, {
-            resetMe: true
-        });
-
-        setEntityCustomData(resetKey, dice2, {
-            resetMe: true
-        });
-    }
-
-
-    function createGates() {
-        var MODEL_URL = 'http://hifi-public.s3.amazonaws.com/ryan/fence.fbx';
-
-        var rotation1 = Quat.fromPitchYawRollDegrees(0, 36, 0);
-
-        var gate1 = Entities.addEntity({
-            name: 'Back Door Gate',
-            type: 'Model',
-            shapeType: 'box',
-            modelURL: MODEL_URL,
-            position: {
-                x: 546.52,
-                y: 494.76,
-                z: 498.87
-            },
-            dimensions: {
-                x: 1.42,
-                y: 1.13,
-                z: 0.25
-            },
-            rotation: rotation1,
-            collisionsWillMove: true,
-            gravity: {
-                x: 0,
-                y: -50,
-                z: 0
-            },
-            linearDamping: 1,
-            angularDamping: 10,
-            mass: 10,
-
-        });
-
-        setEntityCustomData(resetKey, gate1, {
-            resetMe: true
-        });
-
-        setEntityCustomData(GRABBABLE_DATA_KEY, gate1, {
-            grabbable: false
-        });
-
-        var rotation2 = Quat.fromPitchYawRollDegrees(0, -16, 0);
-        var gate2 = Entities.addEntity({
-            name: 'Front Door Fence',
-            type: 'Model',
-            modelURL: MODEL_URL,
-            shapeType: 'box',
-            position: {
-                x: 531.15,
-                y: 495.11,
-                z: 520.20
-            },
-            dimensions: {
-                x: 1.42,
-                y: 1.13,
-                z: 0.2
-            },
-            rotation: rotation2,
-            collisionsWillMove: true,
-            gravity: {
-                x: 0,
-                y: -100,
-                z: 0
-            },
-            linearDamping: 1,
-            angularDamping: 10,
-            mass: 10,
-        });
-
-        setEntityCustomData(resetKey, gate2, {
-            resetMe: true
-        });
-
-        setEntityCustomData(GRABBABLE_DATA_KEY, gate2, {
-            grabbable: false
-        });
-    }
-
-    function createPingPongBallGun() {
-        var MODEL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/ping_pong_gun.fbx';
-        var COLLISION_HULL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/ping_pong_gun_collision_hull.obj';
-
-        var position = {
-            x: 548.6,
-            y: 495.4,
-            z: 503.39
-        };
-
-        var rotation = Quat.fromPitchYawRollDegrees(0, 36, 0);
-
-        var pingPongGun = Entities.addEntity({
-            type: "Model",
-            modelURL: MODEL_URL,
-            shapeType: 'box',
-            script: pingPongScriptURL,
-            position: position,
-            rotation: rotation,
-            gravity: {
-                x: 0,
-                y: -9.8,
-                z: 0
-            },
-            dimensions: {
-                x: 0.08,
-                y: 0.21,
-                z: 0.47
-            },
-            collisionsWillMove: true,
-        });
-
-        setEntityCustomData(resetKey, pingPongGun, {
-            resetMe: true
-        });
-    }
-
-    function createBasketballHoop() {
-        var position = {
-            x: 539.23,
-            y: 496.13,
-            z: 475.89
-        };
-        var rotation = Quat.fromPitchYawRollDegrees(0, 58.49, 0);
-
-        var hoopURL = "http://hifi-public.s3.amazonaws.com/models/basketball_hoop/basketball_hoop.fbx";
-        var hoopCollisionHullURL = "http://hifi-public.s3.amazonaws.com/models/basketball_hoop/basketball_hoop_collision_hull.obj";
-
-        var hoop = Entities.addEntity({
-            type: "Model",
-            modelURL: hoopURL,
-            position: position,
-            rotation: rotation,
-            shapeType: 'compound',
-            gravity: {
-                x: 0,
-                y: -9.8,
-                z: 0
-            },
-            dimensions: {
-                x: 1.89,
-                y: 3.99,
-                z: 3.79
-            },
-            compoundShapeURL: hoopCollisionHullURL
-        });
-
-        setEntityCustomData(resetKey, hoop, {
-            resetMe: true
-        });
-
-        setEntityCustomData(GRABBABLE_DATA_KEY, hoop, {
-            grabbable: false
-        });
-    }
-
-    function createWand(position) {
-        var WAND_MODEL = 'http://hifi-public.s3.amazonaws.com/james/bubblewand/models/wand/wand.fbx';
-        var WAND_COLLISION_SHAPE = 'http://hifi-public.s3.amazonaws.com/james/bubblewand/models/wand/actual_no_top_collision_hull.obj';
-
-        var entity = Entities.addEntity({
-            name: 'Bubble Wand',
-            type: "Model",
-            modelURL: WAND_MODEL,
-            position: position,
-            gravity: {
-                x: 0,
-                y: -9.8,
-                z: 0
-            },
-            dimensions: {
-                x: 0.05,
-                y: 0.25,
-                z: 0.05
-            },
-            //must be enabled to be grabbable in the physics engine
-            shapeType: 'compound',
-            collisionsWillMove: true,
-            compoundShapeURL: WAND_COLLISION_SHAPE,
-            //Look into why bubble wand is going through table when gravity is enabled
-            // gravity: {x: 0, y: -3.5, z: 0},
-            // velocity: {x: 0, y: -0.01, z:0},
-            script: wandScriptURL
-        });
-
-        setEntityCustomData(resetKey, entity, {
-            resetMe: true
-        });
-    }
-
-    function createBasketBall(position) {
-
-        var modelURL = "http://s3.amazonaws.com/hifi-public/models/content/basketball2.fbx";
-
-        var entity = Entities.addEntity({
-            type: "Model",
-            modelURL: modelURL,
-            position: position,
-            collisionsWillMove: true,
-            shapeType: "sphere",
-            name: "basketball",
-            dimensions: {
-                x: 0.25,
-                y: 0.26,
-                z: 0.25
-            },
-            gravity: {
-                x: 0,
-                y: -7,
-                z: 0
-            },
-            restitution: 10,
-            linearDamping: 0.0,
-            velocity: {
-                x: 0,
-                y: -0.01,
-                z: 0
-            },
-            collisionSoundURL: "http://s3.amazonaws.com/hifi-public/sounds/basketball/basketball.wav"
-        });
-
-        setEntityCustomData(resetKey, entity, {
-            resetMe: true
-        });
-    }
-
-    function createDoll(position) {
-        var modelURL = "http://hifi-public.s3.amazonaws.com/models/Bboys/bboy2/bboy2.fbx";
-
-        var naturalDimensions = {
-            x: 1.63,
-            y: 1.67,
-            z: 0.26
-        };
-        var desiredDimensions = Vec3.multiply(naturalDimensions, 0.15);
-        var entity = Entities.addEntity({
-            type: "Model",
-            name: "doll",
-            modelURL: modelURL,
-            script: dollScriptURL,
-            position: position,
-            shapeType: 'box',
-            dimensions: desiredDimensions,
-            gravity: {
-                x: 0,
-                y: -5,
-                z: 0
-            },
-            velocity: {
-                x: 0,
-                y: -0.1,
-                z: 0
-            },
-            collisionsWillMove: true
-        });
-
-        setEntityCustomData(resetKey, entity, {
-            resetMe: true
-        });
-    }
-
-    function createSprayCan(position) {
-
-        var modelURL = "https://hifi-public.s3.amazonaws.com/eric/models/paintcan.fbx";
-
-        var entity = Entities.addEntity({
-            type: "Model",
-            name: "spraycan",
-            script: sprayPaintScriptURL,
-            modelURL: modelURL,
-            position: position,
-            dimensions: {
-                x: 0.07,
-                y: 0.17,
-                z: 0.07
-            },
-            collisionsWillMove: true,
-            shapeType: 'box',
-            gravity: {
-                x: 0,
-                y: -0.5,
-                z: 0
-            },
-            velocity: {
-                x: 0,
-                y: -1,
-                z: 0
-            }
-        });
-
-        setEntityCustomData(resetKey, entity, {
-            resetMe: true
-        });
-
-    }
-
-    function createPottedPlant(position) {
-        var modelURL = "http://hifi-public.s3.amazonaws.com/models/potted_plant/potted_plant.fbx";
-
-        var entity = Entities.addEntity({
-            type: "Model",
-            name: "Potted Plant",
-            modelURL: modelURL,
-            position: position,
-            dimensions: {
-                x: 1.10,
-                y: 2.18,
-                z: 1.07
-            },
-            collisionsWillMove: true,
-            shapeType: 'box',
-            gravity: {
-                x: 0,
-                y: -9.8,
-                z: 0
-            },
-            velocity: {
-                x: 0,
-                y: 0,
-                z: 0
-            },
-            linearDamping: 0.4
-        });
-
-        setEntityCustomData(resetKey, entity, {
-            resetMe: true
-        });
-
-
-        setEntityCustomData(GRABBABLE_DATA_KEY, entity, {
-            grabbable: false
-        });
-    }
-
-
-    function createCombinedArmChair(position) {
-        var modelURL = "http://hifi-public.s3.amazonaws.com/models/red_arm_chair/combined_chair.fbx";
-        var RED_ARM_CHAIR_COLLISION_HULL = "http://hifi-public.s3.amazonaws.com/models/red_arm_chair/red_arm_chair_collision_hull.obj";
-
-        var rotation = Quat.fromPitchYawRollDegrees(0, -143, 0);
-
-        var entity = Entities.addEntity({
-            type: "Model",
-            name: "Red Arm Chair",
-            modelURL: modelURL,
-            shapeType: 'compound',
-            compoundShapeURL: RED_ARM_CHAIR_COLLISION_HULL,
-            position: position,
-            rotation: rotation,
-            dimensions: {
-                x: 1.26,
-                y: 1.56,
-                z: 1.35
-            },
-            collisionsWillMove: true,
-            gravity: {
-                x: 0,
-                y: -0.8,
-                z: 0
-            },
-            velocity: {
-                x: 0,
-                y: 0,
-                z: 0
-            },
-            linearDamping: 0.2
-        });
-
-        setEntityCustomData(resetKey, entity, {
-            resetMe: true
-        });
-
-        setEntityCustomData(GRABBABLE_DATA_KEY, entity, {
-            grabbable: false
-        });
-    }
-
-    function createBlocks(position) {
-        var baseURL = HIFI_PUBLIC_BUCKET + "models/content/planky/";
-        var collisionSoundURL = "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/ToyWoodBlock.L.wav";
-        var NUM_BLOCKS_PER_COLOR = 4;
-        var i, j;
-
-        var blockTypes = [{
-            url: "planky_blue.fbx",
-            dimensions: {
-                x: 0.05,
-                y: 0.05,
-                z: 0.25
-            }
-        }, {
-            url: "planky_green.fbx",
-            dimensions: {
-                x: 0.1,
-                y: 0.1,
-                z: 0.25
-            }
-        }, {
-            url: "planky_natural.fbx",
-            dimensions: {
-                x: 0.05,
-                y: 0.05,
-                z: 0.05
-            }
-        }, {
-            url: "planky_yellow.fbx",
-            dimensions: {
-                x: 0.03,
-                y: 0.05,
-                z: 0.25
-            }
-        }, {
-            url: "planky_red.fbx",
-            dimensions: {
-                x: 0.1,
-                y: 0.05,
-                z: 0.25
-            }
-        }, ];
-
-        var modelURL, entity;
-        for (i = 0; i < blockTypes.length; i++) {
-            for (j = 0; j < NUM_BLOCKS_PER_COLOR; j++) {
-                modelURL = baseURL + blockTypes[i].url;
-                entity = Entities.addEntity({
-                    type: "Model",
-                    modelURL: modelURL,
-                    position: Vec3.sum(position, {
-                        x: j / 10,
-                        y: i / 10,
-                        z: 0
-                    }),
-                    shapeType: 'box',
-                    name: "block",
-                    dimensions: blockTypes[i].dimensions,
-                    collisionsWillMove: true,
-                    collisionSoundURL: collisionSoundURL,
-                    gravity: {
-                        x: 0,
-                        y: -2.5,
-                        z: 0
-                    },
-                    velocity: {
-                        x: 0,
-                        y: -0.01,
-                        z: 0
-                    }
-                });
-
-                //customKey, id, data
-                setEntityCustomData(resetKey, entity, {
-                    resetMe: true
-                });
-            }
-        }
-    }
-
-    function cleanup() {
-        deleteAllToys();
-    }
-
-    if (shouldDeleteOnEndScript) {
-
-        Script.scriptEnding.connect(cleanup);
-    }
-};
\ No newline at end of file
+    Script.scriptEnding.connect(cleanup);
+  }
+};