diff --git a/scripts/developer/EZrecord.js b/scripts/developer/EZrecord.js
index 049ccbc03d..6f306419f8 100644
--- a/scripts/developer/EZrecord.js
+++ b/scripts/developer/EZrecord.js
@@ -48,6 +48,7 @@
 
             if (HMD.active) {
                 // 3D overlay attached to avatar.
+                //V8TODO: change to local entity
                 hmdOverlay = Overlays.addOverlay("text3d", {
                     text: recordingText,
                     dimensions: { x: 3 * HMD_FONT_SIZE, y: HMD_FONT_SIZE },
diff --git a/scripts/developer/debugging/debugAvatarMixer.js b/scripts/developer/debugging/debugAvatarMixer.js
index fad4283f7c..bd20f3a6d1 100644
--- a/scripts/developer/debugging/debugAvatarMixer.js
+++ b/scripts/developer/debugging/debugAvatarMixer.js
@@ -19,6 +19,7 @@ Script.include("/~/system/libraries/controllers.js");
 
 var isShowingOverlays = true;
 var debugOverlays = {};
+//V8TODO: change to local entity
 var textSizeOverlay = Overlays.addOverlay("text3d", {
     position: MyAvatar.position,
     lineHeight: 0.1,
diff --git a/scripts/developer/debugging/queryAACubeInspector.js b/scripts/developer/debugging/queryAACubeInspector.js
index d6adcf02b7..94ffab667c 100644
--- a/scripts/developer/debugging/queryAACubeInspector.js
+++ b/scripts/developer/debugging/queryAACubeInspector.js
@@ -31,6 +31,7 @@ function updateOverlay(entityID, queryAACube) {
             size: queryAACube.scale
         });
     } else {
+        //V8TODO: change to local entity
         overlays[entityID] = Overlays.addOverlay("cube", {
             position: cubeCenter,
             size: queryAACube.scale,
diff --git a/scripts/developer/tests/raypickTester.js b/scripts/developer/tests/raypickTester.js
index cebee4f29a..82c78a567b 100644
--- a/scripts/developer/tests/raypickTester.js
+++ b/scripts/developer/tests/raypickTester.js
@@ -11,6 +11,7 @@ var JOINT_NAME = HMD.active ? HAND_JOINT : 'Mouse';
 var UPDATE_MS = 1000/30;
 
 // create tect3d overlay to display hover results
+//V8TODO: change to local entity
 var overlayID = Overlays.addOverlay('text3d', {
     text: 'hover',
     visible: false,
diff --git a/scripts/developer/tests/sphereLODTest.js b/scripts/developer/tests/sphereLODTest.js
index d0cb35eaa1..6620396cb8 100644
--- a/scripts/developer/tests/sphereLODTest.js
+++ b/scripts/developer/tests/sphereLODTest.js
@@ -46,6 +46,7 @@ var entitySphere = Entities.addEntity({
 });
 
 var overlaySpherePosition = Vec3.sum(tablePosition, {x: sphereDimensions.x, y: tableDimensions.y/2 + sphereDimensions.y/2, z: 0});
+//V8TODO: change to local entity
 var overlaySphere = Overlays.addOverlay("sphere", {
     position: overlaySpherePosition,
     size: 0.01,
diff --git a/scripts/developer/tests/webOverlayTool.js b/scripts/developer/tests/webOverlayTool.js
index 1a3aa35205..75e1618598 100644
--- a/scripts/developer/tests/webOverlayTool.js
+++ b/scripts/developer/tests/webOverlayTool.js
@@ -23,7 +23,8 @@ SPAWNER = function (properties) {
     }
 
     function makeObject(properties) {
-        
+
+        //V8TODO: change to local entity
         var overlay = Overlays.addOverlay("web3d", {
             name: "Web",
             url: "https://www.reddit.com/r/random",
diff --git a/scripts/system/audioMuteOverlay.js b/scripts/system/audioMuteOverlay.js
index 9acc5ab123..a157cd6e9e 100644
--- a/scripts/system/audioMuteOverlay.js
+++ b/scripts/system/audioMuteOverlay.js
@@ -41,6 +41,7 @@
         }
 
         if (HMD.active) {
+            //V8TODO: change to local entity
             warningOverlayID = Overlays.addOverlay("text3d", {
                 name: "Muted-Warning",
                 localPosition: { x: 0.0, y: -0.45, z: -1.0 },
diff --git a/scripts/system/avatarFinderBeacon.js b/scripts/system/avatarFinderBeacon.js
index 7375d4bf4f..7736795a0e 100644
--- a/scripts/system/avatarFinderBeacon.js
+++ b/scripts/system/avatarFinderBeacon.js
@@ -27,6 +27,7 @@ var POSSIBLE_AC_AVATARS = [
 AvatarFinderBeacon = function(avatar) {
     var visible = false;
     var avatarSessionUUID = avatar.sessionUUID;
+    //V8TODO: change to local entity
     this.overlay = Overlays.addOverlay('line3d', {
         color: BEAM_COLOR,
         dashed: false,
diff --git a/scripts/system/away.js b/scripts/system/away.js
index 7268dc3233..43cc8771a0 100644
--- a/scripts/system/away.js
+++ b/scripts/system/away.js
@@ -89,6 +89,7 @@ function stopAwayAnimation() {
 
 // OVERLAY
 var overlay = Overlays.addOverlay("image", OVERLAY_DATA);
+//V8TODO: change to local entity
 var overlayHMD = Overlays.addOverlay("image3d", OVERLAY_DATA_HMD);
 
 function showOverlay() {
diff --git a/scripts/system/bubble.js b/scripts/system/bubble.js
index 88dee88d62..38c23cce96 100644
--- a/scripts/system/bubble.js
+++ b/scripts/system/bubble.js
@@ -21,6 +21,7 @@
     // Affects bubble height
     var BUBBLE_HEIGHT_SCALE = 0.15;
     // The bubble model itself
+    //V8TODO: change to local entity
     var bubbleOverlay = Overlays.addOverlay("model", {
         url: Script.resolvePath("assets/models/Bubble-v14.fbx"), // If you'd like to change the model, modify this line (and the dimensions below)
         dimensions: { x: MyAvatar.sensorToWorldScale, y: 0.75 * MyAvatar.sensorToWorldScale, z: MyAvatar.sensorToWorldScale },
diff --git a/scripts/system/chat.js b/scripts/system/chat.js
index 749665f3d8..3e7cd66a8c 100644
--- a/scripts/system/chat.js
+++ b/scripts/system/chat.js
@@ -45,6 +45,7 @@
     var speechBubbleLineHeight = 0.05; // The height of a line of text in the speech bubble.
     var SPEECH_BUBBLE_MAX_WIDTH = 1; // meters
 
+    //V8TODO: change to local entity
     var textSizeOverlay = Overlays.addOverlay("text3d", {
         position: MyAvatar.position,
         lineHeight: speechBubbleLineHeight,
diff --git a/scripts/system/controllers/controllerDispatcher.js b/scripts/system/controllers/controllerDispatcher.js
index 2eac7d2c9d..3e4dc0bc20 100644
--- a/scripts/system/controllers/controllerDispatcher.js
+++ b/scripts/system/controllers/controllerDispatcher.js
@@ -313,6 +313,7 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
                             Overlays.editOverlay(this.grabSphereOverlays[h], { position: controllerLocations[h].position });
                         } else {
                             var grabSphereSize = findRadius * 2;
+                            //V8TODO: change to local entity
                             this.grabSphereOverlays[h] = Overlays.addOverlay("sphere", {
                                 position: controllerLocations[h].position,
                                 dimensions: { x: grabSphereSize, y: grabSphereSize, z: grabSphereSize },
diff --git a/scripts/system/controllers/controllerDisplay.js b/scripts/system/controllers/controllerDisplay.js
index e40b761307..a5dd59a27b 100644
--- a/scripts/system/controllers/controllerDisplay.js
+++ b/scripts/system/controllers/controllerDisplay.js
@@ -172,6 +172,7 @@ createControllerDisplay = function(config) {
             controller.naturalPosition = { x: 0, y: 0, z: 0 };
         }
 
+        //V8TODO: change to local entity
         var baseOverlayID = Overlays.addOverlay("model", {
             url: controller.modelURL,
             dimensions: Vec3.multiply(sensorScaleFactor, controller.dimensions),
@@ -206,6 +207,7 @@ createControllerDisplay = function(config) {
                     properties.textures = textures;
                 }
 
+                //V8TODO: change to local entity
                 var overlayID = Overlays.addOverlay("model", properties);
 
                 if (part.type === "rotational") {
diff --git a/scripts/system/controllers/controllerModules/equipEntity.js b/scripts/system/controllers/controllerModules/equipEntity.js
index fee38f2cdd..f30f3ac4da 100644
--- a/scripts/system/controllers/controllerModules/equipEntity.js
+++ b/scripts/system/controllers/controllerModules/equipEntity.js
@@ -74,6 +74,7 @@ EquipHotspotBuddy.prototype.updateHotspot = function(hotspot, timestamp) {
         }
 
         // override default sphere with a user specified model, if it exists.
+        //V8TODO: change to local entity
         overlayInfoSet.overlays.push(Overlays.addOverlay("model", {
             name: "hotspot overlay",
             url: hotspot.indicatorURL ? hotspot.indicatorURL : DEFAULT_SPHERE_MODEL_URL,
diff --git a/scripts/system/libraries/WebTablet.js b/scripts/system/libraries/WebTablet.js
index 94143f5bab..3b0aa9887a 100644
--- a/scripts/system/libraries/WebTablet.js
+++ b/scripts/system/libraries/WebTablet.js
@@ -142,6 +142,7 @@ WebTablet = function (url, width, dpi, hand, location, visible) {
     this.cleanUpOldTablets();
     cleanUpOldMaterialEntities();
 
+    //V8TODO: change to local entity
     this.tabletEntityID = Overlays.addOverlay("model", tabletProperties);
 
     if (this.webOverlayID) {
@@ -152,6 +153,7 @@ WebTablet = function (url, width, dpi, hand, location, visible) {
     var WEB_ENTITY_Y_OFFSET = 1.25 * tabletScaleFactor;
     var screenWidth = 0.9367 * tabletWidth;
     var screenHeight = 0.9000 * tabletHeight;
+    //V8TODO: change to local entity
     this.webOverlayID = Overlays.addOverlay("web3d", {
         name: "WebTablet Web",
         url: url,
@@ -172,6 +174,7 @@ WebTablet = function (url, width, dpi, hand, location, visible) {
     var HOME_BUTTON_X_OFFSET = 0.00079 * sensorScaleFactor;
     var HOME_BUTTON_Y_OFFSET = -1 * ((tabletHeight / 2) - (4.0 * tabletScaleFactor / 2));
     var HOME_BUTTON_Z_OFFSET = (tabletDepth / 1.9) * sensorScaleFactor;
+    //V8TODO: change to local entity
     this.homeButtonID = Overlays.addOverlay("circle3d", {
         name: "homeButton",
         localPosition: { x: HOME_BUTTON_X_OFFSET, y: HOME_BUTTON_Y_OFFSET, z: -HOME_BUTTON_Z_OFFSET },
@@ -185,6 +188,7 @@ WebTablet = function (url, width, dpi, hand, location, visible) {
         parentJointIndex: -1
     });
 
+    //V8TODO: change to local entity
     this.homeButtonHighlightID = Overlays.addOverlay("circle3d", {
         name: "homeButtonHighlight",
         localPosition: { x: -HOME_BUTTON_X_OFFSET, y: HOME_BUTTON_Y_OFFSET, z: -HOME_BUTTON_Z_OFFSET },
diff --git a/scripts/system/libraries/overlayUtils.js b/scripts/system/libraries/overlayUtils.js
index 366cdbcc97..19719b2439 100644
--- a/scripts/system/libraries/overlayUtils.js
+++ b/scripts/system/libraries/overlayUtils.js
@@ -12,6 +12,7 @@
 //  OverlayGroup provides a way to create composite overlays and control their
 //  position relative to a settable rootPosition and rootRotation.
 //
+//V8TODO: check if it uses 3D overlays
 OverlayGroup = function(opts) {
     var that = {};
 
diff --git a/scripts/system/miniTablet.js b/scripts/system/miniTablet.js
index c9942afd48..526f1c248e 100644
--- a/scripts/system/miniTablet.js
+++ b/scripts/system/miniTablet.js
@@ -465,6 +465,7 @@
         }
 
         function create() {
+            //V8TODO: change to local entity
             miniOverlay = Overlays.addOverlay("model", {
                 url: MINI_MODEL,
                 dimensions: Vec3.multiply(MyAvatar.sensorToWorldScale, MINI_DIMENSIONS),
@@ -474,6 +475,7 @@
                 drawInFront: false,
                 visible: false
             });
+            //V8TODO: change to local entity
             miniUIOverlay = Overlays.addOverlay("web3d", {
                 url: handsAreTracked() ? MINI_HAND_UI_HTML : MINI_UI_HTML,
                 parentID: miniOverlay,
diff --git a/scripts/system/mod.js b/scripts/system/mod.js
index a3b4974f8d..6517cd5c16 100644
--- a/scripts/system/mod.js
+++ b/scripts/system/mod.js
@@ -134,6 +134,7 @@ function updateOverlays() {
                 modOverlays[avatarID]=[newKickOverlay];
 
                 if (Users.canKick) {
+                    //V8TODO: change to local entity
                     var newMuteOverlay = Overlays.addOverlay("image3d", {
                         url: muteOverlayURL(),
                         position: muteOverlayPosition,
diff --git a/scripts/system/pal.js b/scripts/system/pal.js
index 4cf6ef1c34..9c10ff6340 100644
--- a/scripts/system/pal.js
+++ b/scripts/system/pal.js
@@ -77,6 +77,7 @@ function ExtendedOverlay(key, type, properties, selected, hasModel) { // A wrapp
     this.key = key;
     this.selected = selected || false; // not undefined
     this.hovering = false;
+    //V8TODO: check if it uses 3d overlays
     this.activeOverlay = Overlays.addOverlay(type, properties); // We could use different overlays for (un)selected...
 }
 // Instance methods:
@@ -183,6 +184,7 @@ ExtendedOverlay.applyPickRay = function (pickRay, hit, noHit) {
 //
 function HighlightedEntity(id, entityProperties) {
     this.id = id;
+    //V8TODO: change to local entity
     this.overlay = Overlays.addOverlay('cube', {
         position: entityProperties.position,
         rotation: entityProperties.rotation,
diff --git a/scripts/system/redirectOverlays.js b/scripts/system/redirectOverlays.js
index bb537bee0e..f85f6415a1 100644
--- a/scripts/system/redirectOverlays.js
+++ b/scripts/system/redirectOverlays.js
@@ -38,6 +38,7 @@
 
     var oopsDimensions = {x: 4.2, y: 0.8};
 
+    //V8TODO: change to local entity
     var redirectOopsText = Overlays.addOverlay("text3d", {
         name: "oopsText",
         position: {x: 0, y: 1.6763916015625, z: 1.45927095413208},
@@ -55,6 +56,7 @@
         grabbable: false,
     });
 
+    //V8TODO: change to local entity
     var tryAgainImageNeutral = Overlays.addOverlay("image3d", {
         name: "tryAgainImage",
         localPosition: {x: -0.6, y: -0.6, z: 0.0},
@@ -68,6 +70,7 @@
         parentID: redirectOopsText
     });
 
+    //V8TODO: change to local entity
     var tryAgainImageHover = Overlays.addOverlay("image3d", {
         name: "tryAgainImageHover",
         localPosition: {x: -0.6, y: -0.6, z: 0.0},
@@ -81,6 +84,7 @@
         parentID: redirectOopsText
     });
 
+    //V8TODO: change to local entity
     var tryAgainText = Overlays.addOverlay("text3d", {
         name: "tryAgainText",
         localPosition: {x: -0.6, y: -0.962, z: 0.0},
@@ -96,6 +100,7 @@
         parentID: redirectOopsText
     });
 
+    //V8TODO: change to local entity
     var backImageNeutral = Overlays.addOverlay("image3d", {
         name: "backImage",
         localPosition: {x: 0.6, y: -0.6, z: 0.0},
@@ -109,6 +114,7 @@
         parentID: redirectOopsText
     });
 
+    //V8TODO: change to local entity
     var backImageHover = Overlays.addOverlay("image3d", {
         name: "backImageHover",
         localPosition: {x: 0.6, y: -0.6, z: 0.0},
@@ -122,6 +128,7 @@
         parentID: redirectOopsText
     });
 
+    //V8TODO: change to local entity
     var backText = Overlays.addOverlay("text3d", {
         name: "backText",
         localPosition: {x: 0.6, y: -0.962, z: 0.0},
diff --git a/scripts/system/tablet-ui/tabletUI.js b/scripts/system/tablet-ui/tabletUI.js
index a38febaa77..fb9b465765 100644
--- a/scripts/system/tablet-ui/tabletUI.js
+++ b/scripts/system/tablet-ui/tabletUI.js
@@ -249,6 +249,7 @@
                     tabletShown = false;
 
                     // also cause the stylus model to be loaded
+                    //V8TODO: change to local entity
                     var tmpStylusID = Overlays.addOverlay("model", {
                                                name: "stylus",
                                                url: Script.resourcesPath() + "meshes/tablet-stylus-fat.fbx",