diff --git a/OpenSim/Region/Environment/Scenes/EntityList.cs b/OpenSim/Region/Environment/Scenes/EntityList.cs
new file mode 100644
index 0000000000..4a0e6688a0
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/EntityList.cs
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Reflection;
+using Axiom.Math;
+using libsecondlife;
+using libsecondlife.Packets;
+using log4net;
+using OpenSim.Framework;
+using OpenSim.Region.Environment.Types;
+using OpenSim.Region.Physics.Manager;
+
+namespace OpenSim.Region.Environment.Scenes
+{
+    public class EntityList
+    {
+           
+        private Hashtable m_obj_by_uuid;
+        private Hashtable m_pres_by_uuid;
+        private Hashtable m_obj_by_local;
+
+        public EntityList()
+        {
+            m_obj_by_uuid = Hashtable.Synchronized(new Hashtable());
+            m_obj_by_local = Hashtable.Synchronized(new Hashtable());
+            m_pres_by_uuid = Hashtable.Synchronized(new Hashtable());
+        }
+
+        // Interface definition
+        //
+        // Add(SOG)
+        // Add(SP)
+        // Remove(SOG)
+        // Remove(SP)
+        // List()
+        // ListObjects()
+        // ListPresenes()
+        // RemoveAll()
+        // FindObject(LLUUID)
+        // FindObject(int)
+        // FindPresence(LLUUID)
+        
+        public void Add(SceneObjectGroup obj)
+        {
+            m_obj_by_uuid[obj.UUID] = obj;
+            m_obj_by_local[obj.LocalId] = obj.UUID;
+        }
+
+        public void Add(ScenePresence pres)
+        {
+            m_pres_by_uuid[pres.UUID] = pres;
+        }
+    }
+}
\ No newline at end of file