diff --git a/examples/edit.js b/examples/edit.js
index 09d30c712b..c45e66986a 100644
--- a/examples/edit.js
+++ b/examples/edit.js
@@ -1510,9 +1510,9 @@ PropertiesTool = function(opts) {
             if (entity.properties.rotation !== undefined) {
                 entity.properties.rotation = Quat.safeEulerAngles(entity.properties.rotation);
             }
-            if (entity.properties.keyLightDirection !== undefined) {
-                entity.properties.keyLightDirection = Vec3.multiply(RADIANS_TO_DEGREES, Vec3.toPolar(entity.properties.keyLightDirection));
-                entity.properties.keyLightDirection.z = 0.0;
+            if (entity.properties.keyLight.direction !== undefined) {
+                entity.properties.keyLight.direction = Vec3.multiply(RADIANS_TO_DEGREES, Vec3.toPolar(entity.properties.keyLight.direction));
+                entity.properties.keyLight.direction.z = 0.0;
             }
             selections.push(entity);
         }
@@ -1541,9 +1541,9 @@ PropertiesTool = function(opts) {
                     var rotation = data.properties.rotation;
                     data.properties.rotation = Quat.fromPitchYawRollDegrees(rotation.x, rotation.y, rotation.z);
                 }
-                if (data.properties.keyLightDirection !== undefined) {
-                    data.properties.keyLightDirection = Vec3.fromPolar(
-                        data.properties.keyLightDirection.x * DEGREES_TO_RADIANS, data.properties.keyLightDirection.y * DEGREES_TO_RADIANS);
+                if (data.properties.keyLight.direction !== undefined) {
+                    data.properties.keyLight.direction = Vec3.fromPolar(
+                        data.properties.keyLight.direction.x * DEGREES_TO_RADIANS, data.properties.keyLight.direction.y * DEGREES_TO_RADIANS);
                 }
                 Entities.editEntity(selectionManager.selections[0], data.properties);
                 if (data.properties.name != undefined) {
diff --git a/examples/html/entityProperties.html b/examples/html/entityProperties.html
index cffca523d7..b3d7a5f6b6 100644
--- a/examples/html/entityProperties.html
+++ b/examples/html/entityProperties.html
@@ -328,6 +328,7 @@
             var elZoneSections = document.querySelectorAll(".zone-section");
             allSections.push(elZoneSections);
             var elZoneStageSunModelEnabled = document.getElementById("property-zone-stage-sun-model-enabled");
+
             var elZoneKeyLightColor = document.getElementById("property-zone-key-light-color");
             var elZoneKeyLightColorRed = document.getElementById("property-zone-key-light-color-red");
             var elZoneKeyLightColorGreen = document.getElementById("property-zone-key-light-color-green");
@@ -337,6 +338,7 @@
             var elZoneKeyLightDirectionX = document.getElementById("property-zone-key-light-direction-x");
             var elZoneKeyLightDirectionY = document.getElementById("property-zone-key-light-direction-y");
             var elZoneKeyLightDirectionZ = document.getElementById("property-zone-key-light-direction-z");
+            var elZoneKeyLightAmbientURL = document.getElementById("property-zone-key-ambient-url");
 
             var elZoneStageLatitude = document.getElementById("property-zone-stage-latitude");
             var elZoneStageLongitude = document.getElementById("property-zone-stage-longitude");
@@ -568,15 +570,17 @@
                                 }
 
                                 elZoneStageSunModelEnabled.checked = properties.stage.sunModelEnabled;
-                                elZoneKeyLightColor.style.backgroundColor = "rgb(" + properties.keyLightColor.red  + "," + properties.keyLightColor.green + "," + properties.keyLightColor.blue + ")";
-                                elZoneKeyLightColorRed.value = properties.keyLightColor.red;
-                                elZoneKeyLightColorGreen.value = properties.keyLightColor.green;
-                                elZoneKeyLightColorBlue.value = properties.keyLightColor.blue;
-                                elZoneKeyLightIntensity.value = properties.keyLightIntensity.toFixed(2);
-                                elZoneKeyLightAmbientIntensity.value = properties.keyLightAmbientIntensity.toFixed(2);
-                                elZoneKeyLightDirectionX.value = properties.keyLightDirection.x.toFixed(2);
-                                elZoneKeyLightDirectionY.value = properties.keyLightDirection.y.toFixed(2);
-                                elZoneKeyLightDirectionZ.value = properties.keyLightDirection.z.toFixed(2);
+                                elZoneKeyLightColor.style.backgroundColor = "rgb(" + properties.keyLight.color.red  + "," + properties.keyLight.color.green + "," + properties.keyLight.color.blue + ")";
+                                elZoneKeyLightColorRed.value = properties.keyLight.color.red;
+                                elZoneKeyLightColorGreen.value = properties.keyLight.color.green;
+                                elZoneKeyLightColorBlue.value = properties.keyLight.color.blue;
+                                elZoneKeyLightIntensity.value = properties.keyLight.intensity.toFixed(2);
+                                elZoneKeyLightAmbientIntensity.value = properties.keyLight.ambientIntensity.toFixed(2);
+                                elZoneKeyLightDirectionX.value = properties.keyLight.direction.x.toFixed(2);
+                                elZoneKeyLightDirectionY.value = properties.keyLight.direction.y.toFixed(2);
+                                elZoneKeyLightDirectionZ.value = properties.keyLight.direction.z.toFixed(2);
+                                elZoneKeyLightAmbientURL.value = properties.keyLight.ambientURL;
+
 
                                 elZoneStageLatitude.value = properties.stage.latitude.toFixed(2);
                                 elZoneStageLongitude.value = properties.stage.longitude.toFixed(2);
@@ -819,21 +823,20 @@
                 onSubmit: function(hsb, hex, rgb, el) {
                     $(el).css('background-color', '#'+hex);
                     $(el).colpickHide();
-                    emitColorPropertyUpdate('keyLightColor', rgb.r, rgb.g, rgb.b);
+                    emitColorPropertyUpdate('color', rgb.r, rgb.g, rgb.b, 'keyLight');
                 }
             });
-            var zoneKeyLightColorChangeFunction = createEmitColorPropertyUpdateFunction(
-                'keyLightColor', elZoneKeyLightColorRed, elZoneKeyLightColorGreen, elZoneKeyLightColorBlue);
+            var zoneKeyLightColorChangeFunction = createEmitGroupColorPropertyUpdateFunction('keyLight','color', elZoneKeyLightColorRed, elZoneKeyLightColorGreen, elZoneKeyLightColorBlue);
             elZoneKeyLightColorRed.addEventListener('change', zoneKeyLightColorChangeFunction);
             elZoneKeyLightColorGreen.addEventListener('change', zoneKeyLightColorChangeFunction);
             elZoneKeyLightColorBlue.addEventListener('change', zoneKeyLightColorChangeFunction);
-            elZoneKeyLightIntensity.addEventListener('change', createEmitNumberPropertyUpdateFunction('keyLightIntensity'));
-            elZoneKeyLightAmbientIntensity.addEventListener('change', createEmitNumberPropertyUpdateFunction('keyLightAmbientIntensity'));
-            var zoneKeyLightDirectionChangeFunction = createEmitVec3PropertyUpdateFunction(
-                'keyLightDirection', elZoneKeyLightDirectionX, elZoneKeyLightDirectionY, elZoneKeyLightDirectionZ);
+            elZoneKeyLightIntensity.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('intensity','keyLight'));
+            elZoneKeyLightAmbientIntensity.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('keyLight','ambientIntensity'));
+            var zoneKeyLightDirectionChangeFunction = createEmitGroupVec3PropertyUpdateFunction('keyLight','direction', elZoneKeyLightDirectionX, elZoneKeyLightDirectionY, elZoneKeyLightDirectionZ);
             elZoneKeyLightDirectionX.addEventListener('change', zoneKeyLightDirectionChangeFunction);
             elZoneKeyLightDirectionY.addEventListener('change', zoneKeyLightDirectionChangeFunction);
             elZoneKeyLightDirectionZ.addEventListener('change', zoneKeyLightDirectionChangeFunction);
+            elZoneKeyLightAmbientURL.addEventListener('change', createEmitGroupTextPropertyUpdateFunction('keyLight','ambientURL'));
 
             elZoneStageLatitude.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('stage','latitude'));
             elZoneStageLongitude.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('stage','longitude'));
@@ -1476,8 +1479,12 @@
             </span>
         </div>
 
-        <div class="zone-section property">
-            <div class="label">Key Light Color</div>
+        <div class="sub-section-header zone-section keyLight-section">
+            <label>KeyLight</label>
+        </div>
+
+        <div class="zone-section keyLight-section property">
+            <div class="label">Light Color</div>
             <div class="value">
                 <div class='color-picker' id="property-zone-key-light-color"></div>
                 <div class="input-area">R <input class="coord" type='number' id="property-zone-key-light-color-red" min="0" max="255" step="1"></div>
