diff --git a/include/Engine/Network/Client.h b/include/Engine/Network/Client.h
index 1bf2f059..743f7510 100644
--- a/include/Engine/Network/Client.h
+++ b/include/Engine/Network/Client.h
@@ -5,6 +5,7 @@
 #include <ctime>
 
 #include <glm/common.hpp>
+#include <boost/asio.hpp>
 
 #include "Network/MessageType.h"
 #include "Network/NetworkDefinitions.h"
@@ -21,8 +22,8 @@ class Client : public Network
 public:
     Client();
     ~Client();
-    void Start(World* world, EventBroker* eventBroker);
-    void Update();
+    void Start(World* world, EventBroker* eventBroker) override;
+    void Update() override;
     void Close();
 private:
     // Assio UDP logic
diff --git a/include/Engine/Network/Network.h b/include/Engine/Network/Network.h
index d6447a3c..31c6b8b0 100644
--- a/include/Engine/Network/Network.h
+++ b/include/Engine/Network/Network.h
@@ -8,12 +8,9 @@
 class Network
 {
 public:
-    Network();
-    ~Network();
-    virtual void Start(World* m_world, EventBroker *eventBroker);
-    virtual void Update();
-protected:
-
+    virtual ~Network() { };
+    virtual void Start(World* m_world, EventBroker *eventBroker) = 0;
+    virtual void Update() = 0;
 };
 
 #endif
\ No newline at end of file
diff --git a/include/Engine/Network/NetworkDefinitions.h b/include/Engine/Network/NetworkDefinitions.h
index 5a86c50d..336daf86 100644
--- a/include/Engine/Network/NetworkDefinitions.h
+++ b/include/Engine/Network/NetworkDefinitions.h
@@ -1,20 +1,8 @@
 #ifndef NetworkDefines_h__
 #define NetworkDefines_h__
 
-#include <boost/asio/ip/udp.hpp>
-#include <queue>
-#include "Network/Packet.h"
-
-
-#define BOARDSIZE 16
 #define MAXCONNECTIONS 8
 #define INPUTSIZE 128
 #define PLAYERSPEED 0.2f;
 
-typedef boost::shared_ptr<boost::asio::ip::udp::socket> socket_ptr;
-typedef boost::shared_ptr<std::string> string_ptr;
-typedef boost::shared_ptr<std::queue<string_ptr>> messageQueue_ptr;
-
-
-
 #endif
\ No newline at end of file
diff --git a/include/Engine/Network/Server.h b/include/Engine/Network/Server.h
index 17ca7136..092c3be0 100644
--- a/include/Engine/Network/Server.h
+++ b/include/Engine/Network/Server.h
@@ -5,6 +5,7 @@
 #include <ctime>
 
 #include <glm/common.hpp>
+#include <boost/asio/ip/udp.hpp>
 
 #include "Network/MessageType.h"
 #include "Network/NetworkDefinitions.h"
@@ -18,8 +19,8 @@ class Server : public Network
 public:
     Server();
     ~Server();
-    void Start(World* m_world, EventBroker *eventBroker);
-    void Update();
+    void Start(World* m_world, EventBroker *eventBroker) override;
+    void Update() override;
     void Close();
 
 private:
diff --git a/src/Engine/Network/Client.cpp b/src/Engine/Network/Client.cpp
index ade0c00e..4966b477 100644
--- a/src/Engine/Network/Client.cpp
+++ b/src/Engine/Network/Client.cpp
@@ -5,7 +5,7 @@ using namespace boost::asio::ip;
 
 Client::Client() : m_Socket(m_IOService)
 {
-    m_ReceiverEndpoint = udp::endpoint(boost::asio::ip::address::from_string("192.168.1.2"), 13);
+    m_ReceiverEndpoint = udp::endpoint(boost::asio::ip::address::from_string("192.168.1.6"), 13);
     // Set up network stream
     m_NextSnapshot.InputForward = "";
     m_NextSnapshot.InputRight = "";
diff --git a/src/Engine/Network/Network.cpp b/src/Engine/Network/Network.cpp
deleted file mode 100644
index 51a93407..00000000
--- a/src/Engine/Network/Network.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "Network/Network.h"
-
-Network::Network()
-{ }
-
-Network::~Network()
-{ }
-
-void Network::Start(World * m_world, EventBroker * eventBroker)
-{ }
-
-void Network::Update()
-{ }
\ No newline at end of file
diff --git a/src/Engine/Network/Packet.cpp b/src/Engine/Network/Packet.cpp
index 4a9b77ae..328e0d12 100644
--- a/src/Engine/Network/Packet.cpp
+++ b/src/Engine/Network/Packet.cpp
@@ -12,14 +12,15 @@ Packet::Packet(MessageType type, unsigned int& packetID)
     packetID++;
 }
 
-
+// Create message
 Packet::Packet(char* data, const int sizeOfPacket)
 {
-    // Create message
-
     // Resize message
-    m_MaxPacketSize = sizeOfPackage;
+    m_MaxPacketSize = sizeOfPacket;
     // Copy data newly allocated memory
+    m_Data = new char[sizeOfPacket];
+    memcpy(m_Data, data, sizeOfPacket);
+    m_Offset = sizeOfPacket;
 }
 
 Packet::~Packet()
@@ -39,7 +40,7 @@ void Packet::WriteString(std::string str)
 }
 
 void Packet::WriteData(char * data, int sizeOfData)
-{ 
+{
     if (m_Offset + sizeOfData > m_MaxPacketSize) {
         LOG_WARNING("Packet::WriteData(): Data size in packet exceeded maximum packet size.\n");
     }
@@ -50,10 +51,10 @@ void Packet::WriteData(char * data, int sizeOfData)
 std::string Packet::ReadString()
 {
     std::string returnValue(m_Data + m_ReturnDataOffset);
-    if (m_Offset < m_ReturnDataOffset + returnValue.size()){
+    if (m_Offset < m_ReturnDataOffset + returnValue.size()) {
         LOG_WARNING("packet ReadString(): Oh no! You are trying to remove things outside my memory kingdom");
         return "PopFrontString Failed";
-    }   
+    }
     // +1 for null terminator.
     m_ReturnDataOffset += returnValue.size() + 1;
     return returnValue;
@@ -68,4 +69,4 @@ char * Packet::ReadData(int SizeOfData)
     unsigned int oldReturnDataOffset = m_ReturnDataOffset;
     m_ReturnDataOffset += SizeOfData;
     return (m_Data + oldReturnDataOffset);
-}
+}
\ No newline at end of file