diff --git a/includes/client.hpp b/includes/client.hpp
index b1933b9..4fc5146 100644
--- a/includes/client.hpp
+++ b/includes/client.hpp
@@ -32,10 +32,11 @@ private:
 	std::string _url;
 	MODE _mode;
 	int _client_socket;
-	std::function<void(SHAPE &S)> _update;
+	std::function<void(SHAPE &S, MODE &M)> _update;
 	struct sockaddr_in _server_address;
 	struct hostent *_server;
 	std::map<std::string, std::string> lookup;
+	std::vector<std::string> explode(std::string &message);
 	std::string encode(const SHAPE &shape);
 	std::string crypt(const std::string &shape);
 
@@ -55,7 +56,12 @@ private:
 	void stop();
 
 public:
-	Client(MODE mode, int port, std::string url, std::function<void(SHAPE &S)> &update);
+	Client(
+		MODE mode,
+	  int port, 
+		std::string url, 
+		std::function<void(SHAPE &S, MODE &M)> &update);
+	~Client();
 	void kill();
 	bool running();
 	void send(bool encrypt, SHAPE shape);
diff --git a/includes/common.hpp b/includes/common.hpp
index 37497f2..6940944 100644
--- a/includes/common.hpp
+++ b/includes/common.hpp
@@ -1,10 +1,14 @@
 #ifndef __BETACORE_COMMON_HPP__
 #define __BETACORE_COMMON_HPP__
 
+#define BUFFER_LENGTH 1024
 
+#include <string>
 namespace betacore
 {
-enum SHAPE{
+
+enum SHAPE
+{
 	NONE,
 	TRIANGLE,
 	CIRCLE,
@@ -16,8 +20,70 @@ enum MODE
 {
 	ALICE,
 	BOB,
-	EVE
+	EVE,
+	END
 };
+class Parser
+{
+	public:
+	static std::string mode(MODE &mode)
+	{
+		switch (mode)
+		{
+		case ALICE:
+			return "ALICE";
+		case BOB:
+			return "BOB";
+		default:
+			return "END";
+		}
+	}
+	static MODE mode(const std::string &mode)
+	{
+		if (mode == "ALICE")
+			return ALICE;
+		if (mode == "BOB")
+			return BOB;
+		return END;
+	}
 
-}
+	static SHAPE shape(const std::string &shape)
+	{
+
+		if (shape == "TRIANGLE")
+			return TRIANGLE;
+		if (shape == "CIRCLE")
+			return CIRCLE;
+		if (shape == "SQUARE")
+			return SQUARE;
+		if (shape == "PENTAGON")
+			return PENTAGON;
+		return UNKOWN;
+	}
+
+	static std::string shape(const SHAPE &shape)
+	{
+		std::string message;
+		switch (shape)
+		{
+		case TRIANGLE:
+			message = "TRIANGLE";
+			break;
+		case CIRCLE:
+			message = "CIRCLE";
+			break;
+		case SQUARE:
+			message = "SQUARE";
+			break;
+		case PENTAGON:
+			message = "PENTAGON";
+			break;
+		default:
+			message = "UNKOWN";
+			break;
+		}
+		return message;
+	}
+};
+} // namespace betacore
 #endif
\ No newline at end of file
diff --git a/includes/game.hpp b/includes/game.hpp
index d0ebaa1..f9ad597 100644
--- a/includes/game.hpp
+++ b/includes/game.hpp
@@ -17,7 +17,9 @@
 #include <string>
 #include <math.h>
 #define PI 3.14159265359
-#include "../includes/common.hpp"
+#include "common.hpp"
+#include "client.hpp"
+
 namespace betacore
 {
 
@@ -31,11 +33,12 @@ private:
 	const int SCREEN_HEIGHT = 600;
 	int MONITOR_WIDTH=1920;
 	int MONITOR_HEIGHT=1080;
-	const char *TITLE = "Lesson 01";
+	const char *TITLE ;
 	bool KEEP_ALIVE = true;
 	bool SHOW_GRID = false;
 	SHAPE USER_CURRENT = TRIANGLE;
 	SHAPE GUST_CURRENT = 	UNKOWN;
+	MODE ME;
 	bool KEY_UP_ARROW_ACTIVE = false;
 	bool KEY_DOWN_ARROW_ACTIVE = false;
 	bool KEY_LEFT_ARROW_ACTIVE = false;
@@ -43,8 +46,11 @@ private:
 	bool KEY_SPACE_ACTIVE = false;
 	bool KEY_RETURN_ACTIVE = false;
 	bool FULL_SCREEN = false;
+	Client* client = nullptr;
 public:
-	Game();
+	Game(MODE mode,
+	  int port, 
+		std::string url);
 	~Game();
 	int init();
 	int initGL();
@@ -67,7 +73,7 @@ public:
 	void rectangle();
 	void cross(bool filled);
 	void compass();
-
+	
 	void on_key_up_arrow();
 	void on_key_down_arrow();
 	void on_key_left_arrow();
@@ -78,6 +84,8 @@ public:
 	void top_screen();
 	void user_screen();
 	void guest_screen();
+
+	void update(SHAPE &s,MODE &m);
 };
 } // namespace betacore
 #endif