@@ -1485,20 +1492,16 @@
                 <div class="input-area">B <input class="coord" type='number' id="property-zone-key-light-color-blue" min="0" max="255" step="1"></div>
             </div>
         </div>
-        <div class="zone-section property">
-            <div class="label">Key Light Intensity</div>
+
+        <div class="zone-section keyLight-section property">
+            <div class="label">Light Intensity</div>
             <div class="value">
                 <input class="coord" type='number' id="property-zone-key-intensity" min="0" max="10" step="0.1">
             </div>
         </div>
-        <div class="zone-section property">
-            <div class="label">Key Light Ambient Intensity</div>
-            <div class="value">
-                <input class="coord" type='number' id="property-zone-key-ambient-intensity" min="0" max="10" step="0.1">
-            </div>
-        </div>
-        <div class="zone-section property">
-            <div class="label">Key Light Direction</div>
+        
+        <div class="zone-section keyLight-section property">
+            <div class="label">Light Direction</div>
             <div class="value">
                 <div class="input-area">Pitch <input class="coord" type='number' id="property-zone-key-light-direction-x"></div>
                 <div class="input-area">Yaw <input class="coord" type='number' id="property-zone-key-light-direction-y"></div>
@@ -1506,46 +1509,69 @@
             </div>
         </div>
 
-        <div class="zone-section property">
+        <div class="zone-section keyLight-section property">
+            <div class="label">Ambient Intensity</div>
+            <div class="value">
+                <input class="coord" type='number' id="property-zone-key-ambient-intensity" min="0" max="10" step="0.1">
+            </div>
+        </div>
+
+        
+        <div class="zone-section keyLight-section property">
+            <div class="label">Ambient URL</div>
+            <div class="value">
+                <input type="text" id="property-zone-skybox-url" class="url">
+            </div>
+        </div>
+
+        <div class="sub-section-header zone-section stage-section">
+            <label>Stage</label>
+        </div>
+
+        <div class="zone-section stage-section property">
             <div class="label">Stage Latitude</div>
             <div class="value">
                 <input class="coord" type='number' id="property-zone-stage-latitude" min="-90" max="90" step="1">
             </div>
         </div>
-        <div class="zone-section property">
+        <div class="zone-section stage-section property">
             <div class="label">Stage Longitude</div>
             <div class="value">
                 <input class="coord" type='number' id="property-zone-stage-longitude" min="-180" max="180" step="1">
             </div>
         </div>
-        <div class="zone-section property">
+        <div class="zone-section stage-section property">
             <div class="label">Stage Altitude</div>
             <div class="value">
                 <input class="coord" type='number' id="property-zone-stage-altitude" step="1">
             </div>
         </div>
 
-        <div class="zone-section property">
+        <div class="zone-section stage-section property">
             <span class="label">Automatically calculate stage hour and day from location and clock.</span>
             <span class="value">
                 <input type='checkbox' id="property-zone-stage-automatic-hour-day">
             </span>
         </div>
 
-        <div class="zone-section property">
+        <div class="zone-section stage-section property">
             <div class="label">Stage Day</div>
             <div class="value">
                 <input class="coord" type='number' id="property-zone-stage-day" min="0" max="365" step="1">
             </div>
         </div>
-        <div class="zone-section property">
+        <div class="zone-section stage-section property">
             <div class="label">Stage Hour</div>
             <div class="value">
                 <input class="coord" type='number' id="property-zone-stage-hour" min="0" max="24" step="0.5">
             </div>
         </div>
 
-        <div class="zone-section property">
+        <div class="sub-section-header zone-section background-section">
+            <label>Background</label>
+        </div>
+
+        <div class="zone-section background-section property">
             <div class="label">Background Mode</div>
             <div class="value">
                 <select name="SelectBackgroundMode" id="property-zone-background-mode">
diff --git a/examples/toybox/AC_scripts/toybox_sounds.js b/examples/toybox/AC_scripts/toybox_sounds.js
index 67985a5938..ee87943f00 100644
--- a/examples/toybox/AC_scripts/toybox_sounds.js
+++ b/examples/toybox/AC_scripts/toybox_sounds.js
@@ -65,7 +65,7 @@ var soundMap = [{
             y: 495.60,
             z: 502.08
         },
-        volume: 0.25,
+        volume: 0.03,
         loop: true
     }
 }, {
@@ -73,14 +73,27 @@ var soundMap = [{
     url: "http://hifi-public.s3.amazonaws.com/ryan/dogs_barking_1.L.wav",
     audioOptions: {
         position: {
-            x: 551.61,
+            x: 523,
             y: 494.88,
-            z: 502.00
+            z: 469
         },
-        volume: 0.15,
+        volume: 0.05,
         loop: false
     },
     playAtInterval: 60 * 1000
+}, {
+    name: 'arcade game',
+    url: "http://hifi-public.s3.amazonaws.com/ryan/ARCADE_GAMES_VID.L.L.wav",
+    audioOptions: {
+        position: {
+            x: 543.77,
+            y: 495.07,
+            z: 502.25
+        },
+        volume: 0.01,
+        loop: false,
+    },
+    playAtInterval: 90 * 1000
 }];
 
 function loadSounds() {
diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
index 04f6c53e6a..adf66e2651 100644
--- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp
+++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
@@ -14,6 +14,7 @@
 #include <QEventLoop>
 #include <QScriptSyntaxCheckResult>
 
+#include <ColorUtils.h>
 #include <AbstractScriptingServicesInterface.h>
 #include <AbstractViewStateInterface.h>
 #include <DeferredLightingEffect.h>
@@ -269,10 +270,10 @@ void EntityTreeRenderer::applyZonePropertiesToScene(std::shared_ptr<ZoneEntityIt
             _previousStageDay = scene->getStageYearTime();
             _hasPreviousZone = true;
         }
-        scene->setKeyLightColor(zone->getKeyLightColorVec3());
-        scene->setKeyLightIntensity(zone->getKeyLightIntensity());
-        scene->setKeyLightAmbientIntensity(zone->getKeyLightAmbientIntensity());
-        scene->setKeyLightDirection(zone->getKeyLightDirection());
+        scene->setKeyLightColor(ColorUtils::toVec3(zone->getKeyLightProperties().getColor()));
+        scene->setKeyLightIntensity(zone->getKeyLightProperties().getIntensity());
+        scene->setKeyLightAmbientIntensity(zone->getKeyLightProperties().getAmbientIntensity());
+        scene->setKeyLightDirection(zone->getKeyLightProperties().getDirection());
         scene->setStageSunModelEnable(zone->getStageProperties().getSunModelEnabled());
         scene->setStageLocation(zone->getStageProperties().getLongitude(), zone->getStageProperties().getLatitude(),
                                 zone->getStageProperties().getAltitude());
diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index 19c8f779b4..002f1bb527 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -28,6 +28,7 @@ AnimationPropertyGroup EntityItemProperties::_staticAnimation;
 AtmospherePropertyGroup EntityItemProperties::_staticAtmosphere;
 SkyboxPropertyGroup EntityItemProperties::_staticSkybox;
 StagePropertyGroup EntityItemProperties::_staticStage;
+KeyLightPropertyGroup EntityItemProperties::_staticKeyLight;
 
 EntityPropertyList PROP_LAST_ITEM = (EntityPropertyList)(PROP_AFTER_LAST_ITEM - 1);
 
@@ -80,7 +81,8 @@ void EntityItemProperties::debugDump() const {
     getAnimation().debugDump();
     getAtmosphere().debugDump();
     getSkybox().debugDump();
-
+    getKeyLight().debugDump();
+    
     qCDebug(entities) << "   changed properties...";
     EntityPropertyFlags props = getChangedProperties();
     props.debugDumpBits();
@@ -235,10 +237,6 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
     CHECK_PROPERTY_CHANGE(PROP_RADIUS_FINISH, radiusFinish);
     CHECK_PROPERTY_CHANGE(PROP_MARKETPLACE_ID, marketplaceID);
     CHECK_PROPERTY_CHANGE(PROP_NAME, name);
-    CHECK_PROPERTY_CHANGE(PROP_KEYLIGHT_COLOR, keyLightColor);
-    CHECK_PROPERTY_CHANGE(PROP_KEYLIGHT_INTENSITY, keyLightIntensity);
-    CHECK_PROPERTY_CHANGE(PROP_KEYLIGHT_AMBIENT_INTENSITY, keyLightAmbientIntensity);
-    CHECK_PROPERTY_CHANGE(PROP_KEYLIGHT_DIRECTION, keyLightDirection);
     CHECK_PROPERTY_CHANGE(PROP_BACKGROUND_MODE, backgroundMode);
     CHECK_PROPERTY_CHANGE(PROP_SOURCE_URL, sourceUrl);
     CHECK_PROPERTY_CHANGE(PROP_VOXEL_VOLUME_SIZE, voxelVolumeSize);
@@ -263,6 +261,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
     CHECK_PROPERTY_CHANGE(PROP_Z_P_NEIGHBOR_ID, zPNeighborID);
 
     changedProperties += _animation.getChangedProperties();
+    changedProperties += _keyLight.getChangedProperties();
     changedProperties += _atmosphere.getChangedProperties();
     changedProperties += _skybox.getChangedProperties();
     changedProperties += _stage.getChangedProperties();
@@ -392,10 +391,8 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool
 
     // Zones only
     if (_type == EntityTypes::Zone) {
-        COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_KEYLIGHT_COLOR, keyLightColor);
-        COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_KEYLIGHT_INTENSITY, keyLightIntensity);
-        COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_KEYLIGHT_AMBIENT_INTENSITY, keyLightAmbientIntensity);
-        COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_KEYLIGHT_DIRECTION, keyLightDirection);
+        _keyLight.copyToScriptValue(_desiredProperties, properties, engine, skipDefaults, defaultEntityProperties);
+        
         COPY_PROPERTY_TO_QSCRIPTVALUE_GETTER(PROP_BACKGROUND_MODE, backgroundMode, getBackgroundModeAsString());
 
         _stage.copyToScriptValue(_desiredProperties, properties, engine, skipDefaults, defaultEntityProperties);
