diff --git a/KREngine/kraken/KRScene.cpp b/KREngine/kraken/KRScene.cpp
index 646debc..5e31dce 100644
--- a/KREngine/kraken/KRScene.cpp
+++ b/KREngine/kraken/KRScene.cpp
@@ -93,6 +93,11 @@ std::set<KRReverbZone *> &KRScene::getReverbZones()
     return m_reverbZoneNodes;
 }
 
+std::set<KRLocator *> &KRScene::getLocators()
+{
+    return m_locatorNodes;
+}
+
 void KRScene::render(KRCamera *pCamera, unordered_map<KRAABB, int> &visibleBounds, const KRViewport &viewport, KRNode::RenderPass renderPass, bool new_frame) {
     if(new_frame) {
         // Expire cached occlusion test results.
@@ -460,6 +465,10 @@ void KRScene::notify_sceneGraphDelete(KRNode *pNode)
     if(ReverbZoneNode) {
         m_reverbZoneNodes.erase(ReverbZoneNode);
     }
+    KRLocator *locator = dynamic_cast<KRLocator *>(pNode);
+    if(locator) {
+        m_locatorNodes.erase(locator);
+    }
     m_modifiedNodes.erase(pNode);
     if(!m_newNodes.erase(pNode)) {
         m_nodeTree.remove(pNode);
@@ -481,14 +490,19 @@ void KRScene::updateOctree(const KRViewport &viewport)
         if(node->hasPhysics()) {
             m_physicsNodes.insert(node);
         }
-        KRAmbientZone *AmbientZoneNode = dynamic_cast<KRAmbientZone *>(node);
-        if(dynamic_cast<KRAmbientZone *>(node)) {
-            m_ambientZoneNodes.insert(AmbientZoneNode);
+        KRAmbientZone *ambientZoneNode = dynamic_cast<KRAmbientZone *>(node);
+        if(ambientZoneNode) {
+            m_ambientZoneNodes.insert(ambientZoneNode);
         }
-        KRReverbZone *ReverbZoneNode = dynamic_cast<KRReverbZone *>(node);
-        if(dynamic_cast<KRReverbZone *>(node)) {
-            m_reverbZoneNodes.insert(ReverbZoneNode);
+        KRReverbZone *reverbZoneNode = dynamic_cast<KRReverbZone *>(node);
+        if(reverbZoneNode) {
+            m_reverbZoneNodes.insert(reverbZoneNode);
         }
+        KRLocator *locatorNode = dynamic_cast<KRLocator *>(node);
+        if(locatorNode) {
+            m_locatorNodes.insert(locatorNode);
+        }
+        
     }
     for(std::set<KRNode *>::iterator itr=modifiedNodes.begin(); itr != modifiedNodes.end(); itr++) {
         KRNode *node = *itr;
diff --git a/KREngine/kraken/KRScene.h b/KREngine/kraken/KRScene.h
index b8f5cab..9242a03 100644
--- a/KREngine/kraken/KRScene.h
+++ b/KREngine/kraken/KRScene.h
@@ -40,6 +40,7 @@
 #include "KRCamera.h"
 #include "KRMeshManager.h"
 #include "KRNode.h"
+#include "KRLocator.h"
 #include "KRAmbientZone.h"
 #include "KRReverbZone.h"
 #include "KROctree.h"
@@ -84,6 +85,7 @@ public:
     
     std::set<KRAmbientZone *> &getAmbientZones();
     std::set<KRReverbZone *> &getReverbZones();
+    std::set<KRLocator *> &getLocators();
     
 private:
 
@@ -98,6 +100,7 @@ private:
     std::set<KRNode *> m_physicsNodes;
     std::set<KRAmbientZone *> m_ambientZoneNodes;
     std::set<KRReverbZone *> m_reverbZoneNodes;
+    std::set<KRLocator *> m_locatorNodes;
     
     KROctree m_nodeTree;