\ No newline at end of file
diff --git a/includes/server.hpp b/includes/server.hpp
index 5e359a3..1ba6c7d 100644
--- a/includes/server.hpp
+++ b/includes/server.hpp
@@ -39,6 +39,7 @@ private:
 	void shutdown();
 	void listener();
 	void read_socket(int client);
+	void forward_message(int client,char buffer[BUFFER_LENGTH] );
 public:
 	Server(int port);
 	void off();
diff --git a/makefile b/makefile
index d1b72a1..aed9b15 100644
--- a/makefile
+++ b/makefile
@@ -11,12 +11,12 @@ all: game | driver
 
 driver: client_driver | server_driver
 
-game:	$(SOURCE_DIR)game.cpp | make_dir
-	$(COMPILER) $(INCLUDES_DIR) $(SOURCE_DIR)game.cpp $(COMPILER_FLAGS) $(LINKER_FLAGS) -o $(OUTPUT_DIR)/game.out
 client_lib: $(SOURCE_DIR)client.cpp | make_dir
 	$(COMPILER) $(LIBRARY_FLAGS) $(INCLUDES_DIR) $(SOURCE_DIR)client.cpp -lpqxx -o $(CLIENT_LIB)
 client_driver: $(SOURCE_DIR)client_driver.cpp | client_lib
 	$(COMPILER) $(INCLUDES_DIR) $(CLIENT_LIB) $(SOURCE_DIR)client_driver.cpp $(COMPILER_FLAGS) $(LINKER_FLAGS) -o $(OUTPUT_DIR)/client.out
+game:	$(SOURCE_DIR)game.cpp | client_lib 
+	$(COMPILER) $(INCLUDES_DIR) $(SOURCE_DIR)game.cpp $(CLIENT_LIB) $(COMPILER_FLAGS) $(LINKER_FLAGS) -o $(OUTPUT_DIR)/game.out
 server_lib: $(SOURCE_DIR)server.cpp | make_dir
 	$(COMPILER) $(LIBRARY_FLAGS) $(INCLUDES_DIR) $(SOURCE_DIR)server.cpp -lpqxx -o $(SERVER_LIB)
 server_driver: $(SOURCE_DIR)server_driver.cpp | server_lib
diff --git a/run.sh b/run.sh
index d139251..3c32e76 100644
--- a/run.sh
+++ b/run.sh
@@ -1,2 +1,2 @@
 export SDL_VIDEO_X11_VISUALID=