@@ -546,10 +543,6 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object, bool
     COPY_PROPERTY_FROM_QSCRIPTVALUE(name, QString, setName);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(collisionSoundURL, QString, setCollisionSoundURL);
 
-    COPY_PROPERTY_FROM_QSCRIPTVALUE(keyLightColor, xColor, setKeyLightColor);
-    COPY_PROPERTY_FROM_QSCRIPTVALUE(keyLightIntensity, float, setKeyLightIntensity);
-    COPY_PROPERTY_FROM_QSCRIPTVALUE(keyLightAmbientIntensity, float, setKeyLightAmbientIntensity);
-    COPY_PROPERTY_FROM_QSCRIPTVALUE(keyLightDirection, glmVec3, setKeyLightDirection);
     COPY_PROPERTY_FROM_QSCRITPTVALUE_ENUM(backgroundMode, BackgroundMode);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(sourceUrl, QString, setSourceUrl);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(voxelVolumeSize, glmVec3, setVoxelVolumeSize);
@@ -575,6 +568,7 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object, bool
     }
 
     _animation.copyFromScriptValue(object, _defaultSettings);
+    _keyLight.copyFromScriptValue(object, _defaultSettings);
     _atmosphere.copyFromScriptValue(object, _defaultSettings);
     _skybox.copyFromScriptValue(object, _defaultSettings);
     _stage.copyFromScriptValue(object, _defaultSettings);
@@ -968,11 +962,9 @@ bool EntityItemProperties::encodeEntityEditPacket(PacketType command, EntityItem
             }
 
             if (properties.getType() == EntityTypes::Zone) {
-                APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_COLOR, properties.getKeyLightColor());
-                APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_INTENSITY,  properties.getKeyLightIntensity());
-                APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_AMBIENT_INTENSITY, properties.getKeyLightAmbientIntensity());
-                APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_DIRECTION, properties.getKeyLightDirection());
-
+                _staticKeyLight.setProperties(properties);
+                _staticKeyLight.appendToEditPacket(packetData, requestedProperties, propertyFlags, propertiesDidntFit, propertyCount, appendState);
+                                                   
                 _staticStage.setProperties(properties);
                 _staticStage.appendToEditPacket(packetData, requestedProperties, propertyFlags, propertiesDidntFit, propertyCount, appendState);
 
