diff --git a/scripts/system/html/entityProperties.html b/scripts/system/html/entityProperties.html
index b11127b26c..4c3723a2ef 100644
--- a/scripts/system/html/entityProperties.html
+++ b/scripts/system/html/entityProperties.html
@@ -61,7 +61,7 @@
                 <label for="property-description">Description</label>
                 <input type="text" id="property-description">
             </div>
-            
+
             <div class="property textarea">
                 <label for="property-user-data">User data</label>
                 <br>
@@ -295,12 +295,25 @@
                             <input type="checkbox" id="property-wants-trigger">
                             <label for="property-wants-trigger">Triggerable</label>
                         </div>
+                        <div class="property checkbox">
+                            <input type="checkbox" id="property-cloneable">
+                            <label for="property-grabbable">Cloneable</label>
+                        </div>
                         <div class="property checkbox">
                             <input type="checkbox" id="property-ignore-ik">
                             <label for="property-ignore-ik">Ignore inverse kinematics</label>
                         </div>
                     </div>
                 </div>
+                <div class="column" id="cloneable-group">
+                    <div class="sub-section-header">
+                        <span>Cloneable Settings</span>
+                    </div>
+                    <div class="cloneable-group property gen">
+                        <div><label>Clone Lifetime</label><input type="number" id="property-cloneable-lifetime"></div>
+                        <div><label>Clone Limit</label><input type="number" id="property-cloneable-lifetime"></div>
+                    </div>
+                </div>
             </div>
             <hr class="behavior-group" />
             <div class="behavior-group property url ">
diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index 8879c0f34e..63cb037ada 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -273,7 +273,7 @@ function updateCheckedSubProperty(propertyName, propertyValue, subPropertyElemen
             propertyValue += subPropertyString + ',';
         }
     } else {
-        // We've unchecked, so remove 
+        // We've unchecked, so remove
         propertyValue = propertyValue.replace(subPropertyString + ",", "");
     }
 
@@ -584,6 +584,7 @@ function loaded() {
         var elCollisionSoundURL = document.getElementById("property-collision-sound-url");
 
         var elGrabbable = document.getElementById("property-grabbable");
+        var elCloneable = document.getElementById("property-cloneable");
         var elWantsTrigger = document.getElementById("property-wants-trigger");
         var elIgnoreIK = document.getElementById("property-ignore-ik");
 
@@ -780,7 +781,7 @@ function loaded() {
                         if (lastEntityID !== '"' + properties.id + '"' && lastEntityID !== null && editor !== null) {
                             saveJSONUserData(true);
                         }
-                        //the event bridge and json parsing handle our avatar id string differently.  
+                        //the event bridge and json parsing handle our avatar id string differently.
 
                         lastEntityID = '"' + properties.id + '"';
                         elID.innerHTML = properties.id;
@@ -1156,6 +1157,12 @@ function loaded() {
         elGrabbable.addEventListener('change', function() {
             userDataChanger("grabbableKey", "grabbable", elGrabbable, elUserData, properties.dynamic);
         });
+        elCloneable.addEventListener('change', function () {
+            userDataChanger("grabbableKey", "cloneable", elCloneable, elUserData, false);
+            if (elCloneable.checked) {
+                
+            }
+        });
         elWantsTrigger.addEventListener('change', function() {
             userDataChanger("grabbableKey", "wantsTrigger", elWantsTrigger, elUserData, false);
         });
@@ -1390,7 +1397,7 @@ function loaded() {
         elZoneFlyingAllowed.addEventListener('change', createEmitCheckedPropertyUpdateFunction('flyingAllowed'));
         elZoneGhostingAllowed.addEventListener('change', createEmitCheckedPropertyUpdateFunction('ghostingAllowed'));
         elZoneFilterURL.addEventListener('change', createEmitTextPropertyUpdateFunction('filterURL'));
-            
+
         var voxelVolumeSizeChangeFunction = createEmitVec3PropertyUpdateFunction(
             'voxelVolumeSize', elVoxelVolumeSizeX, elVoxelVolumeSizeY, elVoxelVolumeSizeZ);
         elVoxelVolumeSizeX.addEventListener('change', voxelVolumeSizeChangeFunction);