diff --git a/Engine b/Engine
index 0766635..3817ebe 160000
--- a/Engine
+++ b/Engine
@@ -1 +1 @@
-Subproject commit 07666359f26d4761914aac05d73fdbe0020b0b6a
+Subproject commit 3817ebebfe3c3d328219656033f2518da6a59350
diff --git a/Game/Behaviours/MonoGameCameraBehaviour.cs b/Game/Behaviours/MonoGameCameraBehaviour.cs
index f04f56f..69c8f3b 100644
--- a/Game/Behaviours/MonoGameCameraBehaviour.cs
+++ b/Game/Behaviours/MonoGameCameraBehaviour.cs
@@ -68,6 +68,9 @@ public class MonoGameCameraBehaviour : BehaviourOverride
         set => Transform.Rotation = value;
     }
 
+    protected override void OnFirstActiveFrame()
+        => Viewport = GamePong.graphics.GraphicsDevice.Viewport;
+
     protected override void OnPreDraw()
     {
         MatrixTransform =
diff --git a/Game/GamePong.cs b/Game/GamePong.cs
index 362f5aa..402e30d 100644
--- a/Game/GamePong.cs
+++ b/Game/GamePong.cs
@@ -59,10 +59,9 @@ public class GamePong : Game
         shapeBatch = new ShapeBatch(GraphicsDevice, Content);
         SpriteFont spriteFont = Content.Load<SpriteFont>("UbuntuMono");
 
-        IGameObject gameObjectCamera = gameManager.InstantiateGameObject<GameObject>();
-        gameObjectCamera.Name = "Camera";
-        gameObjectCamera.Transform.Position = Vector2D.Zero;
+        ////////////////////////////////////////////////////////////////////////////////////
 
+        IGameObject gameObjectCamera = gameManager.InstantiateGameObject<GameObject>().SetGameObject("Camera"); ;
         gameObjectCamera.BehaviourController.AddBehaviour<CameraController>();
 
         cameraBehaviour = gameObjectCamera.BehaviourController.AddBehaviour<MonoGameCameraBehaviour>();
@@ -70,16 +69,14 @@ public class GamePong : Game
 
         ////////////////////////////////////////////////////////////////////////////////////
 
-        IGameObject gameObjectPongManager = gameManager.InstantiateGameObject<GameObject>();
-        gameObjectPongManager.Name = "Pong Game Manager";
+        IGameObject gameObjectPongManager = gameManager.InstantiateGameObject<GameObject>().SetGameObject("Pong Game Manager");
         pongManager = gameObjectPongManager.BehaviourController.AddBehaviour<PongManager>(5);
 
         ////////////////////////////////////////////////////////////////////////////////////
 
-        IGameObject gameObjectBall = gameManager.InstantiateGameObject<GameObject>();
-        gameObjectBall.Name = "Ball";
-        gameObjectBall.Transform.Position = new Vector2D(0, 0f);
-        gameObjectBall.Transform.Scale = new Vector2D(10f, 10f);
+        IGameObject gameObjectBall = gameManager.InstantiateGameObject<GameObject>().SetGameObject("Ball");
+        gameObjectBall.Transform.SetTransform(position: new Vector2D(0, 0f), scale: new Vector2D(10f, 10f));
+
         gameObjectBall.BehaviourController.AddBehaviour<CircleBehaviour>(new Circle(Vector2D.Zero, 1f));
         PongBall ballBehaviour = gameObjectBall.BehaviourController.AddBehaviour<PongBall>();
         RigidBody2D rigidBodyBall = gameObjectBall.BehaviourController.AddBehaviour<RigidBody2D>();
@@ -87,20 +84,17 @@ public class GamePong : Game
 
         ////////////////////////////////////////////////////////////////////////////////////
 
-        IGameObject gameObjectLeftPaddle = gameManager.InstantiateGameObject<GameObject>();
-        gameObjectLeftPaddle.Name = "Left Paddle";
-        gameObjectLeftPaddle.Transform.Position = new Vector2D(-468f, 0f);
-        gameObjectLeftPaddle.Transform.Scale = new Vector2D(15f, 60f);
+        IGameObject gameObjectLeftPaddle = gameManager.InstantiateGameObject<GameObject>().SetGameObject("Left Paddle");
+        gameObjectLeftPaddle.Transform.SetTransform(position: new Vector2D(-468f, 0f), scale: new Vector2D(15f, 60f));
+
         gameObjectLeftPaddle.BehaviourController.AddBehaviour<MovementBoxBehaviour>(Keys.W, Keys.S, 228f, -228f, 400f);
         gameObjectLeftPaddle.BehaviourController.AddBehaviour<ShapeBehaviour>(Shape.Box);
         RigidBody2D rigidBodyLeftPaddle = gameObjectLeftPaddle.BehaviourController.AddBehaviour<RigidBody2D>();
         rigidBodyLeftPaddle.IsStatic = true;
         engine.AddRigidBody(rigidBodyLeftPaddle);
 
-        IGameObject gameObjectRightPaddle = gameManager.InstantiateGameObject<GameObject>();
-        gameObjectRightPaddle.Name = "Right Paddle";
-        gameObjectRightPaddle.Transform.Position = new Vector2D(468f, 0f);
-        gameObjectRightPaddle.Transform.Scale = new Vector2D(15f, 60f);
+        IGameObject gameObjectRightPaddle = gameManager.InstantiateGameObject<GameObject>().SetGameObject("Right Paddle");
+        gameObjectRightPaddle.Transform.SetTransform(position: new Vector2D(468f, 0f), scale: new Vector2D(15f, 60f));
         gameObjectRightPaddle.BehaviourController.AddBehaviour<MovementBoxBehaviour>(Keys.Up, Keys.Down, 228f, -228f, 400f);
         gameObjectRightPaddle.BehaviourController.AddBehaviour<ShapeBehaviour>(Shape.Box);
         RigidBody2D rigidBodyRightPaddle = gameObjectRightPaddle.BehaviourController.AddBehaviour<RigidBody2D>();
@@ -109,38 +103,30 @@ public class GamePong : Game
 
         ////////////////////////////////////////////////////////////////////////////////////
 
-        IGameObject gameObjectWallTop = gameManager.InstantiateGameObject<GameObject>();
-        gameObjectWallTop.Name = "WallTop";
-        gameObjectWallTop.Transform.Position = new Vector2D(0f, 308f);
-        gameObjectWallTop.Transform.Scale = new Vector2D(552f, 20f);
+        IGameObject gameObjectWallTop = gameManager.InstantiateGameObject<GameObject>().SetGameObject("Wall Top");
+        gameObjectWallTop.Transform.SetTransform(position: new Vector2D(0f, 308f), scale: new Vector2D(552f, 20f));
         gameObjectWallTop.BehaviourController.AddBehaviour<ShapeBehaviour>(Shape.Box);
         RigidBody2D rigidBodyWallTop = gameObjectWallTop.BehaviourController.AddBehaviour<RigidBody2D>();
         rigidBodyWallTop.IsStatic = true;
         engine.AddRigidBody(rigidBodyWallTop);
 
-        IGameObject gameObjectWallBottom = gameManager.InstantiateGameObject<GameObject>();
-        gameObjectWallBottom.Name = "WallBottom";
-        gameObjectWallBottom.Transform.Position = new Vector2D(0f, -308f);
-        gameObjectWallBottom.Transform.Scale = new Vector2D(552f, 20f);
+        IGameObject gameObjectWallBottom = gameManager.InstantiateGameObject<GameObject>().SetGameObject("Wall Bottom");
+        gameObjectWallBottom.Transform.SetTransform(position: new Vector2D(0f, -308f), scale: new Vector2D(552f, 20f));
         gameObjectWallBottom.BehaviourController.AddBehaviour<ShapeBehaviour>(Shape.Box);
         RigidBody2D rigidBodyWallBottom = gameObjectWallBottom.BehaviourController.AddBehaviour<RigidBody2D>();
         rigidBodyWallBottom.IsStatic = true;
         engine.AddRigidBody(rigidBodyWallBottom);
 
-        IGameObject gameObjectWallRight = gameManager.InstantiateGameObject<GameObject>();
-        gameObjectWallRight.Name = "WallRight";
-        gameObjectWallRight.Transform.Position = new Vector2D(532f, 0f);
-        gameObjectWallRight.Transform.Scale = new Vector2D(20f, 328f);
+        IGameObject gameObjectWallRight = gameManager.InstantiateGameObject<GameObject>().SetGameObject("Wall Right");
+        gameObjectWallRight.Transform.SetTransform(position: new Vector2D(532f, 0f), scale: new Vector2D(20f, 328f));
         gameObjectWallRight.BehaviourController.AddBehaviour<ScoreBoundary>((Action)pongManager.ScoreToLeft);
         gameObjectWallRight.BehaviourController.AddBehaviour<ShapeBehaviour>(Shape.Box);
         RigidBody2D rigidBodyWallRight = gameObjectWallRight.BehaviourController.AddBehaviour<RigidBody2D>();
         rigidBodyWallRight.IsStatic = true;
         engine.AddRigidBody(rigidBodyWallRight);
 
-        IGameObject gameObjectWallLeft = gameManager.InstantiateGameObject<GameObject>();
-        gameObjectWallLeft.Name = "WallLeft";
-        gameObjectWallLeft.Transform.Position = new Vector2D(-532f, 0f);
-        gameObjectWallLeft.Transform.Scale = new Vector2D(20f, 328f);
+        IGameObject gameObjectWallLeft = gameManager.InstantiateGameObject<GameObject>().SetGameObject("Wall Left");
+        gameObjectWallLeft.Transform.SetTransform(position: new Vector2D(-532f, 0f), scale: new Vector2D(20f, 328f));
         gameObjectWallLeft.BehaviourController.AddBehaviour<ScoreBoundary>((Action)pongManager.ScoreToRight);
         gameObjectWallLeft.BehaviourController.AddBehaviour<ShapeBehaviour>(Shape.Box);
         RigidBody2D rigidBodyWallLeft = gameObjectWallLeft.BehaviourController.AddBehaviour<RigidBody2D>();
@@ -149,17 +135,14 @@ public class GamePong : Game
 
         ////////////////////////////////////////////////////////////////////////////////////
 
-        IGameObject gameObjectLeftScoreText = gameManager.InstantiateGameObject<GameObject>();
-        gameObjectLeftScoreText.Name = "Score Left";
-        gameObjectLeftScoreText.Transform.Position = new Vector2D(-250f, 250f);
-        gameObjectLeftScoreText.Transform.Scale = Vector2D.One * .25f;
+        IGameObject gameObjectLeftScoreText = gameManager.InstantiateGameObject<GameObject>().SetGameObject("Score Left");
+        gameObjectLeftScoreText.Transform.SetTransform(position: new Vector2D(-250f, 250f), scale: Vector2D.One * .25f);
         PongTextBehaviour textBehaviourLeft = gameObjectLeftScoreText.BehaviourController.AddBehaviour<PongTextBehaviour>(true);
         textBehaviourLeft.Font = spriteFont;
         textBehaviourLeft.Text = "0";
-        IGameObject gameObjectRightScoreText = gameManager.InstantiateGameObject<GameObject>();
-        gameObjectRightScoreText.Name = "Score Right";
-        gameObjectRightScoreText.Transform.Position = new Vector2D(250f, 250f);
-        gameObjectRightScoreText.Transform.Scale = Vector2D.One * .25f;
+
+        IGameObject gameObjectRightScoreText = gameManager.InstantiateGameObject<GameObject>().SetGameObject("Score Right");
+        gameObjectRightScoreText.Transform.SetTransform(position: new Vector2D(250f, 250f), scale: Vector2D.One * .25f);
         PongTextBehaviour textBehaviourRight = gameObjectRightScoreText.BehaviourController.AddBehaviour<PongTextBehaviour>(false);
         textBehaviourRight.Font = spriteFont;
         textBehaviourRight.Text = "0";
@@ -184,9 +167,6 @@ public class GamePong : Game
     {
         GraphicsDevice.Clear(new Color() { R = 32, G = 32, B = 32 });
 
-        // gameManager.Camera.Position = gameObjectBall.Transform.Position;
-        // Console.WriteLine($"Pos: {gameManager.Camera.Position}");
-
         // TODO: Add your drawing code here
         gameManager.PreDraw();