@@ -1252,11 +1244,7 @@ bool EntityItemProperties::decodeEntityEditPacket(const unsigned char* data, int
     }
 
     if (properties.getType() == EntityTypes::Zone) {
-        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_KEYLIGHT_COLOR, xColor, setKeyLightColor);
-        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_KEYLIGHT_INTENSITY,  float, setKeyLightIntensity);
-        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_KEYLIGHT_AMBIENT_INTENSITY, float, setKeyLightAmbientIntensity);
-        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_KEYLIGHT_DIRECTION, glm::vec3, setKeyLightDirection);
-
+        properties.getKeyLight().decodeFromEditPacket(propertyFlags, dataAt , processedBytes);
         properties.getStage().decodeFromEditPacket(propertyFlags, dataAt , processedBytes);
 
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_SHAPE_TYPE, ShapeType, setShapeType);
@@ -1407,10 +1395,7 @@ void EntityItemProperties::markAllChanged() {
 
     _marketplaceIDChanged = true;
 
-    _keyLightColorChanged = true;
-    _keyLightIntensityChanged = true;
-    _keyLightAmbientIntensityChanged = true;
-    _keyLightDirectionChanged = true;
+    _keyLight.markAllChanged();
 
     _backgroundModeChanged = true;
 
@@ -1764,6 +1749,7 @@ QList<QString> EntityItemProperties::listChangedProperties() {
     }
 
     getAnimation().listChangedProperties(out);
+    getKeyLight().listChangedProperties(out);
     getAtmosphere().listChangedProperties(out);
     getSkybox().listChangedProperties(out);
     getStage().listChangedProperties(out);
diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h
index 2227644484..b95f4d35f4 100644
--- a/libraries/entities/src/EntityItemProperties.h
+++ b/libraries/entities/src/EntityItemProperties.h
@@ -160,10 +160,7 @@ public:
     DEFINE_PROPERTY(PROP_RADIUS_START, RadiusStart, radiusStart, float, ParticleEffectEntityItem::DEFAULT_RADIUS_START);
     DEFINE_PROPERTY(PROP_RADIUS_FINISH, RadiusFinish, radiusFinish, float, ParticleEffectEntityItem::DEFAULT_RADIUS_FINISH);
     DEFINE_PROPERTY_REF(PROP_MARKETPLACE_ID, MarketplaceID, marketplaceID, QString, ENTITY_ITEM_DEFAULT_MARKETPLACE_ID);
-    DEFINE_PROPERTY_REF(PROP_KEYLIGHT_COLOR, KeyLightColor, keyLightColor, xColor, ZoneEntityItem::DEFAULT_KEYLIGHT_COLOR);
-    DEFINE_PROPERTY(PROP_KEYLIGHT_INTENSITY, KeyLightIntensity, keyLightIntensity, float, ZoneEntityItem::DEFAULT_KEYLIGHT_INTENSITY);
-    DEFINE_PROPERTY(PROP_KEYLIGHT_AMBIENT_INTENSITY, KeyLightAmbientIntensity, keyLightAmbientIntensity, float, ZoneEntityItem::DEFAULT_KEYLIGHT_AMBIENT_INTENSITY);
-    DEFINE_PROPERTY_REF(PROP_KEYLIGHT_DIRECTION, KeyLightDirection, keyLightDirection, glm::vec3, ZoneEntityItem::DEFAULT_KEYLIGHT_DIRECTION);
+    DEFINE_PROPERTY_GROUP(KeyLight, keyLight, KeyLightPropertyGroup);
     DEFINE_PROPERTY_REF(PROP_VOXEL_VOLUME_SIZE, VoxelVolumeSize, voxelVolumeSize, glm::vec3, PolyVoxEntityItem::DEFAULT_VOXEL_VOLUME_SIZE);
     DEFINE_PROPERTY_REF(PROP_VOXEL_DATA, VoxelData, voxelData, QByteArray, PolyVoxEntityItem::DEFAULT_VOXEL_DATA);
     DEFINE_PROPERTY_REF(PROP_VOXEL_SURFACE_STYLE, VoxelSurfaceStyle, voxelSurfaceStyle, uint16_t, PolyVoxEntityItem::DEFAULT_VOXEL_SURFACE_STYLE);
diff --git a/libraries/entities/src/EntityPropertyFlags.h b/libraries/entities/src/EntityPropertyFlags.h
index d70a5c9616..51a0c34c76 100644
--- a/libraries/entities/src/EntityPropertyFlags.h
+++ b/libraries/entities/src/EntityPropertyFlags.h
@@ -189,7 +189,8 @@ enum EntityPropertyList {
     PROP_BACKGROUND_MODE = PROP_MODEL_URL,
     PROP_SKYBOX_COLOR = PROP_ANIMATION_URL,
     PROP_SKYBOX_URL = PROP_ANIMATION_FPS,
-
+    PROP_KEYLIGHT_AMBIENT_URL = PROP_ANIMATION_FRAME_INDEX,
+    
     // Aliases/Piggyback properties for Web. These properties intentionally reuse the enum values for
     // other properties which will never overlap with each other. 
     PROP_SOURCE_URL = PROP_MODEL_URL,
diff --git a/libraries/entities/src/KeyLightPropertyGroup.cpp b/libraries/entities/src/KeyLightPropertyGroup.cpp
new file mode 100644
index 0000000000..b7e0a70b85
--- /dev/null
+++ b/libraries/entities/src/KeyLightPropertyGroup.cpp
@@ -0,0 +1,211 @@
+//
+//  KeyLightPropertyGroup.h
+//  libraries/entities/src
+//
+//  Created by Sam Gateau on 2015/10/23.
+//  Copyright 2013 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
+//
+
+#include <QJsonDocument>
+#include <OctreePacketData.h>
+
+#include <AnimationLoop.h>
+
+#include "KeyLightPropertyGroup.h"
+#include "EntityItemProperties.h"
+#include "EntityItemPropertiesMacros.h"
+
+
+const xColor KeyLightPropertyGroup::DEFAULT_KEYLIGHT_COLOR = { 255, 255, 255 };
+const float KeyLightPropertyGroup::DEFAULT_KEYLIGHT_INTENSITY = 1.0f;
+const float KeyLightPropertyGroup::DEFAULT_KEYLIGHT_AMBIENT_INTENSITY = 0.5f;
+const glm::vec3 KeyLightPropertyGroup::DEFAULT_KEYLIGHT_DIRECTION = { 0.0f, -1.0f, 0.0f };
+
+void KeyLightPropertyGroup::copyToScriptValue(const EntityPropertyFlags& desiredProperties, QScriptValue& properties, QScriptEngine* engine, bool skipDefaults, EntityItemProperties& defaultEntityProperties) const {
+    
+    COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_KEYLIGHT_COLOR, KeyLight, keyLight, Color, color);
+    COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_KEYLIGHT_INTENSITY, KeyLight, keyLight, Intensity, intensity);
+    COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_KEYLIGHT_AMBIENT_INTENSITY, KeyLight, keyLight, AmbientIntensity, ambientIntensity);
+    COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_KEYLIGHT_DIRECTION, KeyLight, keyLight, Direction, direction);
+    COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_KEYLIGHT_AMBIENT_URL, KeyLight, keyLight, AmbientURL, ambientUrl);
+
+}
+
+void KeyLightPropertyGroup::copyFromScriptValue(const QScriptValue& object, bool& _defaultSettings) {
+
+    COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(keyLight, color, xColor, setColor);
+    COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(keyLight, intensity, float, setIntensity);
+    COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(keyLight, ambientIntensity, float, setAmbientIntensity);
+    COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(keyLight, direction, glmVec3, setDirection);
+    COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(keyLight, ambientURL, QString, setAmbientURL);
+    
+    // legacy property support
+    COPY_PROPERTY_FROM_QSCRIPTVALUE_GETTER(keyLightColor, xColor, setColor, getColor);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE_GETTER(keyLightIntensity, float, setIntensity, getIntensity);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE_GETTER(keyLightAmbientIntensity, float, setAmbientIntensity, getAmbientIntensity);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE_GETTER(keyLightDirection, glmVec3, setDirection, getDirection);
+}
+
+
+void KeyLightPropertyGroup::debugDump() const {
+    qDebug() << "   KeyLightPropertyGroup: ---------------------------------------------";
+    qDebug() << "        color:" << getColor(); // << "," << getColor()[1] << "," << getColor()[2];
+    qDebug() << "        intensity:" << getIntensity();
+    qDebug() << "        direction:" << getDirection();
+    qDebug() << "        ambientIntensity:" << getAmbientIntensity();
+    qDebug() << "        ambientURL:" << getAmbientURL();
+}
+
+void KeyLightPropertyGroup::listChangedProperties(QList<QString>& out) {
+    if (colorChanged()) {
+        out << "keyLight-color";
+    }
+    if (intensityChanged()) {
+        out << "keyLight-intensity";
+    }
+    if (directionChanged()) {
+        out << "keyLight-direction";
+    }
+    if (ambientIntensityChanged()) {
+        out << "keyLight-ambientIntensity";
+    }
+    if (ambientURLChanged()) {
+        out << "keyLight-ambientURL";
+    }
+}
+
+
+bool KeyLightPropertyGroup::appendToEditPacket(OctreePacketData* packetData,
+                                    EntityPropertyFlags& requestedProperties,
+                                    EntityPropertyFlags& propertyFlags,
+                                    EntityPropertyFlags& propertiesDidntFit,
+                                    int& propertyCount, 
+                                    OctreeElement::AppendState& appendState) const {
+
+    bool successPropertyFits = true;
+    
+    APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_COLOR, getColor());
+    APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_INTENSITY, getIntensity());
+    APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_AMBIENT_INTENSITY, getAmbientIntensity());
+    APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_DIRECTION, getDirection());
+    APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_AMBIENT_URL, getAmbientURL());
+    
+    return true;
+}
+
+
+bool KeyLightPropertyGroup::decodeFromEditPacket(EntityPropertyFlags& propertyFlags, const unsigned char*& dataAt , int& processedBytes) {
+
+    int bytesRead = 0;
+    bool overwriteLocalData = true;
+    bool somethingChanged = false;
+    
+    READ_ENTITY_PROPERTY(PROP_KEYLIGHT_COLOR, xColor, setColor);
+    READ_ENTITY_PROPERTY(PROP_KEYLIGHT_INTENSITY, float, setIntensity);
+    READ_ENTITY_PROPERTY(PROP_KEYLIGHT_AMBIENT_INTENSITY, float, setAmbientIntensity);
+    READ_ENTITY_PROPERTY(PROP_KEYLIGHT_DIRECTION, glm::vec3, setDirection);
+    READ_ENTITY_PROPERTY(PROP_KEYLIGHT_AMBIENT_URL, QString, setAmbientURL);
+    
+    
+    DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_KEYLIGHT_COLOR, Color);
+    DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_KEYLIGHT_INTENSITY, Intensity);
+    DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_KEYLIGHT_AMBIENT_INTENSITY, AmbientIntensity);
+    DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_KEYLIGHT_DIRECTION, Direction);
+    DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_KEYLIGHT_AMBIENT_URL, AmbientURL);
+    
+    processedBytes += bytesRead;
+
+    Q_UNUSED(somethingChanged);
+
+    return true;
+}
+
+void KeyLightPropertyGroup::markAllChanged() {
+    _colorChanged = true;
+    _intensityChanged = true;
+    _ambientIntensityChanged = true;
+    _directionChanged = true;
+    _ambientURLChanged = true;
+}
+
+EntityPropertyFlags KeyLightPropertyGroup::getChangedProperties() const {
+    EntityPropertyFlags changedProperties;
+ 
+    CHECK_PROPERTY_CHANGE(PROP_KEYLIGHT_COLOR, color);
+    CHECK_PROPERTY_CHANGE(PROP_KEYLIGHT_INTENSITY, intensity);
+    CHECK_PROPERTY_CHANGE(PROP_KEYLIGHT_AMBIENT_INTENSITY, ambientIntensity);
+    CHECK_PROPERTY_CHANGE(PROP_KEYLIGHT_DIRECTION, direction);
+    CHECK_PROPERTY_CHANGE(PROP_KEYLIGHT_AMBIENT_URL, ambientURL);
+    
+    return changedProperties;
+}
+
+void KeyLightPropertyGroup::getProperties(EntityItemProperties& properties) const {
+    
+    COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(KeyLight, Color, getColor);
+    COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(KeyLight, Intensity, getIntensity);
+    COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(KeyLight, AmbientIntensity, getAmbientIntensity);
+    COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(KeyLight, Direction, getDirection);
+    COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(KeyLight, AmbientURL, getAmbientURL);
+}
+
+bool KeyLightPropertyGroup::setProperties(const EntityItemProperties& properties) {
+    bool somethingChanged = false;
+
+    SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(KeyLight, Color, color, setColor);
+    SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(KeyLight, Intensity, intensity, setIntensity);
+    SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(KeyLight, AmbientIntensity, ambientIntensity, setAmbientIntensity);
+    SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(KeyLight, Direction, direction, setDirection);
+    SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(KeyLight, AmbientURL, ambientURL, setAmbientURL);
+
+    return somethingChanged;
+}
+
+EntityPropertyFlags KeyLightPropertyGroup::getEntityProperties(EncodeBitstreamParams& params) const {
+    EntityPropertyFlags requestedProperties;
+
+    requestedProperties += PROP_KEYLIGHT_COLOR;
+    requestedProperties += PROP_KEYLIGHT_INTENSITY;
+    requestedProperties += PROP_KEYLIGHT_AMBIENT_INTENSITY;
+    requestedProperties += PROP_KEYLIGHT_DIRECTION;
+    requestedProperties += PROP_KEYLIGHT_AMBIENT_URL;
+
+    return requestedProperties;
+}
+    
+void KeyLightPropertyGroup::appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params, 
+                                EntityTreeElementExtraEncodeData* entityTreeElementExtraEncodeData,
+                                EntityPropertyFlags& requestedProperties,
+                                EntityPropertyFlags& propertyFlags,
+                                EntityPropertyFlags& propertiesDidntFit,
+                                int& propertyCount, 
+                                OctreeElement::AppendState& appendState) const {
+
+    bool successPropertyFits = true;
+
+    APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_COLOR, getColor());
+    APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_INTENSITY, getIntensity());
+    APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_AMBIENT_INTENSITY, getAmbientIntensity());
+    APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_DIRECTION, getDirection());
+    APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_AMBIENT_URL, getAmbientURL());
+}
+
+int KeyLightPropertyGroup::readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead, 
+                                            ReadBitstreamToTreeParams& args,
+                                            EntityPropertyFlags& propertyFlags, bool overwriteLocalData,
+                                            bool& somethingChanged) {
+
+    int bytesRead = 0;
+    const unsigned char* dataAt = data;
+    
+    READ_ENTITY_PROPERTY(PROP_KEYLIGHT_COLOR, xColor, setColor);
+    READ_ENTITY_PROPERTY(PROP_KEYLIGHT_INTENSITY, float, setIntensity);
+    READ_ENTITY_PROPERTY(PROP_KEYLIGHT_AMBIENT_INTENSITY, float, setAmbientIntensity);
+    READ_ENTITY_PROPERTY(PROP_KEYLIGHT_DIRECTION, glm::vec3, setDirection);
+    READ_ENTITY_PROPERTY(PROP_KEYLIGHT_AMBIENT_URL, QString, setAmbientURL);
+
+    return bytesRead;
+}
diff --git a/libraries/entities/src/KeyLightPropertyGroup.h b/libraries/entities/src/KeyLightPropertyGroup.h
new file mode 100644
index 0000000000..b905a5a997
--- /dev/null
+++ b/libraries/entities/src/KeyLightPropertyGroup.h
@@ -0,0 +1,86 @@
+//
+//  KeyLightPropertyGroup.h
+//  libraries/entities/src
+//
+//  Created by Sam Gateau on 2015/10/23.
+//  Copyright 2013 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
+//
+
+
+#ifndef hifi_KeyLightPropertyGroup_h
+#define hifi_KeyLightPropertyGroup_h
+
+#include <stdint.h>
+
+#include <glm/glm.hpp>
+
+#include <QtScript/QScriptEngine>
+#include "EntityItemPropertiesMacros.h"
+#include "PropertyGroup.h"
+
+class EntityItemProperties;
+class EncodeBitstreamParams;
+class OctreePacketData;
+class EntityTreeElementExtraEncodeData;
+class ReadBitstreamToTreeParams;
+
+class KeyLightPropertyGroup : public PropertyGroup {
+public:
+    // EntityItemProperty related helpers
+    virtual void copyToScriptValue(const EntityPropertyFlags& desiredProperties, QScriptValue& properties, QScriptEngine* engine, bool skipDefaults, EntityItemProperties& defaultEntityProperties) const;
+    virtual void copyFromScriptValue(const QScriptValue& object, bool& _defaultSettings);
+    virtual void debugDump() const;
+    virtual void listChangedProperties(QList<QString>& out);
+
+    virtual bool appendToEditPacket(OctreePacketData* packetData,                                     
+                                    EntityPropertyFlags& requestedProperties,
+                                    EntityPropertyFlags& propertyFlags,
+                                    EntityPropertyFlags& propertiesDidntFit,
+                                    int& propertyCount, 
+                                    OctreeElement::AppendState& appendState) const;
+
+    virtual bool decodeFromEditPacket(EntityPropertyFlags& propertyFlags, const unsigned char*& dataAt , int& processedBytes);
+    virtual void markAllChanged();
+    virtual EntityPropertyFlags getChangedProperties() const;
+
+    // EntityItem related helpers
+    // methods for getting/setting all properties of an entity
+    virtual void getProperties(EntityItemProperties& propertiesOut) const;
+    
+    /// returns true if something changed
+    virtual bool setProperties(const EntityItemProperties& properties);
+
+    virtual EntityPropertyFlags getEntityProperties(EncodeBitstreamParams& params) const;
+        
+    virtual void appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params, 
+                                    EntityTreeElementExtraEncodeData* entityTreeElementExtraEncodeData,
+                                    EntityPropertyFlags& requestedProperties,
+                                    EntityPropertyFlags& propertyFlags,
+                                    EntityPropertyFlags& propertiesDidntFit,
+                                    int& propertyCount, 
+                                    OctreeElement::AppendState& appendState) const;
+
+    virtual int readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead, 
+                                                ReadBitstreamToTreeParams& args,
+                                                EntityPropertyFlags& propertyFlags, bool overwriteLocalData,
+                                                bool& somethingChanged);
+  
+    static const xColor DEFAULT_KEYLIGHT_COLOR;
+    static const float DEFAULT_KEYLIGHT_INTENSITY;
+    static const float DEFAULT_KEYLIGHT_AMBIENT_INTENSITY;
+    static const glm::vec3 DEFAULT_KEYLIGHT_DIRECTION;
+    
+    DEFINE_PROPERTY_REF(PROP_KEYLIGHT_COLOR, Color, color, xColor, DEFAULT_KEYLIGHT_COLOR);
+    DEFINE_PROPERTY(PROP_KEYLIGHT_INTENSITY, Intensity, intensity, float, DEFAULT_KEYLIGHT_INTENSITY);
+    DEFINE_PROPERTY(PROP_KEYLIGHT_AMBIENT_INTENSITY, AmbientIntensity, ambientIntensity, float, DEFAULT_KEYLIGHT_AMBIENT_INTENSITY);
+    DEFINE_PROPERTY_REF(PROP_KEYLIGHT_DIRECTION, Direction, direction, glm::vec3, DEFAULT_KEYLIGHT_DIRECTION);
+    DEFINE_PROPERTY_REF(PROP_KEYLIGHT_AMBIENT_URL, AmbientURL, ambientURL, QString, "");
+    
+protected:
+    
+};
+
+#endif // hifi_KeyLightPropertyGroup_h
diff --git a/libraries/entities/src/ZoneEntityItem.cpp b/libraries/entities/src/ZoneEntityItem.cpp
index 3147af35e8..2d0e534fa7 100644
--- a/libraries/entities/src/ZoneEntityItem.cpp
+++ b/libraries/entities/src/ZoneEntityItem.cpp
@@ -23,10 +23,6 @@
 bool ZoneEntityItem::_zonesArePickable = false;
 bool ZoneEntityItem::_drawZoneBoundaries = false;
 
