diff --git a/SHADE_Engine/src/Math/Transform/SHTransformSystem.cpp b/SHADE_Engine/src/Math/Transform/SHTransformSystem.cpp
index f420834d..adbdf746 100644
--- a/SHADE_Engine/src/Math/Transform/SHTransformSystem.cpp
+++ b/SHADE_Engine/src/Math/Transform/SHTransformSystem.cpp
@@ -21,12 +21,18 @@
 
 namespace SHADE
 {
+  /*-----------------------------------------------------------------------------------*/
+  /* Static Data Member Definitions                                                    */
+  /*-----------------------------------------------------------------------------------*/
+
+  //SHTransformSystem::TransformUpdateRoutine SHTransformSystem::UpdateRoutine;
+
   /*-----------------------------------------------------------------------------------*/
   /* Constructors & Destructor Definitions                                             */
   /*-----------------------------------------------------------------------------------*/
 
-  SHTransformSystem::SHTransformSystem()
-  : SHSystemRoutine { "Transform Routine", false }
+  SHTransformSystem::TransformUpdateRoutine::TransformUpdateRoutine()
+  : SHSystemRoutine { "Transform Update", false }
   {}
 
 
@@ -34,7 +40,7 @@ namespace SHADE
   /* Public Function Member Definitions                                                */
   /*-----------------------------------------------------------------------------------*/
 
-  void SHTransformSystem::Execute(double dt) noexcept
+  void SHTransformSystem::TransformUpdateRoutine::Execute(double) noexcept
   {
     // Get the current scene graph to traverse and update
     const auto& SCENE_GRAPH = SHSceneManager::GetCurrentSceneGraph();
diff --git a/SHADE_Engine/src/Math/Transform/SHTransformSystem.h b/SHADE_Engine/src/Math/Transform/SHTransformSystem.h
index 5eebd292..c57cbdbd 100644
--- a/SHADE_Engine/src/Math/Transform/SHTransformSystem.h
+++ b/SHADE_Engine/src/Math/Transform/SHTransformSystem.h
@@ -21,19 +21,18 @@ namespace SHADE
   /* Type Definitions                                                                  */
   /*-----------------------------------------------------------------------------------*/
 
-  class SH_API SHTransformSystem : public SHSystemRoutine
+  class SH_API SHTransformSystem : public SHSystem
   {
   public:
-
     /*---------------------------------------------------------------------------------*/
     /* Constructors & Destructor                                                       */
     /*---------------------------------------------------------------------------------*/
 
-    SHTransformSystem             ();
-    ~SHTransformSystem            () = default;
+    SHTransformSystem   () = default;
+    ~SHTransformSystem  () = default;
 
-    SHTransformSystem             (const SHTransformSystem&)  = delete;
-    SHTransformSystem             (SHTransformSystem&&)       = delete;
+    SHTransformSystem   (const SHTransformSystem&)  = delete;
+    SHTransformSystem   (SHTransformSystem&&)       = delete;
 
     /*---------------------------------------------------------------------------------*/
     /* Operator Overloads                                                              */
@@ -43,10 +42,37 @@ namespace SHADE
     SHTransformSystem& operator=  (SHTransformSystem&&)       = delete;
 
     /*---------------------------------------------------------------------------------*/
-    /* Function Members                                                                */
+    /* System Routines                                                                 */
     /*---------------------------------------------------------------------------------*/
 
-    void Execute(double dt) noexcept override;
+    class TransformUpdateRoutine : public SHSystemRoutine
+    {
+    public:
+      /*-------------------------------------------------------------------------------*/
+      /* Constructors & Destructor                                                     */
+      /*-------------------------------------------------------------------------------*/
+
+      TransformUpdateRoutine   ();
+      ~TransformUpdateRoutine  () = default;
+
+      TransformUpdateRoutine   (const TransformUpdateRoutine&)  = delete;
+      TransformUpdateRoutine   (TransformUpdateRoutine&&)       = delete;
+
+      /*-------------------------------------------------------------------------------*/
+      /* Operator Overloads                                                            */
+      /*-------------------------------------------------------------------------------*/
+
+      TransformUpdateRoutine& operator= (const TransformUpdateRoutine&) = delete;
+      TransformUpdateRoutine& operator= (TransformUpdateRoutine&&)      = delete;
+
+      /*-------------------------------------------------------------------------------*/
+      /* Function Members                                                              */
+      /*-------------------------------------------------------------------------------*/
+
+      void Execute(double dt) noexcept override;
+    };
+
+    //static TransformUpdateRoutine UpdateRoutine;
 
   private:
     /*---------------------------------------------------------------------------------*/