diff --git a/include/Engine/Collision/CollidableOctreeSystem.h b/include/Engine/Collision/CollidableOctreeSystem.h
index 0aa01d2e..c7d42eae 100644
--- a/include/Engine/Collision/CollidableOctreeSystem.h
+++ b/include/Engine/Collision/CollidableOctreeSystem.h
@@ -9,8 +9,8 @@
 class CollidableOctreeSystem : public ImpureSystem, public PureSystem
 {
 public:
-    CollidableOctreeSystem(World* world, EventBroker* eventBroker, Octree<EntityAABB>* octree, const std::string& componentType)
-        : System(world, eventBroker)
+    CollidableOctreeSystem(SystemParams params, Octree<EntityAABB>* octree, const std::string& componentType)
+        : System(params)
         , PureSystem(componentType)
         , m_Octree(octree)
     { }
diff --git a/include/Engine/Collision/CollisionSystem.h b/include/Engine/Collision/CollisionSystem.h
index f3a7e4fe..c963e6b8 100644
--- a/include/Engine/Collision/CollisionSystem.h
+++ b/include/Engine/Collision/CollisionSystem.h
@@ -13,8 +13,8 @@
 class CollisionSystem : public PureSystem
 {
 public:
-    CollisionSystem(World* world, EventBroker* eventBroker, Octree<EntityAABB>* octree)
-        : System(world, eventBroker)
+    CollisionSystem(SystemParams params, Octree<EntityAABB>* octree)
+        : System(params)
         , PureSystem("Collidable")
         , m_Octree(octree)
     { }
diff --git a/include/Engine/Collision/TriggerSystem.h b/include/Engine/Collision/TriggerSystem.h
index fa322ddd..d71fad08 100644
--- a/include/Engine/Collision/TriggerSystem.h
+++ b/include/Engine/Collision/TriggerSystem.h
@@ -15,8 +15,8 @@ class AABB;
 class TriggerSystem : public PureSystem
 {
 public:
-    TriggerSystem(World* world, EventBroker* eventBroker, Octree<EntityAABB>* octree)
-        : System(world, eventBroker)
+    TriggerSystem(SystemParams params, Octree<EntityAABB>* octree)
+        : System(params)
         , PureSystem("Trigger")
         , m_Octree(octree)
     {
diff --git a/include/Engine/Core/System.h b/include/Engine/Core/System.h
index ec57f5fc..d4b9808b 100644
--- a/include/Engine/Core/System.h
+++ b/include/Engine/Core/System.h
@@ -6,20 +6,38 @@
 #include "EntityWrapper.h"
 #include "ComponentWrapper.h"
 
+struct SystemParams
+{
+    SystemParams(::World* World, ::EventBroker* EventBroker, bool IsClient, bool IsServer)
+        : World(World)
+        , EventBroker(EventBroker)
+        , IsClient(IsClient)
+        , IsServer(IsServer)
+    { }
+
+    ::World* World;
+    ::EventBroker* EventBroker;
+    bool IsClient = false;
+    bool IsServer = false;
+};
+
 class System
 {
     friend class SystemPipeline;
 
 protected:
-    System(World* world, EventBroker) { }
-    System(World* world, EventBroker* eventBroker)
-        : m_World(world)
-        , m_EventBroker(eventBroker)
+    System(SystemParams params)
+        : m_World(params.World)
+        , m_EventBroker(params.EventBroker)
+        , IsClient(params.IsClient)
+        , IsServer(params.IsServer)
     { }
     virtual ~System() = default;
 
     World* m_World;
     EventBroker* m_EventBroker;
+    bool IsClient = false;
+    bool IsServer = false;
 };
 
 class PureSystem : public virtual System
diff --git a/include/Engine/Core/SystemPipeline.h b/include/Engine/Core/SystemPipeline.h
index 90303f12..88ec4fa7 100644
--- a/include/Engine/Core/SystemPipeline.h
+++ b/include/Engine/Core/SystemPipeline.h
@@ -10,9 +10,11 @@
 class SystemPipeline
 {
 public:
-    SystemPipeline(World* world, EventBroker* eventBroker)
+    SystemPipeline(World* world, EventBroker* eventBroker, bool isClient, bool isServer)
         : m_World(world)
         , m_EventBroker(eventBroker)
+        , m_IsClient(isClient)
+        , m_IsServer(isServer)
     {
         EVENT_SUBSCRIBE_MEMBER(m_EPause, &SystemPipeline::OnPause);
         EVENT_SUBSCRIBE_MEMBER(m_EResume, &SystemPipeline::OnResume);
@@ -35,7 +37,7 @@ public:
             m_OrderedSystemGroups.resize(updateOrderLevel + 1);
         }
         UnorderedSystems& group = m_OrderedSystemGroups[updateOrderLevel];
-        System* system = new T(m_World, m_EventBroker, args...);
+        System* system = new T(SystemParams(m_World, m_EventBroker, m_IsClient, m_IsServer), args...);
         group.Systems[typeid(T).name()] = system;
 
         PureSystem* pureSystem = dynamic_cast<PureSystem*>(system);
@@ -88,6 +90,8 @@ public:
 private:
     World* m_World;
     EventBroker* m_EventBroker;
+    bool m_IsClient = false;
+    bool m_IsServer = false;
     bool m_Paused = false;
 
     struct UnorderedSystems
diff --git a/include/Engine/Core/UniformScaleSystem.h b/include/Engine/Core/UniformScaleSystem.h
index 0ebc0672..cd679fed 100644
--- a/include/Engine/Core/UniformScaleSystem.h
+++ b/include/Engine/Core/UniformScaleSystem.h
@@ -8,7 +8,7 @@
 class UniformScaleSystem : public PureSystem
 {
 public:
-    UniformScaleSystem(World* world, EventBroker* eventBroker);
+    UniformScaleSystem(SystemParams params);
 
     virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cUniformScale, double dt) override;
 
diff --git a/include/Engine/Editor/EditorRenderSystem.h b/include/Engine/Editor/EditorRenderSystem.h
index 361669ba..a42ad779 100644
--- a/include/Engine/Editor/EditorRenderSystem.h
+++ b/include/Engine/Editor/EditorRenderSystem.h
@@ -10,7 +10,7 @@
 class EditorRenderSystem : public ImpureSystem
 {
 public:
-    EditorRenderSystem(World* world, EventBroker* eventBroker, IRenderer* renderer, RenderFrame* renderFrame);
+    EditorRenderSystem(SystemParams params, IRenderer* renderer, RenderFrame* renderFrame);
 
     virtual void Update(double dt) override;
 
diff --git a/include/Engine/Editor/EditorSystem.h b/include/Engine/Editor/EditorSystem.h
index accf66e4..fcaa2e47 100644
--- a/include/Engine/Editor/EditorSystem.h
+++ b/include/Engine/Editor/EditorSystem.h
@@ -17,7 +17,7 @@
 class EditorSystem : public ImpureSystem
 {
 public:
-    EditorSystem(World* world, EventBroker* eventBroker, IRenderer* renderer, RenderFrame* renderFrame);
+    EditorSystem(SystemParams params, IRenderer* renderer, RenderFrame* renderFrame);
     ~EditorSystem();
 
     void Update(double dt);
diff --git a/include/Engine/Editor/EditorWidgetSystem.h b/include/Engine/Editor/EditorWidgetSystem.h
index a060bdd5..57e653d6 100644
--- a/include/Engine/Editor/EditorWidgetSystem.h
+++ b/include/Engine/Editor/EditorWidgetSystem.h
@@ -25,7 +25,7 @@ struct WidgetDelta : Event
 class EditorWidgetSystem : public ImpureSystem, PureSystem
 {
 public:
-    EditorWidgetSystem(World* world, EventBroker* eventBroker, IRenderer* renderer);
+    EditorWidgetSystem(SystemParams params, IRenderer* renderer);
 
     virtual void Update(double dt) override;
     virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cEditorWidget, double dt) override;
diff --git a/include/Engine/Rendering/AnimationSystem.h b/include/Engine/Rendering/AnimationSystem.h
index fcdcbc92..9a9c92dd 100644
--- a/include/Engine/Rendering/AnimationSystem.h
+++ b/include/Engine/Rendering/AnimationSystem.h
@@ -13,8 +13,8 @@
 class AnimationSystem : public PureSystem
 {
 public:
-    AnimationSystem(World* world, EventBroker* eventBroker)
-        : System(world, eventBroker)
+    AnimationSystem(SystemParams params)
+        : System(params)
         , PureSystem("Animation")
     {
 
diff --git a/include/Engine/Rendering/RenderSystem.h b/include/Engine/Rendering/RenderSystem.h
index d64147b9..8fbb005b 100644
--- a/include/Engine/Rendering/RenderSystem.h
+++ b/include/Engine/Rendering/RenderSystem.h
@@ -20,7 +20,7 @@
 class RenderSystem : public ImpureSystem
 {
 public:
-    RenderSystem(World* world, EventBroker* eventBrokerer, const IRenderer* renderer, RenderFrame* renderFrame);
+    RenderSystem(SystemParams params, const IRenderer* renderer, RenderFrame* renderFrame);
     ~RenderSystem();
 
     virtual void Update(double dt) override;
@@ -29,7 +29,6 @@ private:
     const IRenderer* m_Renderer;
     RenderFrame* m_RenderFrame;
     Camera* m_Camera;
-    World* m_World;
     EntityWrapper m_CurrentCamera = EntityWrapper::Invalid;
     EntityWrapper m_LocalPlayer = EntityWrapper::Invalid;
 
diff --git a/include/Game/ExplosionEffectSystem.h b/include/Game/ExplosionEffectSystem.h
index 061ad221..5073d04e 100644
--- a/include/Game/ExplosionEffectSystem.h
+++ b/include/Game/ExplosionEffectSystem.h
@@ -4,8 +4,8 @@
 class ExplosionEffectSystem : public PureSystem
 {
 public:
-    ExplosionEffectSystem(World* world, EventBroker* eventBroker)
-        : System(world, eventBroker)
+    ExplosionEffectSystem(SystemParams params)
+        : System(params)
         , PureSystem("ExplosionEffect")
     { }
 
diff --git a/include/Game/Game.h b/include/Game/Game.h
index 37267a68..a24862b1 100644
--- a/include/Game/Game.h
+++ b/include/Game/Game.h
@@ -55,24 +55,13 @@ private:
     Octree<EntityAABB>* m_OctreeFrustrumCulling;
     SystemPipeline* m_SystemPipeline;
     RenderFrame* m_RenderFrame;
-    // Network variables
-    boost::thread m_NetworkThread;
+    Network* m_Network = nullptr;
 
-    // Network methods
-    void networkFunction();
-    Network* m_ClientOrServer;
-    bool m_IsClientOrServer = false;
+    bool m_IsClient = false;
+    bool m_IsServer = false;
 
     // Sound
     SoundSystem* m_SoundSystem;
-
-    //EventRelay<Game, Events::InputCommand> m_EInputCommand;
-    //bool debugOnInputCommand(const Events::InputCommand& e);
-
-    void debugInitialize();
-    void debugTick(double dt);
-	EventRelay<Client, Events::KeyDown> m_EKeyDown;
-
 };
 
 #endif
diff --git a/include/Game/Systems/CapturePointSystem.h b/include/Game/Systems/CapturePointSystem.h
index 18c32c76..22e7e3d5 100644
--- a/include/Game/Systems/CapturePointSystem.h
+++ b/include/Game/Systems/CapturePointSystem.h
@@ -17,7 +17,7 @@ class CapturePointSystem : public PureSystem
 {
 public:
     //WARNING: on new map, destroy all info in the vectors, as well as reset all variables (just make new?)
-    CapturePointSystem(World* world, EventBroker* eventBroker);
+    CapturePointSystem(SystemParams params);
 
     //updatecomponent
     virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& capturePoint, double dt) override;
diff --git a/include/Game/Systems/HealthSystem.h b/include/Game/Systems/HealthSystem.h
index 3b069349..50af4678 100644
--- a/include/Game/Systems/HealthSystem.h
+++ b/include/Game/Systems/HealthSystem.h
@@ -16,7 +16,7 @@
 class HealthSystem : public PureSystem
 {
 public:
-    HealthSystem(World* world, EventBroker* eventBroker);
+    HealthSystem(SystemParams params);
 
     //updatecomponent
     virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt) override;
diff --git a/include/Game/Systems/InterpolationSystem.h b/include/Game/Systems/InterpolationSystem.h
index 96236f62..70eb7f43 100644
--- a/include/Game/Systems/InterpolationSystem.h
+++ b/include/Game/Systems/InterpolationSystem.h
@@ -26,7 +26,7 @@ class InterpolationSystem : public PureSystem
         float interpolationTime;
     };
 public:
-    InterpolationSystem(World* world, EventBroker* eventBroker);
+    InterpolationSystem(SystemParams params);
     ~InterpolationSystem() { }
     virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& transform, double dt) override;
 private:
diff --git a/include/Game/Systems/LifetimeSystem.h b/include/Game/Systems/LifetimeSystem.h
index da88cfa2..3607c15c 100644
--- a/include/Game/Systems/LifetimeSystem.h
+++ b/include/Game/Systems/LifetimeSystem.h
@@ -6,8 +6,8 @@
 class LifetimeSystem : public ImpureSystem, PureSystem
 {
 public:
-    LifetimeSystem(World* world, EventBroker* eventBroker)
-        : System(world, eventBroker)
+    LifetimeSystem(SystemParams params)
+        : System(params)
         , PureSystem("Lifetime")
     { }
 
diff --git a/include/Game/Systems/PlayerHUD.h b/include/Game/Systems/PlayerHUDSystem.h
similarity index 58%
rename from include/Game/Systems/PlayerHUD.h
rename to include/Game/Systems/PlayerHUDSystem.h
index 180f5a2a..50b6a258 100644
--- a/include/Game/Systems/PlayerHUD.h
+++ b/include/Game/Systems/PlayerHUDSystem.h
@@ -6,18 +6,14 @@
 #include "../../Engine/Rendering/ESetCamera.h"
 #include <imgui/imgui.h>
 
-class PlayerHUD : public ImpureSystem
+class PlayerHUDSystem : public ImpureSystem
 {
 public:
-    PlayerHUD(World* world, EventBroker* eventBrokerer);
-    ~PlayerHUD();
+    PlayerHUDSystem(SystemParams params)
+        : System(params)
+    { }
 
     virtual void Update(double dt) override;
-
-private:
-    World* m_World;
-    EventBroker* m_EventBroker;
-
 };
 
 #endif
\ No newline at end of file
diff --git a/include/Game/Systems/PlayerMovementSystem.h b/include/Game/Systems/PlayerMovementSystem.h
index 34862e90..7daf9c03 100644
--- a/include/Game/Systems/PlayerMovementSystem.h
+++ b/include/Game/Systems/PlayerMovementSystem.h
@@ -8,7 +8,7 @@
 class PlayerMovementSystem : public ImpureSystem, PureSystem
 {
 public:
-    PlayerMovementSystem(World* world, EventBroker* eventBroker);
+    PlayerMovementSystem(SystemParams params);
     ~PlayerMovementSystem();
 
     virtual void Update(double dt) override;
diff --git a/include/Game/Systems/PlayerSpawnSystem.h b/include/Game/Systems/PlayerSpawnSystem.h
index b0ff1d79..7c6509ff 100644
--- a/include/Game/Systems/PlayerSpawnSystem.h
+++ b/include/Game/Systems/PlayerSpawnSystem.h
@@ -9,7 +9,7 @@
 class PlayerSpawnSystem : public ImpureSystem
 {
 public:
-    PlayerSpawnSystem(World* world, EventBroker* eventBroker);
+    PlayerSpawnSystem(SystemParams params);
 
     virtual void Update(double dt) override;
 
diff --git a/include/Game/Systems/RaptorCopterSystem.h b/include/Game/Systems/RaptorCopterSystem.h
index 8bb18de6..b3589dcd 100644
--- a/include/Game/Systems/RaptorCopterSystem.h
+++ b/include/Game/Systems/RaptorCopterSystem.h
@@ -4,8 +4,8 @@
 class RaptorCopterSystem : public PureSystem
 {
 public:
-    RaptorCopterSystem(World* world, EventBroker* eventBroker)
-        : System(world, eventBroker)
+    RaptorCopterSystem(SystemParams params)
+        : System(params)
         , PureSystem("RaptorCopter")
     { }
 
diff --git a/include/Game/Systems/SpawnerSystem.h b/include/Game/Systems/SpawnerSystem.h
index 62f6b09a..9cb4bd06 100644
--- a/include/Game/Systems/SpawnerSystem.h
+++ b/include/Game/Systems/SpawnerSystem.h
@@ -13,7 +13,7 @@
 class SpawnerSystem : public System
 {
 public:
-    SpawnerSystem(World* world, EventBroker* eventBroker);
+    SpawnerSystem(SystemParams params);
 
     static EntityWrapper Spawn(EntityWrapper spawner, EntityWrapper parent = EntityWrapper::Invalid);
 
diff --git a/include/Game/Systems/WeaponSystem.h b/include/Game/Systems/WeaponSystem.h
index 0dd5cc54..59048ee0 100644
--- a/include/Game/Systems/WeaponSystem.h
+++ b/include/Game/Systems/WeaponSystem.h
@@ -21,7 +21,7 @@
 class WeaponSystem : public ImpureSystem
 {
 public:
-    WeaponSystem(World* world, EventBroker* eventBroker, IRenderer* renderer);
+    WeaponSystem(SystemParams params, IRenderer* renderer);
 
     virtual void Update(double dt) override;
 
diff --git a/src/Engine/Core/UniformScaleSystem.cpp b/src/Engine/Core/UniformScaleSystem.cpp
index ab954a05..d5ac878a 100644
--- a/src/Engine/Core/UniformScaleSystem.cpp
+++ b/src/Engine/Core/UniformScaleSystem.cpp
@@ -1,7 +1,7 @@
 #include "Core/UniformScaleSystem.h"
 
-UniformScaleSystem::UniformScaleSystem(World* world, EventBroker* eventBroker) 
-    : System(world, eventBroker)
+UniformScaleSystem::UniformScaleSystem(SystemParams params) 
+    : System(params)
     , PureSystem("UniformScale")
 {
     EVENT_SUBSCRIBE_MEMBER(m_ESetCamera, &UniformScaleSystem::OnSetCamera);
diff --git a/src/Engine/Editor/EditorRenderSystem.cpp b/src/Engine/Editor/EditorRenderSystem.cpp
index 4d65e9d3..f21ec033 100644
--- a/src/Engine/Editor/EditorRenderSystem.cpp
+++ b/src/Engine/Editor/EditorRenderSystem.cpp
@@ -1,7 +1,7 @@
 #include "Editor/EditorRenderSystem.h"
 
-EditorRenderSystem::EditorRenderSystem(World* m_World, EventBroker* eventBroker, IRenderer* renderer, RenderFrame* renderFrame) 
-    : System(m_World, eventBroker)
+EditorRenderSystem::EditorRenderSystem(SystemParams params, IRenderer* renderer, RenderFrame* renderFrame) 
+    : System(params)
     , m_Renderer(renderer)
     , m_RenderFrame(renderFrame)
 {
diff --git a/src/Engine/Editor/EditorSystem.cpp b/src/Engine/Editor/EditorSystem.cpp
index ccbc1b48..b9a8025f 100644
--- a/src/Engine/Editor/EditorSystem.cpp
+++ b/src/Engine/Editor/EditorSystem.cpp
@@ -3,13 +3,13 @@
 #include "Editor/EditorRenderSystem.h"
 #include "Editor/EditorWidgetSystem.h"
 
-EditorSystem::EditorSystem(World* world, EventBroker* eventBroker, IRenderer* renderer, RenderFrame* renderFrame) 
-    : System(world, eventBroker)
+EditorSystem::EditorSystem(SystemParams params, IRenderer* renderer, RenderFrame* renderFrame) 
+    : System(params)
     , m_Renderer(renderer)
     , m_RenderFrame(renderFrame)
 {
     m_EditorWorld = new World();
-    m_EditorWorldSystemPipeline = new SystemPipeline(m_EditorWorld, eventBroker);
+    m_EditorWorldSystemPipeline = new SystemPipeline(m_EditorWorld, m_EventBroker, IsClient, IsServer);
     m_EditorWorldSystemPipeline->AddSystem<UniformScaleSystem>(0);
     m_EditorWorldSystemPipeline->AddSystem<EditorWidgetSystem>(0, m_Renderer);
     m_EditorWorldSystemPipeline->AddSystem<EditorRenderSystem>(1, m_Renderer, m_RenderFrame);
diff --git a/src/Engine/Editor/EditorWidgetSystem.cpp b/src/Engine/Editor/EditorWidgetSystem.cpp
index 7c20a7c7..f27d7a5e 100644
--- a/src/Engine/Editor/EditorWidgetSystem.cpp
+++ b/src/Engine/Editor/EditorWidgetSystem.cpp
@@ -1,7 +1,7 @@
 #include "Editor/EditorWidgetSystem.h"
 
-EditorWidgetSystem::EditorWidgetSystem(World* world, EventBroker* eventBroker, IRenderer* renderer) 
-    : System(world, eventBroker)
+EditorWidgetSystem::EditorWidgetSystem(SystemParams params, IRenderer* renderer) 
+    : System(params)
     , PureSystem("EditorWidget")
     , m_Renderer(renderer)
 {
diff --git a/src/Engine/Rendering/RenderSystem.cpp b/src/Engine/Rendering/RenderSystem.cpp
index eaecf99e..ab423333 100644
--- a/src/Engine/Rendering/RenderSystem.cpp
+++ b/src/Engine/Rendering/RenderSystem.cpp
@@ -1,10 +1,9 @@
 #include "Rendering/RenderSystem.h"
 
-RenderSystem::RenderSystem(World* world, EventBroker* eventBroker, const IRenderer* renderer, RenderFrame* renderFrame) 
-    : System(world, eventBroker)
+RenderSystem::RenderSystem(SystemParams params, const IRenderer* renderer, RenderFrame* renderFrame) 
+    : System(params)
     , m_Renderer(renderer)
     , m_RenderFrame(renderFrame)
-    , m_World(world)
 {
     EVENT_SUBSCRIBE_MEMBER(m_ESetCamera, &RenderSystem::OnSetCamera);
     EVENT_SUBSCRIBE_MEMBER(m_EInputCommand, &RenderSystem::OnInputCommand);
diff --git a/src/Game/Game.cpp b/src/Game/Game.cpp
index f5afcaeb..04180fb3 100644
--- a/src/Game/Game.cpp
+++ b/src/Game/Game.cpp
@@ -11,7 +11,7 @@
 #include "Core/EntityFileWriter.h"
 #include "Game/Systems/CapturePointSystem.h"
 #include "Game/Systems/WeaponSystem.h"
-#include "Game/Systems/PlayerHUD.h"
+#include "Game/Systems/PlayerHUDSystem.h"
 #include "Game/Systems/LifetimeSystem.h"
 #include "../Engine/Rendering/AnimationSystem.h"
 
@@ -71,13 +71,25 @@ Game::Game(int argc, char* argv[])
         fp.MergeEntities(m_World);
     }
 
+    // Initialize network
+    if (m_Config->Get<bool>("Networking.StartNetwork", false)) {
+        bool isServer = m_Config->Get<bool>("Networking.IsServer", false);
+        if (isServer) {
+            m_Network = new Server();
+            m_IsServer = true;
+        } else {
+            m_Network = new Client(m_Config);
+            m_IsClient = true;
+        }
+        m_Network->Start(m_World, m_EventBroker);
+    }
 
     // Create Octrees
     m_OctreeCollision = new Octree<EntityAABB>(AABB(glm::vec3(-100), glm::vec3(100)), 4);
     m_OctreeTrigger = new Octree<EntityAABB>(AABB(glm::vec3(-100), glm::vec3(100)), 4);
     m_OctreeFrustrumCulling = new Octree<EntityAABB>(AABB(glm::vec3(-100), glm::vec3(100)), 4);
     // Create system pipeline
-    m_SystemPipeline = new SystemPipeline(m_World, m_EventBroker);
+    m_SystemPipeline = new SystemPipeline(m_World, m_EventBroker, m_IsClient, m_IsServer);
 
     // All systems with orderlevel 0 will be updated first.
     unsigned int updateOrderLevel = 0;
@@ -95,7 +107,7 @@ Game::Game(int argc, char* argv[])
     ++updateOrderLevel;
     m_SystemPipeline->AddSystem<CollidableOctreeSystem>(updateOrderLevel, m_OctreeCollision, "Collidable");
     m_SystemPipeline->AddSystem<CollidableOctreeSystem>(updateOrderLevel, m_OctreeTrigger, "Player");
-    m_SystemPipeline->AddSystem<PlayerHUD>(updateOrderLevel);
+    m_SystemPipeline->AddSystem<PlayerHUDSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<AnimationSystem>(updateOrderLevel);
 
     // Collision and TriggerSystem should update after player.
@@ -107,12 +119,6 @@ Game::Game(int argc, char* argv[])
     ++updateOrderLevel;
     m_SystemPipeline->AddSystem<EditorSystem>(updateOrderLevel, m_Renderer, m_RenderFrame);
 
-    // Invoke network
-    if (m_Config->Get<bool>("Networking.StartNetwork", false)) {
-        //boost::thread workerThread(&Game::networkFunction, this);
-        networkFunction();
-    }
-
     // Invoke sound system
     m_SoundSystem = new SoundSystem(m_World, m_EventBroker, m_Config->Get<bool>("Debug.EditorEnabled", false));
 
@@ -126,6 +132,9 @@ Game::~Game()
     delete m_OctreeFrustrumCulling;
     delete m_OctreeCollision;
     delete m_OctreeTrigger;
+    if (m_Network != nullptr) {
+        delete m_Network;
+    }
     delete m_World;
     delete m_FrameStack;
     delete m_InputProxy;
@@ -154,39 +163,17 @@ void Game::Tick()
     m_EventBroker->Swap();
 
     // Update network
-    if (m_IsClientOrServer) {
-        m_ClientOrServer->Update();
+    if (m_Network != nullptr) {
+        m_Network->Update();
     }
+
     // Iterate through systems and update world!
     m_EventBroker->Process<SystemPipeline>();
     m_SystemPipeline->Update(dt);
-    debugTick(dt);
     m_Renderer->Update(dt);
     m_SoundSystem->Update(dt);
-    GLERROR("Game::Tick m_RenderQueueFactory->Update");
     m_Renderer->Draw(*m_RenderFrame);
     m_RenderFrame->Clear();
-    GLERROR("Game::Tick m_Renderer->Draw");
     m_EventBroker->Swap();
     m_EventBroker->Clear();
-}
-
-void Game::debugTick(double dt)
-{
-    m_EventBroker->Process<Game>();
-}
-
-void Game::networkFunction()
-{
-    bool isServer = m_Config->Get<bool>("Networking.IsServer", false);
-    if (!isServer) {
-        m_IsClientOrServer = true;
-        m_ClientOrServer = new Client(m_Config);
-    }
-    if (isServer) {
-        m_IsClientOrServer = true;
-        m_ClientOrServer = new Server();
-    }
-    m_ClientOrServer->Start(m_World, m_EventBroker);
-
 }
\ No newline at end of file
diff --git a/src/Game/Systems/CapturePointSystem.cpp b/src/Game/Systems/CapturePointSystem.cpp
index d26dde5f..0ed02716 100644
--- a/src/Game/Systems/CapturePointSystem.cpp
+++ b/src/Game/Systems/CapturePointSystem.cpp
@@ -1,8 +1,8 @@
 #include "Systems/CapturePointSystem.h"
 #include <algorithm>
 
-CapturePointSystem::CapturePointSystem(World* world, EventBroker* eventBroker) 
-    : System(world, eventBroker)
+CapturePointSystem::CapturePointSystem(SystemParams params) 
+    : System(params)
     , PureSystem("CapturePoint")
 {
     //subscribe/listenTo playerdamage,healthpickup events (using the eventBroker)
diff --git a/src/Game/Systems/HealthSystem.cpp b/src/Game/Systems/HealthSystem.cpp
index 9e118070..bfce08bf 100644
--- a/src/Game/Systems/HealthSystem.cpp
+++ b/src/Game/Systems/HealthSystem.cpp
@@ -1,7 +1,7 @@
 #include "Systems/HealthSystem.h"
 
-HealthSystem::HealthSystem(World* m_World, EventBroker* eventBroker)
-    : System(m_World, eventBroker)
+HealthSystem::HealthSystem(SystemParams params)
+    : System(params)
     , PureSystem("Health")
 {
     //subscribe/listenTo playerdamage,healthpickup events (using the eventBroker)
diff --git a/src/Game/Systems/InterpolationSystem.cpp b/src/Game/Systems/InterpolationSystem.cpp
index f2de710d..e958a4a9 100644
--- a/src/Game/Systems/InterpolationSystem.cpp
+++ b/src/Game/Systems/InterpolationSystem.cpp
@@ -1,7 +1,7 @@
 #include "Systems/InterpolationSystem.h"
 
-InterpolationSystem::InterpolationSystem(World* world, EventBroker* eventBroker) 
-    : System(world, eventBroker)
+InterpolationSystem::InterpolationSystem(SystemParams params) 
+    : System(params)
     , PureSystem("Transform")
 {
     ConfigFile* config = ResourceManager::Load<ConfigFile>("Config.ini");
diff --git a/src/Game/Systems/PlayerHUD.cpp b/src/Game/Systems/PlayerHUDSystem.cpp
similarity index 85%
rename from src/Game/Systems/PlayerHUD.cpp
rename to src/Game/Systems/PlayerHUDSystem.cpp
index 55d0c3f1..898d8bea 100644
--- a/src/Game/Systems/PlayerHUD.cpp
+++ b/src/Game/Systems/PlayerHUDSystem.cpp
@@ -1,21 +1,6 @@
-#include "Game/Systems/PlayerHUD.h"
+#include "Game/Systems/PlayerHUDSystem.h"
 
-PlayerHUD::PlayerHUD(World* world, EventBroker* eventBrokerer)
-    :System(world, eventBrokerer)
-    , m_World(world)
-    , m_EventBroker(eventBrokerer)
-{
-    
-    
-}
-
-PlayerHUD::~PlayerHUD()
-{
-    
-
-}
-
-void PlayerHUD::Update(double dt)
+void PlayerHUDSystem::Update(double dt)
 {
     auto healthHUDs = m_World->GetComponents("HealthHUD");
     if (healthHUDs == nullptr) {
diff --git a/src/Game/Systems/PlayerMovementSystem.cpp b/src/Game/Systems/PlayerMovementSystem.cpp
index 3224f579..04ce2400 100644
--- a/src/Game/Systems/PlayerMovementSystem.cpp
+++ b/src/Game/Systems/PlayerMovementSystem.cpp
@@ -1,7 +1,7 @@
 #include "Systems/PlayerMovementSystem.h"
 
-PlayerMovementSystem::PlayerMovementSystem(World* world, EventBroker* eventBroker)
-    : System(world, eventBroker)
+PlayerMovementSystem::PlayerMovementSystem(SystemParams params)
+    : System(params)
     , PureSystem("Player")
 {
     EVENT_SUBSCRIBE_MEMBER(m_EPlayerSpawned, &PlayerMovementSystem::OnPlayerSpawned);
diff --git a/src/Game/Systems/PlayerSpawnSystem.cpp b/src/Game/Systems/PlayerSpawnSystem.cpp
index 7db6e8ff..fa713675 100644
--- a/src/Game/Systems/PlayerSpawnSystem.cpp
+++ b/src/Game/Systems/PlayerSpawnSystem.cpp
@@ -1,7 +1,7 @@
 #include "Systems/PlayerSpawnSystem.h"
 
-PlayerSpawnSystem::PlayerSpawnSystem(World* m_World, EventBroker* eventBroker) 
-    : System(m_World, eventBroker)
+PlayerSpawnSystem::PlayerSpawnSystem(SystemParams params) 
+    : System(params)
 {
     EVENT_SUBSCRIBE_MEMBER(m_OnInputCommand, &PlayerSpawnSystem::OnInputCommand);
     EVENT_SUBSCRIBE_MEMBER(m_OnPlayerSpawnerd, &PlayerSpawnSystem::OnPlayerSpawned);
diff --git a/src/Game/Systems/SpawnerSystem.cpp b/src/Game/Systems/SpawnerSystem.cpp
index 7a0a13c9..ba0775a3 100644
--- a/src/Game/Systems/SpawnerSystem.cpp
+++ b/src/Game/Systems/SpawnerSystem.cpp
@@ -1,7 +1,7 @@
 #include "Systems/SpawnerSystem.h"
 
-SpawnerSystem::SpawnerSystem(World* world, EventBroker* eventBroker) 
-    : System(world, eventBroker)
+SpawnerSystem::SpawnerSystem(SystemParams params) 
+    : System(params)
 {
     EVENT_SUBSCRIBE_MEMBER(m_OnSpawnerSpawn, &SpawnerSystem::OnSpawnerSpawn);
 }
diff --git a/src/Game/Systems/WeaponSystem.cpp b/src/Game/Systems/WeaponSystem.cpp
index 1613cb7a..22cd173a 100644
--- a/src/Game/Systems/WeaponSystem.cpp
+++ b/src/Game/Systems/WeaponSystem.cpp
@@ -1,7 +1,7 @@
 #include "Systems/WeaponSystem.h"
 
-WeaponSystem::WeaponSystem(World* world, EventBroker* eventBroker, IRenderer* renderer)
-    : System(world, eventBroker)
+WeaponSystem::WeaponSystem(SystemParams params, IRenderer* renderer)
+    : System(params)
     , ImpureSystem()
     , m_Renderer(renderer)
 {