-const xColor ZoneEntityItem::DEFAULT_KEYLIGHT_COLOR = { 255, 255, 255 };
-const float ZoneEntityItem::DEFAULT_KEYLIGHT_INTENSITY = 1.0f;
-const float ZoneEntityItem::DEFAULT_KEYLIGHT_AMBIENT_INTENSITY = 0.5f;
-const glm::vec3 ZoneEntityItem::DEFAULT_KEYLIGHT_DIRECTION = { 0.0f, -1.0f, 0.0f };
 const ShapeType ZoneEntityItem::DEFAULT_SHAPE_TYPE = SHAPE_TYPE_BOX;
 const QString ZoneEntityItem::DEFAULT_COMPOUND_SHAPE_URL = "";
 
@@ -39,13 +35,6 @@ ZoneEntityItem::ZoneEntityItem(const EntityItemID& entityItemID, const EntityIte
 {
     _type = EntityTypes::Zone;
 
-    _keyLightColor[RED_INDEX] = DEFAULT_KEYLIGHT_COLOR.red;
-    _keyLightColor[GREEN_INDEX] = DEFAULT_KEYLIGHT_COLOR.green;
-    _keyLightColor[BLUE_INDEX] = DEFAULT_KEYLIGHT_COLOR.blue;
-
-    _keyLightIntensity = DEFAULT_KEYLIGHT_INTENSITY;
-    _keyLightAmbientIntensity = DEFAULT_KEYLIGHT_AMBIENT_INTENSITY;
-    _keyLightDirection = DEFAULT_KEYLIGHT_DIRECTION;
     _shapeType = DEFAULT_SHAPE_TYPE;
     _compoundShapeURL = DEFAULT_COMPOUND_SHAPE_URL;
 
@@ -77,11 +66,9 @@ EnvironmentData ZoneEntityItem::getEnvironmentData() const {
 EntityItemProperties ZoneEntityItem::getProperties(EntityPropertyFlags desiredProperties) const {
     EntityItemProperties properties = EntityItem::getProperties(desiredProperties); // get the properties from our base class
 
-    COPY_ENTITY_PROPERTY_TO_PROPERTIES(keyLightColor, getKeyLightColor);
-    COPY_ENTITY_PROPERTY_TO_PROPERTIES(keyLightIntensity, getKeyLightIntensity);
-    COPY_ENTITY_PROPERTY_TO_PROPERTIES(keyLightAmbientIntensity, getKeyLightAmbientIntensity);
-    COPY_ENTITY_PROPERTY_TO_PROPERTIES(keyLightDirection, getKeyLightDirection);
-
+    
+    _keyLightProperties.getProperties(properties);
+    
     _stageProperties.getProperties(properties);
 
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(shapeType, getShapeType);
@@ -98,11 +85,8 @@ bool ZoneEntityItem::setProperties(const EntityItemProperties& properties) {
     bool somethingChanged = false;
     somethingChanged = EntityItem::setProperties(properties); // set the properties in our base class
 
-    SET_ENTITY_PROPERTY_FROM_PROPERTIES(keyLightColor, setKeyLightColor);
-    SET_ENTITY_PROPERTY_FROM_PROPERTIES(keyLightIntensity, setKeyLightIntensity);
-    SET_ENTITY_PROPERTY_FROM_PROPERTIES(keyLightAmbientIntensity, setKeyLightAmbientIntensity);
-    SET_ENTITY_PROPERTY_FROM_PROPERTIES(keyLightDirection, setKeyLightDirection);
-
+    bool somethingChangedInKeyLight = _keyLightProperties.setProperties(properties);
+    
     bool somethingChangedInStage = _stageProperties.setProperties(properties);
 
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(shapeType, updateShapeType);
@@ -112,7 +96,7 @@ bool ZoneEntityItem::setProperties(const EntityItemProperties& properties) {
     bool somethingChangedInAtmosphere = _atmosphereProperties.setProperties(properties);
     bool somethingChangedInSkybox = _skyboxProperties.setProperties(properties);
 
-    somethingChanged = somethingChanged || somethingChangedInStage || somethingChangedInAtmosphere || somethingChangedInSkybox;
+    somethingChanged = somethingChanged  || somethingChangedInKeyLight || somethingChangedInStage || somethingChangedInAtmosphere || somethingChangedInSkybox;
 
     if (somethingChanged) {
         bool wantDebug = false;
@@ -135,14 +119,15 @@ int ZoneEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data,
     int bytesRead = 0;
     const unsigned char* dataAt = data;
 
-    READ_ENTITY_PROPERTY(PROP_KEYLIGHT_COLOR, rgbColor, setKeyLightColor);
-    READ_ENTITY_PROPERTY(PROP_KEYLIGHT_INTENSITY, float, setKeyLightIntensity);
-    READ_ENTITY_PROPERTY(PROP_KEYLIGHT_AMBIENT_INTENSITY, float, setKeyLightAmbientIntensity);
-    READ_ENTITY_PROPERTY(PROP_KEYLIGHT_DIRECTION, glm::vec3, setKeyLightDirection);
+    int bytesFromKeylight = _keyLightProperties.readEntitySubclassDataFromBuffer(dataAt, (bytesLeftToRead - bytesRead), args,
+                                                                                 propertyFlags, overwriteLocalData, somethingChanged);
+    
+    bytesRead += bytesFromKeylight;
+    dataAt += bytesFromKeylight;
 
     int bytesFromStage = _stageProperties.readEntitySubclassDataFromBuffer(dataAt, (bytesLeftToRead - bytesRead), args, 
                                                                                propertyFlags, overwriteLocalData, somethingChanged);
-                                                                               
+    
     bytesRead += bytesFromStage;
     dataAt += bytesFromStage;
 
@@ -169,10 +154,8 @@ int ZoneEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data,
 EntityPropertyFlags ZoneEntityItem::getEntityProperties(EncodeBitstreamParams& params) const {
     EntityPropertyFlags requestedProperties = EntityItem::getEntityProperties(params);
 
-    requestedProperties += PROP_KEYLIGHT_COLOR;
-    requestedProperties += PROP_KEYLIGHT_INTENSITY;
-    requestedProperties += PROP_KEYLIGHT_AMBIENT_INTENSITY;
-    requestedProperties += PROP_KEYLIGHT_DIRECTION;
+    requestedProperties += _keyLightProperties.getEntityProperties(params);
+    
     requestedProperties += PROP_SHAPE_TYPE;
     requestedProperties += PROP_COMPOUND_SHAPE_URL;
     requestedProperties += PROP_BACKGROUND_MODE;
@@ -193,10 +176,8 @@ void ZoneEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBits
 
     bool successPropertyFits = true;
 
-    APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_COLOR, _keyLightColor);
-    APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_INTENSITY, getKeyLightIntensity());
-    APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_AMBIENT_INTENSITY, getKeyLightAmbientIntensity());
-    APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_DIRECTION, getKeyLightDirection());
+    _keyLightProperties.appendSubclassData(packetData, params, modelTreeElementExtraEncodeData, requestedProperties,
+                                         propertyFlags, propertiesDidntFit, propertyCount, appendState);
 
     _stageProperties.appendSubclassData(packetData, params, modelTreeElementExtraEncodeData, requestedProperties,
                                     propertyFlags, propertiesDidntFit, propertyCount, appendState);
@@ -217,15 +198,12 @@ void ZoneEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBits
 void ZoneEntityItem::debugDump() const {
     quint64 now = usecTimestampNow();
     qCDebug(entities) << "   ZoneEntityItem id:" << getEntityItemID() << "---------------------------------------------";
-    qCDebug(entities) << "             keyLightColor:" << _keyLightColor[0] << "," << _keyLightColor[1] << "," << _keyLightColor[2];
     qCDebug(entities) << "                  position:" << debugTreeVector(getPosition());
     qCDebug(entities) << "                dimensions:" << debugTreeVector(getDimensions());
     qCDebug(entities) << "             getLastEdited:" << debugTime(getLastEdited(), now);
-    qCDebug(entities) << "        _keyLightIntensity:" << _keyLightIntensity;
-    qCDebug(entities) << " _keyLightAmbientIntensity:" << _keyLightAmbientIntensity;
-    qCDebug(entities) << "        _keyLightDirection:" << _keyLightDirection;
     qCDebug(entities) << "               _backgroundMode:" << EntityItemProperties::getBackgroundModeString(_backgroundMode);
 
+    _keyLightProperties.debugDump();
     _stageProperties.debugDump();
     _atmosphereProperties.debugDump();
     _skyboxProperties.debugDump();
diff --git a/libraries/entities/src/ZoneEntityItem.h b/libraries/entities/src/ZoneEntityItem.h
index e7f2e03981..c076e003e4 100644
--- a/libraries/entities/src/ZoneEntityItem.h
+++ b/libraries/entities/src/ZoneEntityItem.h
@@ -14,6 +14,7 @@
 
 #include <EnvironmentData.h>
 
+#include "KeyLightPropertyGroup.h"
 #include "AtmospherePropertyGroup.h"
 #include "EntityItem.h"
 #include "EntityTree.h"
@@ -48,36 +49,7 @@ public:
                                                 EntityPropertyFlags& propertyFlags, bool overwriteLocalData,
                                                 bool& somethingChanged);
 
-    xColor getKeyLightColor() const { xColor color = { _keyLightColor[RED_INDEX], _keyLightColor[GREEN_INDEX], _keyLightColor[BLUE_INDEX] }; return color; }
-    void setKeyLightColor(const xColor& value) {
-        _keyLightColor[RED_INDEX] = value.red;
-        _keyLightColor[GREEN_INDEX] = value.green;
-        _keyLightColor[BLUE_INDEX] = value.blue;
-    }
 
-    void setKeyLightColor(const rgbColor& value) {
-        _keyLightColor[RED_INDEX] = value[RED_INDEX];
-        _keyLightColor[GREEN_INDEX] = value[GREEN_INDEX];
-        _keyLightColor[BLUE_INDEX] = value[BLUE_INDEX];
-    }
-
-    glm::vec3 getKeyLightColorVec3() const {
-        const quint8 MAX_COLOR = 255;
-        glm::vec3 color = { (float)_keyLightColor[RED_INDEX] / (float)MAX_COLOR,
-                            (float)_keyLightColor[GREEN_INDEX] / (float)MAX_COLOR,
-                            (float)_keyLightColor[BLUE_INDEX] / (float)MAX_COLOR };
-        return color;
-    }
-
-    
-    float getKeyLightIntensity() const { return _keyLightIntensity; }
-    void setKeyLightIntensity(float value) { _keyLightIntensity = value; }
-
-    float getKeyLightAmbientIntensity() const { return _keyLightAmbientIntensity; }
-    void setKeyLightAmbientIntensity(float value) { _keyLightAmbientIntensity = value; }
-
-    const glm::vec3& getKeyLightDirection() const { return _keyLightDirection; }
-    void setKeyLightDirection(const glm::vec3& value) { _keyLightDirection = value; }
 
     static bool getZonesArePickable() { return _zonesArePickable; }
     static void setZonesArePickable(bool value) { _zonesArePickable = value; }
@@ -93,6 +65,8 @@ public:
     const QString getCompoundShapeURL() const { return _compoundShapeURL; }
     virtual void setCompoundShapeURL(const QString& url);
 
+    const KeyLightPropertyGroup& getKeyLightProperties() const { return _keyLightProperties; }
+
     void setBackgroundMode(BackgroundMode value) { _backgroundMode = value; }
     BackgroundMode getBackgroundMode() const { return _backgroundMode; }
 
@@ -109,19 +83,11 @@ public:
 
     virtual void debugDump() const;
 
-    static const xColor DEFAULT_KEYLIGHT_COLOR;
-    static const float DEFAULT_KEYLIGHT_INTENSITY;
-    static const float DEFAULT_KEYLIGHT_AMBIENT_INTENSITY;
-    static const glm::vec3 DEFAULT_KEYLIGHT_DIRECTION;
     static const ShapeType DEFAULT_SHAPE_TYPE;
     static const QString DEFAULT_COMPOUND_SHAPE_URL;
     
 protected:
-    // properties of the "sun" in the zone
-    rgbColor _keyLightColor;
-    float _keyLightIntensity;
-    float _keyLightAmbientIntensity;
-    glm::vec3 _keyLightDirection;
+    KeyLightPropertyGroup _keyLightProperties;
     
     ShapeType _shapeType = DEFAULT_SHAPE_TYPE;
     QString _compoundShapeURL;
diff --git a/libraries/networking/src/udt/PacketHeaders.cpp b/libraries/networking/src/udt/PacketHeaders.cpp
index 3c1d33deaf..7062942c51 100644
--- a/libraries/networking/src/udt/PacketHeaders.cpp
+++ b/libraries/networking/src/udt/PacketHeaders.cpp
@@ -38,7 +38,7 @@ PacketVersion versionForPacketType(PacketType packetType) {
         case PacketType::EntityAdd:
         case PacketType::EntityEdit:
         case PacketType::EntityData:
-            return VERSION_ENTITIES_ANIMATION_PROPERTIES_GROUP;
+            return VERSION_ENTITIES_KEYLIGHT_PROPERTIES_GROUP;
         case PacketType::AvatarData:
         case PacketType::BulkAvatarData:
         default:
diff --git a/libraries/networking/src/udt/PacketHeaders.h b/libraries/networking/src/udt/PacketHeaders.h
index 3654d5b5fa..64e0a9d8e4 100644
--- a/libraries/networking/src/udt/PacketHeaders.h
+++ b/libraries/networking/src/udt/PacketHeaders.h
@@ -143,5 +143,6 @@ const PacketVersion VERSION_ENTITIES_PROTOCOL_HEADER_SWAP = 43;
 const PacketVersion VERSION_ENTITIES_PARTICLE_ELLIPSOID_EMITTER = 44;
 const PacketVersion VERSION_ENTITIES_PROTOCOL_CHANNELS = 45;
 const PacketVersion VERSION_ENTITIES_ANIMATION_PROPERTIES_GROUP = 46;
+const PacketVersion VERSION_ENTITIES_KEYLIGHT_PROPERTIES_GROUP = 47;
 
 #endif // hifi_PacketHeaders_h
diff --git a/libraries/shared/src/ColorUtils.h b/libraries/shared/src/ColorUtils.h
new file mode 100644
index 0000000000..1ef8420cd7
--- /dev/null
+++ b/libraries/shared/src/ColorUtils.h
@@ -0,0 +1,30 @@
+//
+//  ColorUtils.h
+//  libraries/shared/src
+//
+//  Created by Sam Gateau on 10/24/15.
+//  Copyright 2014 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
+//
+
+#ifndef hifi_ColorUtils_h
+#define hifi_ColorUtils_h
+
+#include <glm/glm.hpp>
+#include <SharedUtil.h>
+
+#include "DependencyManager.h"
+
+class ColorUtils {
+public:
+    inline static glm::vec3 toVec3(const xColor& color);
+};
+
+inline glm::vec3 ColorUtils::toVec3(const xColor& color) {
+    const float ONE_OVER_255 = 1.0f / 255.0f;
+    return glm::vec3(color.red * ONE_OVER_255, color.green * ONE_OVER_255, color.blue * ONE_OVER_255);
+}
+
+#endif // hifi_ColorUtils_h
\ No newline at end of file
diff --git a/unpublishedScripts/basketballsResetter.js b/unpublishedScripts/basketballsResetter.js
new file mode 100644
index 0000000000..6335312d57
--- /dev/null
+++ b/unpublishedScripts/basketballsResetter.js
@@ -0,0 +1,111 @@
+//
+//
+//  Created by James B. Pollack @imgntn on 10/26/2015
+//  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
+var HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
+
+(function() {
+
+    var _this;
+    Resetter = function() {
+        _this = this;
+    };
+
+    Resetter.prototype = {
+
+        startNearGrabNonColliding: function() {
+            this.resetObjects();
+        },
+
+        clickReleaseOnEntity: function() {
+            this.resetObjects();
+        },
+
+        resetObjects: function() {
+            var ids = Entities.findEntities(this.initialProperties.position, 75);
+            var i;
+            for (i = 0; i < ids.length; i++) {
+                var id = ids[i];
+                var properties = Entities.getEntityProperties(id, "name");
+                if (properties.name === "Hifi-Basketball") {
+                    Entities.deleteEntity(id);
+                }
+            }
+
+            this.createBasketballs();
+        },
+
+        createBasketballs: function() {
+            var NUMBER_OF_BALLS = 4;
+            var DIAMETER = 0.30;
+            var basketballURL = HIFI_PUBLIC_BUCKET + "models/content/basketball2.fbx";
+            var basketballCollisionSoundURL = HIFI_PUBLIC_BUCKET + "sounds/basketball/basketball.wav";
+
+            var position = {
+                x: 542.86,
+                y: 494.84,
+                z: 475.06
+            };
+            var collidingBalls = [];
+
+            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 newPosition = {
+                    x: position.x + (DIAMETER * 2) - (DIAMETER * i),
+                    y: position.y + DIAMETER * 2,
+                    z: position.z
+                };
+                var collidingBall = Entities.addEntity({
+                    type: "Model",
+                    name: 'Hifi-Basketball',
+                    shapeType: 'Sphere',
+                    position: newPosition,
+                    dimensions: {
+                        x: DIAMETER,
+                        y: DIAMETER,
+                        z: DIAMETER
+                    },
+                    restitution: 1.0,
+                    linearDamping: 0.00001,
+                    gravity: {
+                        x: 0,
+                        y: -9.8,
+                        z: 0
+                    },
+                    collisionsWillMove: true,
+                    collisionsSoundURL: basketballCollisionSoundURL,
+                    ignoreForCollisions: false,
+                    modelURL: basketballURL,
+                    userData: JSON.stringify({
+                        resetMe: {
+                            resetMe: true
+                        },
+                        grabbableKey: {
+                            invertSolidWhileHeld: true
+                        }
+                    })
+                });
+
+                collidingBalls.push(collidingBall);
+
+            }
+        },
+
+        preload: function(entityID) {
+            this.initialProperties = Entities.getEntityProperties(entityID);
+            this.entityID = entityID;
+        },
+
+    };
+
+    return new Resetter();
+});
\ No newline at end of file
diff --git a/unpublishedScripts/hiddenEntityReset.js b/unpublishedScripts/hiddenEntityReset.js
index e441db3aa6..43d23e4b3c 100644
--- a/unpublishedScripts/hiddenEntityReset.js
+++ b/unpublishedScripts/hiddenEntityReset.js
@@ -22,7 +22,8 @@
     var dollScriptURL = Script.resolvePath("../examples/toybox/doll/doll.js");
     var lightsScriptURL = Script.resolvePath("../examples/toybox/lights/lightSwitch.js");
     var targetsScriptURL = Script.resolvePath('../examples/toybox/ping_pong_gun/wallTarget.js');
-
+    var basketballResetterScriptURL = Script.resolvePath('basketballsResetter.js');
+    var targetsResetterScriptURL = Script.resolvePath('targetsResetter.js');
 
     ResetSwitch = function() {
         _this = this;
@@ -110,9 +111,12 @@
             });
 
             createPingPongBallGun();
+            createTargets();
+            createTargetResetter();
 
             createBasketballHoop();
             createBasketballRack();
+            createBasketballResetter();
 
             createGates();
 
@@ -120,8 +124,6 @@
             // Handles toggling of all sconce lights 
             createLights();
 
-
-
             createCat({
                 x: 551.09,
                 y: 494.98,
@@ -135,7 +137,6 @@
                 z: 503.91
             });
 
-            createTargets();
 
         }
 
@@ -275,10 +276,11 @@
                 })
             });
 
