diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingChunk.cs b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingChunk.cs
index 202961dc3f..90af19c821 100644
--- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingChunk.cs
+++ b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingChunk.cs
@@ -29,9 +29,8 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding
             _indices = indices;
         }
 
-        public void Initialize()
+        public void Initialize(IMapGrid grid)
         {
-            var grid = IoCManager.Resolve<IMapManager>().GetGrid(GridId);
             for (var x = 0; x < ChunkSize; x++)
             {
                 for (var y = 0; y < ChunkSize; y++)
diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingNode.cs b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingNode.cs
index 855bad56e7..57e96fde61 100644
--- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingNode.cs
+++ b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingNode.cs
@@ -98,6 +98,7 @@ namespace Content.Server.GameObjects.EntitySystems.Pathfinding
         /// </summary>
         /// <param name="entity"></param>
         /// TODO: These 2 methods currently don't account for a bunch of changes (e.g. airlock unpowered, wrenching, etc.)
+        /// TODO: Could probably optimise this slightly more.
         public void AddEntity(IEntity entity)
         {
             // If we're a door
@@ -128,25 +129,28 @@ namespace Content.Server.GameObjects.EntitySystems.Pathfinding
             }
         }
 
+        /// <summary>
+        /// Remove the entity from this node.
+        /// Will check each category and remove it from the applicable one
+        /// </summary>
+        /// <param name="entity"></param>
         public void RemoveEntity(IEntity entity)
         {
-            if (_accessReaders.ContainsKey(entity.Uid))
+            // There's no guarantee that the entity isn't deleted
+            // 90% of updates are probably entities moving around
+            // Entity can't be under multiple categories so just checking each once is fine.
+            if (_physicsUids.Contains(entity.Uid))
+            {
+                _physicsUids.Remove(entity.Uid);
+            } 
+            else if (_accessReaders.ContainsKey(entity.Uid))
             {
                 _accessReaders.Remove(entity.Uid);
-                return;
-            }
-
-            if (entity.HasComponent<CollidableComponent>())
+            } 
+            else if (_blockedCollidables.ContainsKey(entity.Uid))
             {
-                if (entity.TryGetComponent(out PhysicsComponent physicsComponent) && physicsComponent.Anchored)
-                {
-                    _blockedCollidables.Remove(entity.Uid);
-                    GenerateMask();
-                }
-                else
-                {
-                    _physicsUids.Remove(entity.Uid);
-                }
+                _blockedCollidables.Remove(entity.Uid);
+                GenerateMask();
             }
         }
 
diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingSystem.cs b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingSystem.cs
index 5a718e01e2..efd558603b 100644
--- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingSystem.cs
@@ -7,6 +7,7 @@ using Content.Server.GameObjects.EntitySystems.JobQueues;
 using Content.Server.GameObjects.EntitySystems.JobQueues.Queues;
 using Content.Server.GameObjects.EntitySystems.Pathfinding;
 using Content.Shared.Physics;
+using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Components;
 using Robust.Shared.GameObjects.Components.Transform;
 using Robust.Shared.GameObjects.Systems;
@@ -40,13 +41,13 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding
         private readonly PathfindingJobQueue _pathfindingQueue = new PathfindingJobQueue();
         
         // Queued pathfinding graph updates
-        private readonly Queue<CollisionChangeEvent> _collidableUpdateQueue = new Queue<CollisionChangeEvent>();
+        private readonly Queue<CollisionChangeMessage> _collidableUpdateQueue = new Queue<CollisionChangeMessage>();
         private readonly Queue<MoveEvent> _moveUpdateQueue = new Queue<MoveEvent>();
         private readonly Queue<AccessReaderChangeMessage> _accessReaderUpdateQueue = new Queue<AccessReaderChangeMessage>();
         private readonly Queue<TileRef> _tileUpdateQueue = new Queue<TileRef>();
 
         // Need to store previously known entity positions for collidables for when they move
