diff --git a/XylophoneRezzer.js b/XylophoneRezzer.js
new file mode 100644
index 0000000000..a1b3b9352b
--- /dev/null
+++ b/XylophoneRezzer.js
@@ -0,0 +1,87 @@
+var soundFiles = ["C2.wav", "D2.wav", "E2.wav", "F2.wav", "G2.wav", "A2.wav", "B2.wav", "C3.wav"];
+var diffuseFile = "http://mpassets.highfidelity.com/3fd92e5e-93cf-4bc1-b2f1-c6bae5629814-v1/xylotex_bar";
+var center = MyAvatar.position;
+var fwd = {x:0, y:0, z:-1};
+
+var xyloFramePos = Vec3.sum(center, Vec3.multiply(fwd, 0.8));
+var xyloFrameID = Entities.addEntity( {
+	name: "Xylophone",
+		type: "Model",
+	 	modelURL: "http://mpassets.highfidelity.com/3fd92e5e-93cf-4bc1-b2f1-c6bae5629814-v1/xylophoneFrameWithWave.fbx",
+		position: xyloFramePos,
+		rotation: Quat.fromVec3Radians({x:0, y:Math.PI, z:0}),
+		shapeType: "static-mesh",
+});
+
+center.y += (0.45); //key Y offset from frame
+var keyPos;
+for (i=1, len=soundFiles.length; i<=len; i++) {
+
+	keyRot = Quat.fromVec3Radians({x:0, y:(0.9 - (i*0.2)), z:0});
+	keyPos = Vec3.sum(center, Vec3.multiplyQbyV(keyRot, fwd));
+
+	var ud = {
+		soundFile: soundFiles[i-1]
+	};
+
+	var td = {
+		"file4": (diffuseFile + i + ".png"), 
+		"file5": (diffuseFile + "_black.png")
+	};
+
+	var keyID = Entities.addEntity( {
+		name: ("XyloKey" + i),
+		type: "Model",
+	 	modelURL: "http://mpassets.highfidelity.com/3fd92e5e-93cf-4bc1-b2f1-c6bae5629814-v1/xyloKey_2_a_e.fbx",
+		position: keyPos,
+		rotation: keyRot,
+		shapeType: "static-mesh",
+	 	script: "http://mpassets.highfidelity.com/3fd92e5e-93cf-4bc1-b2f1-c6bae5629814-v1/xylophoneKey.js",
+	 	textures: JSON.stringify(td),
+		userData: JSON.stringify(ud),
+		parentID: xyloFrameID,
+	} );
+};
+
+//if rezzed on/above something, wait until after model has loaded so you can read its dimensions then move object on to that surface.
+var pickRay = {origin: center, direction: {x:0, y:-1, z:0}};
+var intersection = Entities.findRayIntersection(pickRay, true);
+if (intersection.intersects && (intersection.distance < 10)) {
+	var surfaceY = intersection.intersection.y;
+	Script.setTimeout( function() {
+		//should add loop to check for fbx loaded instead of delay
+		var xyloDimensions = Entities.getEntityProperties(xyloFrameID, ["dimensions"]).dimensions;
+		xyloFramePos.y = surfaceY + (xyloDimensions.y/2);
+		Entities.editEntity(xyloFrameID, {position: xyloFramePos});
+		rezMallets();
+	}, 2000); //timeout (ms)
+}
+else {
+	print("No surface detected.");
+	rezMallets();
+}
+
+function rezMallets() {
+	var malletProps = {
+		name: "Xylophone Mallet",
+		type: "Model",
+		modelURL: "http://mpassets.highfidelity.com/3fd92e5e-93cf-4bc1-b2f1-c6bae5629814-v1/Mallet2-2pc.fbx",
+		collidesWith: "static,dynamic,kinematic,",
+		collisionMask: 7,
+		collisionsWillMove: 1,
+		dynamic: 1,
+		damping: 1,
+		angularDamping: 1,
+		shapeType: "simple-compound",
+		userData: "{\"grabbableKey\":{\"grabbable\":true}}"
+	};
+
+	malletProps.position = Vec3.sum(xyloFramePos, {x: 0.1, y: 0.55, z: 0});
+	malletProps.rotation = Quat.fromVec3Radians({x:0, y:Math.PI - 0.1, z:0}),
+	Entities.addEntity(malletProps);
+
+	malletProps.position = Vec3.sum(xyloFramePos, {x: -0.1, y: 0.55, z: 0});
+	malletProps.rotation = Quat.fromVec3Radians({x:0, y:Math.PI + 0.1, z:0}),
+	Entities.addEntity(malletProps);
+	Script.stop();
+};
\ No newline at end of file
diff --git a/xylophoneKey.js b/xylophoneKey.js
new file mode 100644
index 0000000000..60241440ea
--- /dev/null
+++ b/xylophoneKey.js
@@ -0,0 +1,63 @@
+(function() {
+    var BASE_PATH = "http://mpassets.highfidelity.com/3fd92e5e-93cf-4bc1-b2f1-c6bae5629814-v1/";
+    Script.include(BASE_PATH + "pUtils.js");
+    var TIMEOUT = 150;
+    var _this;
+
+    function XylophoneKey() {
+        _this = this;
+        return;
+    }
+
+    XylophoneKey.prototype = {
+        sound: null,
+        isWaiting: false,
+        homePos: null,
+        injector: null,
+
+        preload: function(entityID) {
+            _this.entityID = entityID;
+
+            var soundURL = BASE_PATH + JSON.parse(Entities.getEntityProperties(_this.entityID, ["userData"]).userData).soundFile;
+            //_this.homePos = Entities.getEntityProperties(entityID, ["position"]).position;
+            //Entities.editEntity(_this.entityID, {position: _this.homePos}); //This is the workaround for collisionWithEntity not being triggered after entity is reloaded.
+            _this.sound = SoundCache.getSound(soundURL);
+
+                    MyAvatar.collisionWithEntity.connect(function(collision){
+                        print ("The avatar collided with an entity.");
+                        if (!_this.isWaiting && collision.type == 0) {_this.hit();}
+                    });
+        },
+
+        collisionWithEntity: function(thisEntity, otherEntity, collision) {
+            if (!_this.isWaiting && collision.type == 0) {_this.hit();}
+        },
+
+        clickDownOnEntity: function() {
+            _this.hit();
+        },
+
+        hit: function() {
+            _this.isWaiting = true;
+            _this.homePos = Entities.getEntityProperties(_this.entityID, ["position"]).position;
+            _this.injector = Audio.playSound(_this.sound, {position: _this.homePos, volume: 1});
+            Controller.triggerHapticPulse(1, 15, 2); //This should be made to only pulse the hand thats holding the mallet.
+            editEntityTextures(_this.entityID, "file5", BASE_PATH + "xylotex_bar_gray.png");
+            var newPos = Vec3.sum(_this.homePos, {x:0,y:-0.025,z:0});
+            Entities.editEntity(_this.entityID, {position: newPos});
+            _this.timeout();
+        },
+
+        timeout: function() {
+            Script.setTimeout(function() {
+                editEntityTextures(_this.entityID, "file5", BASE_PATH + "xylotex_bar_black.png");
+                Entities.editEntity(_this.entityID, {position: _this.homePos});
+                _this.isWaiting = false;
+            }, TIMEOUT)
+        },
+
+    };
+
+    return new XylophoneKey();
+
+});
\ No newline at end of file