-            var collidingBalls = [];
+
 
             function createCollidingBalls() {
                 var position = rackStartPosition;
+                var collidingBalls = [];
 
                 var i;
                 for (i = 0; i < NUMBER_OF_BALLS; i++) {
@@ -334,6 +336,74 @@
 
         }
 
+        function createBasketballResetter() {
+
+            var position = {
+                x: 543.58,
+                y: 495.47,
+                z: 469.59
+            };
+
+            var dimensions = {
+                x: 1.65,
+                y: 1.71,
+                z: 1.75
+            };
+
+            var resetter = Entities.addEntity({
+                type: "Box",
+                position: position,
+                name: "Basketball Resetter",
+                script: basketballResetterScriptURL,
+                dimensions: dimensions,
+                visible: false,
+                userData: JSON.stringify({
+                    resetMe: {
+                        resetMe: true
+                    },
+                    grabbableKey: {
+                        wantsTrigger: true
+                    }
+                })
+            });
+
+
+        }
+
+        function createTargetResetter() {
+            var dimensions = {
+                x: 0.21,
+                y: 0.61,
+                z: 0.21
+            };
+
+            var position = {
+                x: 548.42,
+                y: 496.40,
+                z: 509.61
+            };
+
+            var resetter = Entities.addEntity({
+                type: "Box",
+                position: position,
+                name: "Target Resetter",
+                script: targetsResetterScriptURL,
+                dimensions: dimensions,
+                visible: false,
+                userData: JSON.stringify({
+                    resetMe: {
+                        resetMe: true
+                    },
+                    grabbableKey: {
+                        wantsTrigger: true
+                    }
+                })
+
+            });
+        }
+
+
+
         function createTargets() {
 
             var MODEL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/target.fbx';
diff --git a/unpublishedScripts/immediateClientReset.js b/unpublishedScripts/immediateClientReset.js
index 0a2e9383a2..2088160727 100644
--- a/unpublishedScripts/immediateClientReset.js
+++ b/unpublishedScripts/immediateClientReset.js
@@ -8,15 +8,11 @@
 
 /*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 */
 
-
 var masterResetScript = Script.resolvePath("masterReset.js");
 var hiddenEntityScriptURL = Script.resolvePath("hiddenEntityReset.js");
 
-
 Script.include(masterResetScript);
 
-
-
 function createHiddenMasterSwitch() {
 
     var resetKey = "resetMe";
@@ -31,7 +27,6 @@ function createHiddenMasterSwitch() {
     });
 }
 
-
 var entities = Entities.findEntities(MyAvatar.position, 100);
 
 entities.forEach(function(entity) {
@@ -41,5 +36,7 @@ entities.forEach(function(entity) {
         Entities.deleteEntity(entity);
     }
 });
+
 createHiddenMasterSwitch();
+
 MasterReset();
\ No newline at end of file
diff --git a/unpublishedScripts/masterReset.js b/unpublishedScripts/masterReset.js
index 956db41235..74eb3c85ac 100644
--- a/unpublishedScripts/masterReset.js
+++ b/unpublishedScripts/masterReset.js
@@ -14,16 +14,16 @@
 var utilitiesScript = Script.resolvePath("../examples/libraries/utils.js");
 Script.include(utilitiesScript);
 
-    var sprayPaintScriptURL = Script.resolvePath("../examples/toybox/spray_paint/sprayPaintCan.js");
-    var catScriptURL = Script.resolvePath("../examples/toybox/cat/cat.js");
-    var flashlightScriptURL = Script.resolvePath('../examples/toybox/flashlight/flashlight.js');
-    var pingPongScriptURL = Script.resolvePath('../examples/toybox/ping_pong_gun/pingPongGun.js');
-    var wandScriptURL = Script.resolvePath("../examples/toybox/bubblewand/wand.js");
-    var dollScriptURL = Script.resolvePath("../examples/toybox/doll/doll.js");
-    var lightsScriptURL = Script.resolvePath("../examples/toybox/lights/lightSwitch.js");
-    var targetsScriptURL = Script.resolvePath('../examples/toybox/ping_pong_gun/wallTarget.js');
-
-
+var sprayPaintScriptURL = Script.resolvePath("../examples/toybox/spray_paint/sprayPaintCan.js");
+var catScriptURL = Script.resolvePath("../examples/toybox/cat/cat.js");
+var flashlightScriptURL = Script.resolvePath('../examples/toybox/flashlight/flashlight.js');
+var pingPongScriptURL = Script.resolvePath('../examples/toybox/ping_pong_gun/pingPongGun.js');
+var wandScriptURL = Script.resolvePath("../examples/toybox/bubblewand/wand.js");
+var dollScriptURL = Script.resolvePath("../examples/toybox/doll/doll.js");
+var lightsScriptURL = Script.resolvePath("../examples/toybox/lights/lightSwitch.js");
+var targetsScriptURL = Script.resolvePath('../examples/toybox/ping_pong_gun/wallTarget.js');
+var basketballResetterScriptURL = Script.resolvePath('basketballsResetter.js');
+var targetsResetterScriptURL = Script.resolvePath('targetsResetter.js');
 
 MasterReset = function() {
     var resetKey = "resetMe";
@@ -84,9 +84,12 @@ MasterReset = function() {
         });
 
         createPingPongBallGun();
+        createTargets();
+        createTargetResetter();
 
         createBasketballHoop();
         createBasketballRack();
+        createBasketballResetter();
 
         createGates();
 
@@ -109,7 +112,7 @@ MasterReset = function() {
             z: 503.91
         });
 
-        createTargets();
+
 
     }
 
