diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 0000000..a12ed18
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+        "sumneko.lua"
+    ]
+}
\ No newline at end of file
diff --git a/baseManager/lib/defs.lua b/netServices/lib/defs.lua
similarity index 60%
rename from baseManager/lib/defs.lua
rename to netServices/lib/defs.lua
index ea6a6a2..06c56f1 100644
--- a/baseManager/lib/defs.lua
+++ b/netServices/lib/defs.lua
@@ -9,11 +9,10 @@ if(_NetDefs ~= nil) then
         waiting = 1,
         overdue = 2
     }
-    _NetDefs.remoteEnum = {
-        server      = 0,
-        componant   = 1,
-        display     = 2,
-        terminal    = 3
+    _NetDefs.serviceEnum = {
+        adp         = 0,
+        dns         = 1,
+        logger      = 2
     }
     _NetDefs.portEnum = {
         logger          = 8008,
@@ -22,6 +21,11 @@ if(_NetDefs ~= nil) then
         heartBeat       = 25,
         componantCmd    = 30
     }
+    _NetDefs.routingEnum = {
+        uuid          = 420,   --not IP
+        service       = 10,    -- Used for adp,dns,possibly others
+        hostName      = 61     --Not implmented
+    }
     _NetDefs.START = 0
     _NetDefs.END   = 420
 end
\ No newline at end of file
diff --git a/baseManager/lib/logger.lua b/netServices/lib/logger.lua
similarity index 100%
rename from baseManager/lib/logger.lua
rename to netServices/lib/logger.lua
diff --git a/baseManager/lib/netCore.lua b/netServices/lib/netCore.lua
similarity index 73%
rename from baseManager/lib/netCore.lua
rename to netServices/lib/netCore.lua
index 5f39ce0..98e3683 100644
--- a/baseManager/lib/netCore.lua
+++ b/netServices/lib/netCore.lua
@@ -1,19 +1,23 @@
 if(_Net == nil) then
-    require("defs.lua")
+    require("defs")
 
     local comp = require("component")
     local event = require("event")
     local Logger = require("logger")
 
     local modem = comp.modem
+
     _NetVars = {
         listeners   = {},
-        pListeners  = {}
+        pListeners  = {},
+        localHosts  = {},
+        DNSCache    = {},
+        remoteHosts = {}
     }
+
     _Net = {
     }
 
-
     function _Net.listen(port,listener)
         if(_NetVars.pListeners[port] == nil) then
             if(_NetVars.listeners[port] == nil) then
@@ -44,14 +48,11 @@ if(_Net == nil) then
         _Net.send(uuid,_NetDefs.portEnum.ping,_NetDefs.START)
     end
 
-    local function onMessage(eventName, localAddress, remoteAddress, port, distance, ...)
-        if(_NetVars.pListeners[port] ~= nil) then
-            _NetVars.pListeners[port](localAddress, remoteAddress, port, distance, arg)            
-        else
-            if(_NetVars.listeners[port]~= nil)then
-                _NetVars.listeners[port](localAddress, remoteAddress, port, distance, arg)
-            else
-                Logger:info("recived message on port:"..port.." but has no registered services on port");
+---@diagnostic disable-next-line: unused-local
+    local function onMessage(eventName, localAddress, remoteAddress, port, distance,routingMode,finalDestination, ...)
+        if(routingMode == _NetDefs.routingEnum.hostName) then
+            if(_NetVars.localHosts[finalDestination]~nil) then
+                
             end
         end
     end