diff --git a/Assets/Editor/Layouts/UserLayout.ini b/Assets/Editor/Layouts/UserLayout.ini
index 396b853b..7b0a70f8 100644
--- a/Assets/Editor/Layouts/UserLayout.ini
+++ b/Assets/Editor/Layouts/UserLayout.ini
@@ -38,7 +38,7 @@ Collapsed=0
 DockId=0x00000002,0
 
 [Docking][Data]
-DockSpace       ID=0xC5C9B8AB Window=0xBE4044E9 Pos=-227,-1256 Size=1920,1012 Split=X
+DockSpace       ID=0xC5C9B8AB Window=0xBE4044E9 Pos=8,79 Size=1920,1012 Split=X
   DockNode      ID=0x00000005 Parent=0xC5C9B8AB SizeRef=1481,1036 Split=X
     DockNode    ID=0x00000001 Parent=0x00000005 SizeRef=349,1036 Split=Y Selected=0x1E6EB881
       DockNode  ID=0x00000003 Parent=0x00000001 SizeRef=225,94 Selected=0x1E6EB881
diff --git a/SHADE_Application/src/Application/SBApplication.cpp b/SHADE_Application/src/Application/SBApplication.cpp
index 8733e7b9..3675e275 100644
--- a/SHADE_Application/src/Application/SBApplication.cpp
+++ b/SHADE_Application/src/Application/SBApplication.cpp
@@ -83,11 +83,13 @@ namespace Sandbox
     SHSystemManager::RegisterRoutine<SHScriptEngine, SHScriptEngine::LateUpdateRoutine>();
     SHSystemManager::RegisterRoutine<SHScriptEngine, SHScriptEngine::FrameCleanUpRoutine>();
 
+    SHSystemManager::RegisterRoutine<SHTransformSystem, SHTransformSystem::TransformPostLogicUpdate>();
+
     SHSystemManager::RegisterRoutine<SHPhysicsSystem, SHPhysicsSystem::PhysicsPreUpdate>();
     SHSystemManager::RegisterRoutine<SHPhysicsSystem, SHPhysicsSystem::PhysicsFixedUpdate>();
     SHSystemManager::RegisterRoutine<SHPhysicsSystem, SHPhysicsSystem::PhysicsPostUpdate>();
 
-    SHSystemManager::RegisterRoutine<SHTransformSystem, SHTransformSystem::TransformUpdateRoutine>();
+    SHSystemManager::RegisterRoutine<SHTransformSystem, SHTransformSystem::TransformPostPhysicsUpdate>();
 
     SHSystemManager::RegisterRoutine<SHGraphicsSystem, SHGraphicsSystem::BatcherDispatcherRoutine>();
     SHSystemManager::RegisterRoutine<SHGraphicsSystem, SHGraphicsSystem::BeginRoutine>();
diff --git a/SHADE_Engine/src/Math/Transform/SHTransformSystem.cpp b/SHADE_Engine/src/Math/Transform/SHTransformSystem.cpp
index a3ca3e75..4b4f1cce 100644
--- a/SHADE_Engine/src/Math/Transform/SHTransformSystem.cpp
+++ b/SHADE_Engine/src/Math/Transform/SHTransformSystem.cpp
@@ -28,8 +28,12 @@ namespace SHADE
   /* Constructors & Destructor Definitions                                             */
   /*-----------------------------------------------------------------------------------*/
 
-  SHTransformSystem::TransformUpdateRoutine::TransformUpdateRoutine()
-  : SHSystemRoutine { "Transform Update", true }
+  SHTransformSystem::TransformPostLogicUpdate::TransformPostLogicUpdate()
+  : SHSystemRoutine { "Transform Post-Logic Update", true }
+  {}
+
+  SHTransformSystem::TransformPostPhysicsUpdate::TransformPostPhysicsUpdate()
+  : SHSystemRoutine { "Transform Post-Physics Update", false }
   {}
 
 
@@ -37,13 +41,20 @@ namespace SHADE
   /* Public Function Member Definitions                                                */
   /*-----------------------------------------------------------------------------------*/
 
-  void SHTransformSystem::TransformUpdateRoutine::Execute(double) noexcept
+  void SHTransformSystem::TransformPostLogicUpdate::Execute(double) noexcept
   {
     // Get the current scene graph to traverse and update
     const auto& SCENE_GRAPH = SHSceneManager::GetCurrentSceneGraph();
     UpdateEntity(SCENE_GRAPH.GetRoot());
   }
 
+  void SHTransformSystem::TransformPostPhysicsUpdate::Execute(double dt) noexcept
+  {
+    // Get the current scene graph to traverse and update
+    const auto& SCENE_GRAPH = SHSceneManager::GetCurrentSceneGraph();
+    UpdateEntityAndClear(SCENE_GRAPH.GetRoot());
+  }
+
   void SHTransformSystem::Init()
   {
     std::shared_ptr thisReceiver { std::make_shared<SHEventReceiverSpec<SHTransformSystem>>(this, &SHTransformSystem::ChangeParent) };
@@ -175,6 +186,33 @@ namespace SHADE
       }
 
       UpdateEntity(child);