-./bin/game
\ No newline at end of file
+./bin/game.out
\ No newline at end of file
diff --git a/source/client.cpp b/source/client.cpp
index bce9f11..a1174cf 100644
--- a/source/client.cpp
+++ b/source/client.cpp
@@ -2,32 +2,40 @@
 
 namespace betacore
 {
-Client::Client(MODE mode, int port, std::string url, std::function<void(SHAPE &S)> &update) : _mode(mode),
-																																																	_port(port),
-																																																	_url(url),
-																																																	_update(update)
+Client::Client(
+		MODE mode,
+		int port,
+		std::string url,
+		std::function<void(SHAPE &S, MODE &M)> &update) : _mode(mode),
+																											_port(port),
+																											_url(url),
+																											_update(update)
 {
+	
+	lookup["TRIANGLE"] = "APPLE";
+	lookup["CIRCLE"] = "ORANGE";
+	lookup["SQUARE"] = "BANANA";
+	lookup["PENTAGON"] = "PINEAPPLE";
+
+	lookup["APPLE"] = "TRIANGLE";
+	lookup["ORANGE"] = "CIRCLE";
+	lookup["BANANA"] = "SQUARE";
+	lookup["PINEAPPLE"] = "PENTAGON";
 	this->start();
-	lookup["TRIANGLE"]="APPLE";
-	lookup["CIRCLE"]="ORANGE";
-	lookup["SQUARE"]="BANANA";
-	lookup["PENTAGON"]="PINEAPPLE";
-
-	lookup["APPLE"]="TRIANGLE";
-	lookup["ORANGE"]="CIRCLE";
-	lookup["BANANA"]="SQUARE";
-	lookup["PINEAPPLE"]="PENTAGON";
-
+}
+Client::~Client(){
+	this->_running= false;
+	this->_online=false;
 }
 void Client::start()
 {
 	std::cout
 			<< "Start"
-			<< "\nConnecting to: " << _url << ":" <<_port
+			<< "\nConnecting to: " << _url << ":" << _port
 			<< std::endl;
 	//Create a socket point
 	this->_client_socket = socket(AF_INET, SOCK_STREAM, 0);
-	_server =	gethostbyname(_url.c_str());
+	_server = gethostbyname(_url.c_str());
 	if (_client_socket < 0)
 	{
 		std::cout << "ERROR opening socket" << std::endl;
@@ -39,25 +47,29 @@ void Client::start()
 	bzero((char *)&_server_address, sizeof(_server_address));
 	_server_address.sin_family = AF_INET;
 
-	bcopy((char *)_server->h_addr, (char *)&_server_address.sin_addr.s_addr, _server->h_length);
+	bcopy(
+			(char *)_server->h_addr,
+			(char *)&_server_address.sin_addr.s_addr,
+			_server->h_length);
 	_server_address.sin_port = htons(_port);
 
-
 	// Now connect to the server
-	if (connect(_client_socket, (struct sockaddr *)&_server_address, sizeof(_server_address)) < 0)
+	if (connect(
+					_client_socket,
+					(struct sockaddr *)&_server_address,
+					sizeof(_server_address)) < 0)
 	{
 		std::cout << "ERROR connecting" << std::endl;
 		return;
 	}
 	this->_online = true;
 	this->_running = true;
-	std::thread listen_thread([this] { this->listener(); } );
+	std::thread listen_thread([this] { this->listener(); });
 	listen_thread.detach();
 
 	std::cout
 			<< "Client Connected"
 			<< std::endl;
-
 }
 void Client::stop()
 {
@@ -78,17 +90,18 @@ bool Client::running()
 	return this->_running;
 }
 
-SHAPE Client::parse(const std::string &message)
-{
+std::vector<std::string> Client::explode(std::string &message){
 	std::stringstream stream(message);
 	std::string tmp;
 	std::vector<std::string> words;
 	while (std::getline(stream, tmp, ':'))
 		words.push_back(tmp);
+	return words;
+}
 
-	if (words.size() < 2)
-		return NONE;
-	tmp = words.at(1);
+SHAPE Client::parse(const std::string &message)
+{
+	std::string tmp = message;
 	SHAPE result = decode(tmp);
 	if (result != UNKOWN)
 		return result;
@@ -112,12 +125,11 @@ SHAPE Client::decode(const std::string &shape)
 std::string Client::crypt(const std::string &message)
 {
 
-	
 	// std::string output = std::string(message);
 
 	// for (int i = 0; i < message.size(); i++)
 	// 	output.at(i) = message[i] ^ key;
-	std::cout << "Crypt::" << message  << " : " << lookup[message] << std::endl;
+	std::cout << "Crypt::" << message << " : " << lookup[message] << std::endl;
 	return lookup[message];
 }
 std::string Client::encode(const SHAPE &shape)
@@ -146,45 +158,47 @@ std::string Client::encode(const SHAPE &shape)
 void Client::send(bool encrypt, SHAPE shape)
 {
 
-	std::string message = "SHAPE:" ;
-	message += encrypt ? crypt(encode(shape)) : encode(shape) ;
-	message += ":END";
-	std::cout << "Sending Message: " << message << "\n" << std::endl;
-	char buffer[1024];
-	bzero(buffer,1024);
-	// for(int i=0; i<1024-1 && i < message.length(); i++){
-	// 	buffer[i]= message.at(i);
-	// }
-	strcpy(buffer,message.c_str());
-	buffer[1024-1]='\0';
-	int x =write(this->_client_socket, buffer, strlen(buffer));
+	std::string message = "SHAPE:";
+	message += encrypt ? crypt(encode(shape)) : encode(shape);
+	message += ":";
+	message += Parser::mode(this->_mode);
+	std::cout << "Sending Message: " << message << "\n"
+						<< std::endl;
+	char buffer[BUFFER_LENGTH];
+	bzero(buffer, BUFFER_LENGTH);
+	strcpy(buffer, message.c_str());
+	buffer[BUFFER_LENGTH - 1] = '\0';
+	int x = write(this->_client_socket, buffer, strlen(buffer));
 	if (x < 0)
 	{
 		std::cout << "Failed send to server" << std::endl;
 	}
-	
 }
 
 void Client::listener()
 {
 	std::cout << "listener" << std::endl;
-	char buffer[1024];
+	char buffer[BUFFER_LENGTH];
 	while (_online)
 	{
-	
+
 		// Now read server response
 
-		bzero(buffer, 1024);
+		bzero(buffer, BUFFER_LENGTH);
 		std::cout << "Wating For message" << std::endl;
-		if (read(_client_socket, buffer, 1024-1) < 0)
+		if (read(_client_socket, buffer, BUFFER_LENGTH - 1) < 0)
 		{
 			std::cout << "ERROR reading from socket" << std::endl;
 		}
 
 		std::string message(buffer);
 		std::cout << "Got Message: " << message << std::endl;
-		SHAPE shape = parse(buffer);
-		_update(shape);
+		auto parts = explode(message);
+		if(parts.size() < 3)
+			return;
+		SHAPE shape = parse(parts.at(1));
+		MODE mode = Parser::mode(parts.at(2));
+		_update(shape,mode);
 	}
 }
 } // namespace betacore
\ No newline at end of file
diff --git a/source/client_driver.cpp b/source/client_driver.cpp
index a8750fe..e53841c 100644
--- a/source/client_driver.cpp
+++ b/source/client_driver.cpp
@@ -1,22 +1,31 @@
 #include "client.hpp"
 #include <iostream>
 
-void test(betacore::SHAPE &s){
-	std::cout << "It worked\n" << std::endl;
+void test(betacore::SHAPE &s, betacore::MODE &m)
+{
+	std::cout
+			<< "Got Shape::"
+			<< betacore::Parser::shape(s)
+			<< "\tFrom"
+			<< betacore::Parser::mode(m)
+			<< std::endl;
 }
-int main(int argc, char * argv[]){
-	std::function<void(betacore::SHAPE &S)> fn= test;
-	betacore::Client client(betacore::ALICE,4444, "localhost",fn);	
+int main(int argc, char *argv[])
+{
+	std::function<void(betacore::SHAPE & s, betacore::MODE & m)> fn = test;
+	betacore::Client client(betacore::ALICE, 4444, "localhost", fn);
 	client.send(false, betacore::TRIANGLE);
 	client.send(true, betacore::TRIANGLE);
 	//s.off();
 	//while(client.running()){}
 	std::string a;
-	while(client.running()){
+	while (client.running())
+	{
 		std::cin >> a;
 		client.send(false, betacore::TRIANGLE);
-		if (a == "q") client.kill();
-	}	
+		if (a == "q")
+			client.kill();
+	}
 
 	return 0;
-}	
+}
diff --git a/source/game.cpp b/source/game.cpp
index c98f54c..692420d 100644
--- a/source/game.cpp
+++ b/source/game.cpp
@@ -1,20 +1,38 @@
 #include "game.hpp"
-
+void gluPerspective(double fovy,double aspect, double zNear, double zFar)
+{
+ // Start in projection mode.
+ glMatrixMode(GL_PROJECTION);
+ glLoadIdentity();
+ double xmin, xmax, ymin, ymax;
+ ymax = zNear * tan(fovy * M_PI / 360.0);
+ ymin = -ymax;
+ xmin = ymin * aspect;
+ xmax = ymax * aspect;
+ glFrustum(xmin, xmax, ymin, ymax, zNear, zFar);
+}
 namespace betacore
 {
-Game::Game()
+Game::Game(MODE mode,
+					 int port,
+					 std::string url): ME(mode)
 {
-
-	printf("%d\t%d\n", this->MONITOR_WIDTH,this->MONITOR_HEIGHT);
+	this->TITLE = Parser::mode(mode).c_str();
+	
+	printf("%s\t%d\t%d\n",this->TITLE, this->MONITOR_WIDTH, this->MONITOR_HEIGHT);
 	if (init())
 	{
 		printf("Error loading init\n");
 		return;
 	}
+	using namespace std::placeholders;
+	std::function<void(SHAPE & s, MODE & m)> fn =
+			std::bind(&Game::update, this, _1, _2);
+	this->client = new Client(mode, port, url, fn);
 	// SDL_DisplayMode DM;
 	// SDL_GetCurrentDisplayMode(0, &DM);
-	this->MONITOR_HEIGHT=1080;
-	this->MONITOR_WIDTH=1920;
+	this->MONITOR_HEIGHT = 1080;
+	this->MONITOR_WIDTH = 1920;
 	SDL_Event event;
 
 	while (this->KEEP_ALIVE)
@@ -25,8 +43,11 @@ Game::Game()
 	}
 	close();
 }
-Game::~Game() {
-
+Game::~Game()
+{
+	if (this->client != nullptr)
+		delete this->client;
+	this->client = nullptr;
 }
 
 int Game::init()
@@ -122,7 +143,11 @@ int Game::initGL()
 	glViewport(0, 0, this->SCREEN_WIDTH, this->SCREEN_HEIGHT);
 	glMatrixMode(GL_PROJECTION);
 	glLoadIdentity();
-
+	gluPerspective(
+			45.0f,
+			(GLfloat)this->SCREEN_WIDTH / (GLfloat)this->SCREEN_HEIGHT,
+			0.1f,
+			100.0f);
 	glMatrixMode(GL_MODELVIEW);
 
 	return result;
@@ -240,8 +265,9 @@ void Game::rectangle()
 	glVertex3f(-2.5f, -1.0f, 0.0f); // Bottom Left
 	glEnd();
 }
-void Game::cross(bool filled){
-		double width = 0.15;
+void Game::cross(bool filled)
+{
+	double width = 0.15;
 	if (filled)
 		glBegin(GL_QUADS);
 	else
@@ -273,43 +299,43 @@ void Game::compass()
 
 	//MINI TRIANGLE
 	glPushMatrix();
-		glScalef(0.12f, 0.12f, 0.0f);
-		glTranslatef(0.0f, 2.6f, 0.0f);
-		this->triangle(this->KEY_UP_ARROW_ACTIVE);
+	glScalef(0.12f, 0.12f, 0.0f);
+	glTranslatef(0.0f, 2.6f, 0.0f);
+	this->triangle(this->KEY_UP_ARROW_ACTIVE);
 	glPopMatrix();
 	// MINI SQUARE
 	glPushMatrix();
-		glScalef(0.12f, 0.12f, 0.0f);
-		glTranslatef(0.0f, -2.6f, 0.0f);
-		this->square(this->KEY_DOWN_ARROW_ACTIVE);
+	glScalef(0.12f, 0.12f, 0.0f);
+	glTranslatef(0.0f, -2.6f, 0.0f);
+	this->square(this->KEY_DOWN_ARROW_ACTIVE);
 	glPopMatrix();
 
 	// MINI PENTAGON
 	glPushMatrix();
-		glScalef(0.12f, 0.12f, 0.0f);
-		glTranslatef(-2.56f, 0.0f, 0.0f);
-		this->pentagon(this->KEY_LEFT_ARROW_ACTIVE);
+	glScalef(0.12f, 0.12f, 0.0f);
+	glTranslatef(-2.56f, 0.0f, 0.0f);
+	this->pentagon(this->KEY_LEFT_ARROW_ACTIVE);
 	glPopMatrix();
 
 	// MINI CIRCLE
 	glPushMatrix();
-		glScalef(0.12f, 0.12f, 0.0f);
-		glTranslatef(2.56f, 0.0f, 0.0f);
-		glColor3f(0.0f, 1.0f, 0.0f);
-		this->circle(this->KEY_RIGHT_ARROW_ACTIVE);
+	glScalef(0.12f, 0.12f, 0.0f);
+	glTranslatef(2.56f, 0.0f, 0.0f);
+	glColor3f(0.0f, 1.0f, 0.0f);
+	this->circle(this->KEY_RIGHT_ARROW_ACTIVE);
 	glPopMatrix();
 
 	glPushMatrix();
-		glScalef(0.35f, 0.35f, 0.0f);
-		glTranslatef(7.0f, 0.0f, 0.0f);
-		glColor3f(0.0f, 1.0f, 1.0f);
-		this->circle(this->KEY_SPACE_ACTIVE);
+	glScalef(0.35f, 0.35f, 0.0f);
+	glTranslatef(7.0f, 0.0f, 0.0f);
+	glColor3f(0.0f, 1.0f, 1.0f);
+	this->circle(this->KEY_SPACE_ACTIVE);
 	glPopMatrix();
-		glPushMatrix();
-		glScalef(0.35f, 0.35f, 0.0f);
-		glTranslatef(10.0f, 0.0f, 0.0f);
-		glColor3f(1.0f, 1.0f, 0.0f);
-		this->circle(this->KEY_RETURN_ACTIVE);
+	glPushMatrix();
+	glScalef(0.35f, 0.35f, 0.0f);
+	glTranslatef(10.0f, 0.0f, 0.0f);
+	glColor3f(1.0f, 1.0f, 0.0f);
+	this->circle(this->KEY_RETURN_ACTIVE);
 	glPopMatrix();
 
 	glPopMatrix();
@@ -320,27 +346,25 @@ void Game::circle()
 }
 void Game::circle(bool filled)
 {
-		//glBegin(GL_LINE_LOOP);
-		// for (int i = 0; i <= 300; i++)
-		// {
-		// 	double angle = 2 * PI * i / 300;
-		// 	double x = cos(angle);
-		// 	double y = sin(angle);
-		// 	glVertex2d(x, y);
-		// }
-		// glEnd();
+	//glBegin(GL_LINE_LOOP);
+	// for (int i = 0; i <= 300; i++)
+	// {
+	// 	double angle = 2 * PI * i / 300;
+	// 	double x = cos(angle);
+	// 	double y = sin(angle);
+	// 	glVertex2d(x, y);
+	// }
+	// glEnd();
 
 	double radius = 1;
 
 	if (filled)
-	
-		glBegin(GL_POLYGON);
 
-	
+		glBegin(GL_POLYGON);
 
-	else	
+	else
 		glBegin(GL_LINE_LOOP);
-	
+
 	double angle1 = 0.0;
 	glVertex2d(radius * cos(0.0), radius * sin(0.0));
 	static const int circle_points = 100;
@@ -363,8 +387,8 @@ void Game::pentagon(bool filled)
 	glColor3f(1.0f, 0.0f, 1.0f);
 	float angleIncrement = 360.0f / 5.0f;
 	angleIncrement *= PI / 180.0f;
-	if ( filled)
-	glBegin(GL_TRIANGLE_FAN);
+	if (filled)
+		glBegin(GL_TRIANGLE_FAN);
 	else
 		glBegin(GL_LINE_LOOP);
 	float angle = 0.0f;
@@ -438,17 +462,16 @@ void Game::guest_screen()
 		break;
 	case UNKOWN:
 		float gray = 105.0 / 255.0;
-		glColor3f(gray,gray,gray);
+		glColor3f(gray, gray, gray);
 		glPushMatrix();
 		glRotatef(-45.0f, 0.0f, 0.0f, 1.0f);
 		glScalef(2.0f, 2.0f, 0.0f);
-		
+
 		this->cross(true);
 		glPopMatrix();
 		break;
 	}
 
-
 	glPopMatrix();
 }
 void Game::top_screen()
@@ -481,7 +504,7 @@ void Game::resize(int width, int height)
 
 	glMatrixMode(GL_PROJECTION);
 	glLoadIdentity();
-
+	gluPerspective(45.0f, (GLfloat)width / (GLfloat)height, 0.1f, 100.0f);
 	glMatrixMode(GL_MODELVIEW);
 }
 
@@ -527,31 +550,35 @@ void Game::key_down(SDL_Keycode key_code)
 		break;
 	case SDLK_SPACE:
 		this->KEY_SPACE_ACTIVE = true;
+		this->on_key_space();
 		break;
 	case SDLK_RETURN:
 		this->KEY_RETURN_ACTIVE = true;
+			this->on_key_enter();
 		break;
 	case SDLK_F11:
-		
-		if(FULL_SCREEN){
+
+		if (FULL_SCREEN)
+		{
 			SDL_SetWindowPosition(this->WINDOW, 100, 100);
 			SDL_RestoreWindow(this->WINDOW);
 			//SDL_SetWindowResizable(this->WINDOW, SDL_TRUE);
 			//SDL_SetWindowBordered(this->WINDOW, 1);
-			SDL_SetWindowSize(this->WINDOW,SCREEN_WIDTH, SCREEN_HEIGHT);
+			SDL_SetWindowSize(this->WINDOW, SCREEN_WIDTH, SCREEN_HEIGHT);
 			//SDL_SetWindowFullscreen(this->WINDOW,SDL_WINDOW_FULLSCREEN );
 		}
-		else {
+		else
+		{
 			SDL_SetWindowPosition(this->WINDOW, 0, 0);
 			//SDL_SetWindowResizable(this->WINDOW, SDL_FALSE);
 			//SDL_SetWindowBordered(this->WINDOW, 0);
-			SDL_SetWindowSize(this->WINDOW,MONITOR_WIDTH, MONITOR_HEIGHT);
+			SDL_SetWindowSize(this->WINDOW, MONITOR_WIDTH, MONITOR_HEIGHT);
 			//SDL_SetWindowFullscreen(this->WINDOW,0 );
 		}
 		this->FULL_SCREEN = !this->FULL_SCREEN;
 
-    SDL_ShowCursor(this->FULL_SCREEN);
-	
+		SDL_ShowCursor(this->FULL_SCREEN);
+
 		break;
 	default:
 		//Do nothing
@@ -662,15 +689,23 @@ void Game::on_key_right_arrow()
 }
 void Game::on_key_space()
 {
-	
+	this->client->send(false,this->USER_CURRENT);
 }
 void Game::on_key_enter()
 {
+	this->client->send(true,this->USER_CURRENT);
+}
+void Game::update(SHAPE &s, MODE &m)
+{
+	if (m == ME)
+		this->USER_CURRENT = s;
+	else
+		this->GUST_CURRENT = s;
 }
 } // namespace betacore
 
 int main(int argc, char *argv[])
 {
-	betacore::Game game;
+	betacore::Game game(betacore::BOB, 4444, "localhost");
 	return 0;
 }
\ No newline at end of file
diff --git a/source/server.cpp b/source/server.cpp
index d67ffc1..0dc27e9 100644
--- a/source/server.cpp
+++ b/source/server.cpp
@@ -1,6 +1,5 @@
 #include "../includes/server.hpp"
 
-
 namespace betacore
 {
 Server::Server(int port)
@@ -14,10 +13,10 @@ void Server::start()
 	this->server_socket = socket(AF_INET, SOCK_STREAM, 0);
 	if (this->server_socket < 0)
 	{
-		std::cout << "ERROR on opening socket"<< std::endl;
+		std::cout << "ERROR on opening socket" << std::endl;
 		return;
 	}
-	std::cout << "Socket Connected"<< std::endl;
+	std::cout << "Socket Connected" << std::endl;
 
 	bzero((char *)&server_address, sizeof(server_address));
 
@@ -25,91 +24,113 @@ void Server::start()
 	server_address.sin_addr.s_addr = INADDR_ANY;
 	server_address.sin_port = htons(this->port);
 
-	if (bind(server_socket, (struct sockaddr *)&server_address, sizeof(server_address)) < 0)
+	if (bind(
+					server_socket,
+					(struct sockaddr *)&server_address,
+					sizeof(server_address)) < 0)
 	{
-		std::cout << "ERROR on binding "<< std::endl;
-
+		std::cout << "ERROR on binding " << std::endl;
 		return;
 	}
-	std::cout << "Bound"<< std::endl;
+	std::cout << "Bound" << std::endl;
 	online = true;
-	server_running=true;
-	std::cout << "Server is online"<< std::endl;
-	signal(SIGPIPE,SIG_IGN);
-	std::thread listen_thread([this] { this->listener(); } );
+	server_running = true;
+	std::cout << "Server is online" << std::endl;
+	signal(SIGPIPE, SIG_IGN); // Prevents issue with sig kill on client
+	std::thread listen_thread([this] { this->listener(); });
 	listen_thread.detach();
 }
 void Server::listener()
 {
-	std::cout << "Listener "<< online << std::endl;
+	std::cout << "Listener " << online << std::endl;
 	struct sockaddr_in client_address;
 	listen(this->server_socket, 10);
-	while (online) {
-	
+	while (online)
+	{
+
 		socklen_t client_socket_length = sizeof(client_address);
 		int client_number =
-			accept(server_socket, (struct sockaddr *)&client_address, &client_socket_length);
+				accept(server_socket, (struct sockaddr *)&client_address, &client_socket_length);
 		this->clients.push_back(client_number);
-		std::cout << "New Conenction"<< std::endl;
+		std::cout << "New Conenction" << std::endl;
 		if (client_number < 0)
 		{
-			std::cout << "ERROR on accept"<< std::endl;
+			std::cout << "ERROR on accept" << std::endl;
 			continue;
 		}
-		std::thread socket_thread([this,client_number]{this->read_socket(client_number);});
+		std::thread socket_thread([this, client_number] { this->read_socket(client_number); });
 		socket_thread.detach();
 	}
 	this->shutdown();
 }
 void Server::read_socket(int client)
 {
-	std::cout 
-		<< "Ready To Read "
-		<< client 
-		<< std::endl;
+	std::cout
+			<< "Ready To Read "
+			<< client
+			<< std::endl;
 	int n;
-	char buffer[1024];
+	char buffer[BUFFER_LENGTH];
 	while (online &&
-			std::find(clients.begin(), clients.end(), client) != clients.end())
-	{	
-		
-	
-		bzero(buffer, 1024);
-	
-		n = read(client, buffer, 1024-1);
+				 std::find(clients.begin(), clients.end(), client) != clients.end())
+	{
+
+		bzero(buffer, BUFFER_LENGTH);
+
+		n = read(client, buffer, BUFFER_LENGTH - 1);
 
 		if (n < 0)
 		{
-			std::cout << "ERROR reading from socket"<< std::endl;
+			std::cout << "ERROR reading from socket" << std::endl;
 			break;
 		}
+		this->forward_message(client, buffer);
+	}
+		std::cout << "Closing Connection for " << client << std::endl;
+	clients.erase(
+			std::remove(clients.begin(), clients.end(), client), clients.end());
+	close(client);
+}
+void Server::forward_message(int client, char buffer[BUFFER_LENGTH])
+{
+	std::cout << "forward message form " << client << std::endl;
+	int n;
+	int error = 0;
 
-
-		printf("Here is the message: %s\n", buffer);
-		n = write(client, "I got your mesage\n", 18);
+	for (int c : clients)
+	{
+		if (c == client)
+			continue;
+		std::cout 
+			<< "forward message form " 
+			<< client 
+			<< "to " 
+			<< c 
+			<< std::endl;
+		n = write(c,  buffer, strlen(buffer));
 
 		if (n < 0)
 		{
-			std::cout << "ERROR Writing socket"<< std::endl;
-			break;
+			std::cout << "ERROR Writing socket to " << c << std::endl;			
 		}
 	}
-	clients.erase(
-		std::remove(clients.begin(), clients.end(), client), clients.end());
-	close(client);
+	
 }
+
 void Server::shutdown()
 {
-	std::cout << "Server is shuting down"<< std::endl;
+	std::cout << "Server is shuting down" << std::endl;
 
 	std::cout << "Closing server socket" << std::endl;
-	close(this->server_socket);	
+	close(this->server_socket);
 	server_running = false;
 }
-void Server::off(){
-	this-> online = false;
+void Server::off()
+{
+	this->online = false;
 }
-bool Server::running(){
+bool Server::running()
+{
 	return this->server_running;
 }