diff --git a/include/Engine/Rendering/ModelJob.h b/include/Engine/Rendering/ModelJob.h
index 62235b33..a88530e7 100644
--- a/include/Engine/Rendering/ModelJob.h
+++ b/include/Engine/Rendering/ModelJob.h
@@ -12,6 +12,7 @@
 #include "../Core/ResourceManager.h"
 #include "Camera.h"
 #include "../Core/World.h"
+#include "../Core/Transform.h"
 
 struct ModelJob : RenderJob
 {
diff --git a/resources/Schema/Entities/EditorTestWorld.xml b/resources/Schema/Entities/EditorTestWorld.xml
index a482cf1b..733e643b 100755
--- a/resources/Schema/Entities/EditorTestWorld.xml
+++ b/resources/Schema/Entities/EditorTestWorld.xml
@@ -48,8 +48,8 @@
         <c:Camera/>
         <c:Listener/>
         <c:Transform>
-          <Position X="-3.7727046" Y="4.42466021" Z="5.32631207"/>
-          <Orientation X="-0.174533114" Y="-0.62824142" Z="-6.35425181e-07"/>
+          <Position X="1.36896265" Y="4.4259491" Z="10.6640663"/>
+          <Orientation X="-0.0349078104" Y="0.157154545" Z="-2.60020244e-07"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -61,8 +61,8 @@
           <Resource>Models/DirectionalLightWidget.obj</Resource>
         </c:Model>
         <c:Transform>
-          <Position X="0" Y="1.37382936" Z="0"/>
-          <Orientation X="1.4920001" Y="1.96300006" Z="0"/>
+          <Position X="2.1529963" Y="6.59221172" Z="0.169116676"/>
+          <Orientation X="4.32000017" Y="4.6340003" Z="0"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -83,7 +83,7 @@
               <Resource>Models/SecondaryWeapon4.fbx</Resource>
             </c:Model>
             <c:Transform>
-              <Position X="-0.545270562" Y="0.859505534" Z="0.188573226"/>
+              <Position X="-0.546139359" Y="0.853016734" Z="0.177482292"/>
               <Orientation X="1.47266471" Y="0.524984181" Z="1.243698"/>
             </c:Transform>
           </Components>
diff --git a/src/Engine/Rendering/Renderer.cpp b/src/Engine/Rendering/Renderer.cpp
index a642e667..8c30adfd 100644
--- a/src/Engine/Rendering/Renderer.cpp
+++ b/src/Engine/Rendering/Renderer.cpp
@@ -147,10 +147,10 @@ void Renderer::InitializeTextures()
 }
 
 
-void Renderer::SortRenderJobsByDepth(RenderScene *scene)
+void Renderer::SortRenderJobsByDepth(RenderScene &scene)
 {
     //Sort all forward jobs so transparency is good.
-    scene->ForwardJobs.sort(Renderer::DepthSort);
+    scene.ForwardJobs.sort(Renderer::DepthSort);
 }
 
 void Renderer::GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type)
diff --git a/src/Game/Game.cpp b/src/Game/Game.cpp
index eb0e6b3f..1985d9dc 100644
--- a/src/Game/Game.cpp
+++ b/src/Game/Game.cpp
@@ -29,7 +29,7 @@ Game::Game(int argc, char* argv[])
 
 
     // Create the renderer
-    m_Renderer = new Renderer(m_EventBroker, m_World);
+    m_Renderer = new Renderer(m_EventBroker);
     m_Renderer->SetFullscreen(m_Config->Get<bool>("Video.Fullscreen", false));
     m_Renderer->SetVSYNC(m_Config->Get<bool>("Video.VSYNC", false));
     m_Renderer->SetResolution(Rectangle::Rectangle(