diff --git a/examples/toys/lightSwitch.js b/examples/toys/lightSwitch.js
index 932e773797..18c6d26185 100644
--- a/examples/toys/lightSwitch.js
+++ b/examples/toys/lightSwitch.js
@@ -1 +1,52 @@
-print("HEY THERE")
\ No newline at end of file
+//
+//  lightSwitch.js.js
+//  examples/entityScripts
+//
+//  Created by Eric Levin on 10/2/15.
+//  Copyright 2015 High Fidelity, Inc.
+//
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+/*global print, MyAvatar, Entities, AnimationCache, SoundCache, Scene, Camera, Overlays, Audio, HMD, AvatarList, AvatarManager, Controller, UndoStack, Window, Account, GlobalServices, Script, ScriptDiscoveryService, LODManager, Menu, Vec3, Quat, AudioDevice, Paths, Clipboard, Settings, XMLHttpRequest, pointInExtents, vec3equal, setEntityCustomData, getEntityCustomData */
+//per script
+
+/*global  LightSwitch */
+
+(function () {
+
+    var LightSwitch = function () {
+        this.switchSound = SoundCache.getSound("https://hifi-public.s3.amazonaws.com/sounds/Switches%20and%20sliders/lamp_switch_2.wav");
+        print("SHNUUUUR")
+
+    };
+
+    LightSwitch.prototype = {
+
+        clickReleaseOnEntity: function (entityID, mouseEvent) {
+            if (!mouseEvent.isLeftButton) {
+                return;
+            }
+            this.toggleLights();
+        },
+
+        toggleLights: function () {
+            print("TOGGLE LIGHTS");
+        },
+
+        startNearGrabNonColliding: function () {
+            this.toggleLights();
+        },
+
+        preload: function (entityID) {
+            this.entityID = entityID;
+            //The light switch is static, so just cache its position once
+            this.position = Entities.getEntityProperties(this.entityID, "position").position;
+        },
+    };
+
+    // entity scripts always need to return a newly constructed object of our type
+    return new LightSwitch();
+}());
\ No newline at end of file
diff --git a/unpublishedScripts/masterReset.js b/unpublishedScripts/masterReset.js
index fe29d8a8de..40cce2582c 100644
--- a/unpublishedScripts/masterReset.js
+++ b/unpublishedScripts/masterReset.js
@@ -106,155 +106,10 @@ function deleteAllToys() {
     });
 }
 
-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
-    });
-}
-
-
-function createCat(position) {
-    var scriptURL = Script.resolvePath("../examples/toys/cat.js");
-    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: scriptURL,
-        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 scriptURL = Script.resolvePath('../examples/toys/flashlight/flashlight.js');
-    var modelURL = "https://hifi-public.s3.amazonaws.com/models/props/flashlight.fbx";
-
-    var flashlight = Entities.addEntity({
-        type: "Model",
-        modelURL: modelURL,
-        name: "flashlight",
-        script: scriptURL,
-        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?v1";
+    var modelURL = "http://hifi-public.s3.amazonaws.com/ryan/lightswitch.fbx";
 
-    var scriptURL = Script.resolvePath("../examples/toys/lightSwitchHall.js");
+    var scriptURL = Script.resolvePath("../examples/toys/lightSwitch.js");
 
     var lightSwitchHall = Entities.addEntity({
         type: "Model",
@@ -450,6 +305,152 @@ function createLights() {
 
 }
 
+
+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
+    });
+}
+
+
+function createCat(position) {
+    var scriptURL = Script.resolvePath("../examples/toys/cat.js");
+    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: scriptURL,
+        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 scriptURL = Script.resolvePath('../examples/toys/flashlight/flashlight.js');
+    var modelURL = "https://hifi-public.s3.amazonaws.com/models/props/flashlight.fbx";
+
+    var flashlight = Entities.addEntity({
+        type: "Model",
+        modelURL: modelURL,
+        name: "flashlight",
+        script: scriptURL,
+        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 createDice() {
     var diceProps = {
         type: "Model",
@@ -967,4 +968,4 @@ function cleanup() {
 if (shouldDeleteOnEndScript) {
 
     Script.scriptEnding.connect(cleanup);
-}
+}
\ No newline at end of file