-        private readonly Dictionary<IEntity, TileRef> _lastKnownPositions = new Dictionary<IEntity, TileRef>();
+        private readonly Dictionary<EntityUid, PathfindingNode> _lastKnownPositions = new Dictionary<EntityUid, PathfindingNode>();
 
         public const int TrackedCollisionLayers = (int)
             (CollisionGroup.Impassable | 
@@ -88,11 +89,11 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding
                 var entity = _entitymanager.GetEntity(update.Owner);
                 if (update.CanCollide)
                 {
-                    HandleCollidableAdd(entity);
+                    HandleEntityAdd(entity);
                 }
                 else
                 {
-                    HandleAccessRemove(entity);
+                    HandleEntityRemove(entity);
                 }
 
                 totalUpdates++;
@@ -105,11 +106,11 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding
                 var entity = _entitymanager.GetEntity(update.Uid);
                 if (update.Enabled)
                 {
-                    HandleAccessAdd(entity);
+                    HandleEntityAdd(entity);
                 }
                 else
                 {
-                    HandleAccessRemove(entity);
+                    HandleEntityRemove(entity);
                 }
 
                 totalUpdates++;
@@ -166,15 +167,22 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding
         private PathfindingChunk CreateChunk(GridId gridId, MapIndices indices)
         {
             var newChunk = new PathfindingChunk(gridId, indices);
-            newChunk.Initialize();
             if (!_graph.ContainsKey(gridId))
             {
                 _graph.Add(gridId, new Dictionary<MapIndices, PathfindingChunk>());
             }
+            
             _graph[gridId].Add(indices, newChunk);
+            newChunk.Initialize(_mapManager.GetGrid(gridId));
+            
             return newChunk;
         }
 
+        /// <summary>
+        /// Return the corresponding PathfindingNode for this tile
+        /// </summary>
+        /// <param name="tile"></param>
+        /// <returns></returns>
         public PathfindingNode GetNode(TileRef tile)
         {
             var chunk = GetChunk(tile);
@@ -185,9 +193,9 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding
 
         public override void Initialize()
         {
-            SubscribeLocalEvent<CollisionChangeEvent>(QueueCollisionEnabledEvent);
-            SubscribeLocalEvent<MoveEvent>(QueueCollidableMove);
-            SubscribeLocalEvent<AccessReaderChangeMessage>(QueueAccessChangeEvent);
+            SubscribeLocalEvent<CollisionChangeMessage>(QueueCollisionChangeMessage);
+            SubscribeLocalEvent<MoveEvent>(QueueMoveEvent);
+            SubscribeLocalEvent<AccessReaderChangeMessage>(QueueAccessChangeMessage);
 
             // Handle all the base grid changes
             // Anything that affects traversal (i.e. collision layer) is handled separately.
@@ -199,7 +207,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding
         public override void Shutdown()
         {
             base.Shutdown();
-            UnsubscribeLocalEvent<CollisionChangeEvent>();
+            UnsubscribeLocalEvent<CollisionChangeMessage>();
             UnsubscribeLocalEvent<MoveEvent>();
             UnsubscribeLocalEvent<AccessReaderChangeMessage>();
             
@@ -245,14 +253,19 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding
             _tileUpdateQueue.Enqueue(eventArgs.NewTile);
         }
 
-        private void QueueAccessChangeEvent(AccessReaderChangeMessage message)
+        private void QueueAccessChangeMessage(AccessReaderChangeMessage message)
         {
             _accessReaderUpdateQueue.Enqueue(message);
         }
 
-        private void HandleAccessAdd(IEntity entity)
+        /// <summary>
+        /// Tries to add the entity to the relevant pathfinding node
+        /// </summary>
+        /// The node will filter it to the correct category (if possible)
+        /// <param name="entity"></param>
+        private void HandleEntityAdd(IEntity entity)
         {
-            if (entity.Deleted || !entity.HasComponent<AccessReader>())
+            if (entity.Deleted || _lastKnownPositions.ContainsKey(entity.Uid))
             {
                 return;
             }
@@ -263,82 +276,34 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding
             var chunk = GetChunk(tileRef);
             var node = chunk.GetNode(tileRef);
             node.AddEntity(entity);
+            _lastKnownPositions.Add(entity.Uid, node);
         }
 
-        private void HandleAccessRemove(IEntity entity)
+        private void HandleEntityRemove(IEntity entity)
         {
-            if (entity.Deleted || !entity.HasComponent<AccessReader>())
+            if (!_lastKnownPositions.TryGetValue(entity.Uid, out var node))
             {
                 return;
             }
-            
-            var grid = _mapManager.GetGrid(entity.Transform.GridID);
-            var tileRef = grid.GetTileRef(entity.Transform.GridPosition);
-
-            var chunk = GetChunk(tileRef);
-            var node = chunk.GetNode(tileRef);
-            node.RemoveEntity(entity);
-        }
-
-        #region collidable
-        /// <summary>
-        /// If an entity's collision gets turned on then we need to update its current position
-        /// </summary>
-        /// <param name="entity"></param>
-        private void HandleCollidableAdd(IEntity entity)
-        {
-            if (entity.Prototype == null ||
-                entity.Deleted ||
-                _lastKnownPositions.ContainsKey(entity) || 
-                !entity.TryGetComponent(out CollidableComponent collidableComponent) || 
-                !collidableComponent.CanCollide || 
-                (TrackedCollisionLayers & collidableComponent.CollisionLayer) == 0)
-            {
-                return;
-            }
-
-            var grid = _mapManager.GetGrid(entity.Transform.GridID);
-            var tileRef = grid.GetTileRef(entity.Transform.GridPosition);
-            var chunk = GetChunk(tileRef);
-            var node = chunk.GetNode(tileRef);
-
-            node.AddEntity(entity);
-            _lastKnownPositions.Add(entity, tileRef);
-        }
-
-        /// <summary>
-        /// If an entity's collision is removed then stop tracking it from the graph
-        /// </summary>
-        /// <param name="entity"></param>
-        private void HandleCollidableRemove(IEntity entity)
-        {
-            if (entity.Prototype == null ||
-                entity.Deleted ||
-                !_lastKnownPositions.ContainsKey(entity) || 
-                !entity.TryGetComponent(out CollidableComponent collidableComponent) || 
-                !collidableComponent.CanCollide || 
-                (TrackedCollisionLayers & collidableComponent.CollisionLayer) == 0)
-            {
-                return;
-            }
-
-            var grid = _mapManager.GetGrid(entity.Transform.GridID);
-            var tileRef = grid.GetTileRef(entity.Transform.GridPosition);
-            var chunk = GetChunk(tileRef);
-            var node = chunk.GetNode(tileRef);
 
             node.RemoveEntity(entity);
-            _lastKnownPositions.Remove(entity);
+            _lastKnownPositions.Remove(entity.Uid);
         }
 
-        private void QueueCollidableMove(MoveEvent moveEvent)
+        private void QueueMoveEvent(MoveEvent moveEvent)
         {
             _moveUpdateQueue.Enqueue(moveEvent);
         }
 
+        /// <summary>
+        /// When an entity moves around we'll remove it from its old node and add it to its new node (if applicable)
+        /// </summary>
+        /// <param name="moveEvent"></param>
         private void HandleCollidableMove(MoveEvent moveEvent)
         {
-            if (!_lastKnownPositions.ContainsKey(moveEvent.Sender))
+            var entityUid = moveEvent.Sender.Uid;
+            
+            if (!_lastKnownPositions.TryGetValue(entityUid, out var oldNode))
             {
                 return;
             }
@@ -347,51 +312,28 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding
             // If you get entities bigger than 1 tile wide you'll need some other system so god help you.
             if (moveEvent.Sender.Deleted)
             {
-                HandleCollidableRemove(moveEvent.Sender);
+                HandleEntityRemove(moveEvent.Sender);
                 return;
             }
-
-            _lastKnownPositions.TryGetValue(moveEvent.Sender, out var oldTile);
+            
             var newTile = _mapManager.GetGrid(moveEvent.NewPosition.GridID).GetTileRef(moveEvent.NewPosition);
 
-            if (oldTile == newTile)
+            if (oldNode == null || oldNode.TileRef == newTile)
             {
                 return;
             }
 
-            _lastKnownPositions[moveEvent.Sender] = newTile;
+            var newNode = GetNode(newTile);
+            _lastKnownPositions[entityUid] = newNode;
 
-            if (!moveEvent.Sender.HasComponent<CollidableComponent>())
-            {
-                HandleCollidableRemove(moveEvent.Sender);
-                return;
-            }
-
-            var gridIds = new HashSet<GridId>(2) {oldTile.GridIndex, newTile.GridIndex};
-
-            foreach (var gridId in gridIds)
-            {
-                if (oldTile.GridIndex == gridId)
-                {
-                    var oldChunk = GetChunk(oldTile);
-                    var oldNode = oldChunk.GetNode(oldTile);
-                    oldNode.RemoveEntity(moveEvent.Sender);
-                }
-
-                if (newTile.GridIndex == gridId)
-                {
-                    var newChunk = GetChunk(newTile);
-                    var newNode = newChunk.GetNode(newTile);
-                    newNode.AddEntity(moveEvent.Sender);
-                }
-            }
+            oldNode.RemoveEntity(moveEvent.Sender);
+            newNode.AddEntity(moveEvent.Sender);
         }
 
-        private void QueueCollisionEnabledEvent(CollisionChangeEvent collisionEvent)
+        private void QueueCollisionChangeMessage(CollisionChangeMessage collisionMessage)
         {
-            _collidableUpdateQueue.Enqueue(collisionEvent);
+            _collidableUpdateQueue.Enqueue(collisionMessage);
         }
-        #endregion
 
         // TODO: Need to rethink the pathfinder utils (traversable etc.). Maybe just chuck them all in PathfindingSystem
         // Otherwise you get the steerer using this and the pathfinders using a different traversable.