@@ -201,6 +204,7 @@ MasterReset = function() {
         });
     }
 
+
     function createBasketballRack() {
         var NUMBER_OF_BALLS = 4;
         var DIAMETER = 0.30;
@@ -249,10 +253,11 @@ MasterReset = function() {
             })
         });
 
-        var collidingBalls = [];
+
 
         function createCollidingBalls() {
             var position = rackStartPosition;
+            var collidingBalls = [];
 
             var i;
             for (i = 0; i < NUMBER_OF_BALLS; i++) {
@@ -308,6 +313,75 @@ MasterReset = function() {
 
     }
 
+
+    function createBasketballResetter() {
+
+        var position = {
+            x: 543.58,
+            y: 495.47,
+            z: 469.59
+        };
+
+        var dimensions = {
+            x: 1.65,
+            y: 1.71,
+            z: 1.75
+        };
+
+        var resetter = Entities.addEntity({
+            type: "Box",
+            position: position,
+            name: "Basketball Resetter",
+            script: basketballResetterScriptURL,
+            dimensions: dimensions,
+            visible:false,
+            userData: JSON.stringify({
+                resetMe: {
+                    resetMe: true
+                },
+                grabbableKey: {
+                    wantsTrigger: true
+                }
+            })
+        });
+
+
+    }
+
+    function createTargetResetter() {
+        var dimensions = {
+            x: 0.21,
+            y: 0.61,
+            z: 0.21
+        };
+
+        var position = {
+            x: 548.42,
+            y: 496.40,
+            z: 509.61
+        };
+
+        var resetter = Entities.addEntity({
+            type: "Box",
+            position: position,
+            name: "Target Resetter",
+            script: targetsResetterScriptURL,
+            dimensions: dimensions,
+            visible:false,
+            userData: JSON.stringify({
+                resetMe: {
+                    resetMe: true
+                },
+                grabbableKey: {
+                    wantsTrigger: true
+                }
+            })
+
+        });
+    }
+
+
+
     function createTargets() {
 
         var MODEL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/target.fbx';
diff --git a/unpublishedScripts/targetsResetter.js b/unpublishedScripts/targetsResetter.js
new file mode 100644
index 0000000000..a522c19593
--- /dev/null
+++ b/unpublishedScripts/targetsResetter.js
@@ -0,0 +1,128 @@
+//
+//
+//  Created by James B. Pollack @imgntn on 10/26/2015
+//  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
+
+(function() {
+    var targetsScriptURL = Script.resolvePath('../examples/toybox/ping_pong_gun/wallTarget.js');
+
+    var _this;
+    Resetter = function() {
+        _this = this;
+    };
+
+    Resetter.prototype = {
+
+        startNearGrabNonColliding: function() {
+            this.resetObjects();
+        },
+
+        clickReleaseOnEntity: function() {
+            this.resetObjects();
+        },
+
+        resetObjects: function() {
+            var ids = Entities.findEntities(this.initialProperties.position, 50);
+            for (var i = 0; i < ids.length; i++) {
+                var id = ids[i];
+                var properties = Entities.getEntityProperties(id, "name");
+                if (properties.name === "Hifi-Target") {
+                    Entities.deleteEntity(id);
+                }
+            }
+            this.createTargets();
+        },
+
+        preload: function(entityID) {
+            this.initialProperties = Entities.getEntityProperties(entityID);
+            this.entityID = entityID;
+        },
+
+        createTargets: function() {
+
+            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 MINIMUM_MOVE_LENGTH = 0.05;
+            var RESET_DISTANCE = 0.5;
+            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 targets = [];
+
+            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);
+
+                    var targetProperties = {
+                        name: 'Hifi-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({
+                            originalPositionKey: {
+                                originalPosition: position
+                            },
+                            resetMe: {
+                                resetMe: true
+                            },
+                            grabbableKey: {
+                                grabbable: false
+                            }
+                        })
+                    };
+
+                    var target = Entities.addEntity(targetProperties);
+                    targets.push(target);
+
+                }
+            }
+
+            addTargets();
+
+        }
+
+    };
+
+    return new Resetter();
+});
\ No newline at end of file