+    }
+  }
+
+
+  void SHTransformSystem::UpdateEntityAndClear(const SHSceneNode* node)
+  {
+    const auto* NODE_TRANSFORM = SHComponentManager::GetComponent_s<SHTransformComponent>(node->GetEntityID());
+    const bool HAS_PARENT_CHANGED = NODE_TRANSFORM && NODE_TRANSFORM->dirty;
+
+    for (const auto* child : node->GetChildren())
+    {
+      auto* childTransform = SHComponentManager::GetComponent_s<SHTransformComponent>(child->GetEntityID());
+      if (childTransform)
+      {
+        // Only update if node in hierarchy and component are both active
+        const bool IS_NODE_ACTIVE = child->IsActive();
+        if (IS_NODE_ACTIVE && childTransform->isActive)
+        {
+          if (childTransform->dirty || HAS_PARENT_CHANGED)
+          {
+            UpdateTransform(*childTransform, NODE_TRANSFORM);
+            childTransform->dirty = true;
+          }
+        }
+      }
+
+      UpdateEntityAndClear(child);
 
       // Clear dirty flag after all children are updated
       if (childTransform)
diff --git a/SHADE_Engine/src/Math/Transform/SHTransformSystem.h b/SHADE_Engine/src/Math/Transform/SHTransformSystem.h
index 95957830..256c1561 100644
--- a/SHADE_Engine/src/Math/Transform/SHTransformSystem.h
+++ b/SHADE_Engine/src/Math/Transform/SHTransformSystem.h
@@ -45,25 +45,52 @@ namespace SHADE
     /* System Routines                                                                 */
     /*---------------------------------------------------------------------------------*/
 
-    class SH_API TransformUpdateRoutine final: public SHSystemRoutine
+    class SH_API TransformPostLogicUpdate final: public SHSystemRoutine
     {
     public:
       /*-------------------------------------------------------------------------------*/
       /* Constructors & Destructor                                                     */
       /*-------------------------------------------------------------------------------*/
 
-      TransformUpdateRoutine   ();
-      ~TransformUpdateRoutine  () = default;
+      TransformPostLogicUpdate   ();
+      ~TransformPostLogicUpdate  () = default;
 
-      TransformUpdateRoutine   (const TransformUpdateRoutine&)  = delete;
-      TransformUpdateRoutine   (TransformUpdateRoutine&&)       = delete;
+      TransformPostLogicUpdate   (const TransformPostLogicUpdate&)  = delete;
+      TransformPostLogicUpdate   (TransformPostLogicUpdate&&)       = delete;
 
       /*-------------------------------------------------------------------------------*/
       /* Operator Overloads                                                            */
       /*-------------------------------------------------------------------------------*/
 
-      TransformUpdateRoutine& operator= (const TransformUpdateRoutine&) = delete;
-      TransformUpdateRoutine& operator= (TransformUpdateRoutine&&)      = delete;
+      TransformPostLogicUpdate& operator= (const TransformPostLogicUpdate&) = delete;
+      TransformPostLogicUpdate& operator= (TransformPostLogicUpdate&&)      = delete;
+
+      /*-------------------------------------------------------------------------------*/
+      /* Function Members                                                              */
+      /*-------------------------------------------------------------------------------*/
+
+      void Execute(double dt) noexcept override;
+    };
+
+    class SH_API TransformPostPhysicsUpdate final: public SHSystemRoutine
+    {
+    public:
+      /*-------------------------------------------------------------------------------*/
+      /* Constructors & Destructor                                                     */
+      /*-------------------------------------------------------------------------------*/
+
+      TransformPostPhysicsUpdate   ();
+      ~TransformPostPhysicsUpdate  () = default;
+
+      TransformPostPhysicsUpdate   (const TransformPostPhysicsUpdate&)  = delete;
+      TransformPostPhysicsUpdate   (TransformPostPhysicsUpdate&&)       = delete;
+
+      /*-------------------------------------------------------------------------------*/
+      /* Operator Overloads                                                            */
+      /*-------------------------------------------------------------------------------*/
+
+      TransformPostPhysicsUpdate& operator= (const TransformPostPhysicsUpdate&) = delete;
+      TransformPostPhysicsUpdate& operator= (TransformPostPhysicsUpdate&&)      = delete;
 
       /*-------------------------------------------------------------------------------*/
       /* Function Members                                                              */
@@ -88,6 +115,7 @@ namespace SHADE
     static void   UpdateChildrenLocalTransforms (SHSceneNode* node);
 
     static void   UpdateEntity                  (const SHSceneNode* node);
+    static void   UpdateEntityAndClear          (const SHSceneNode* node);
     static void   UpdateTransform               (SHTransformComponent& tf, const SHTransformComponent* parent = nullptr);
   };