diff --git a/Board.cpp b/Board.cpp
index b423b00..f02ebbb 100755
--- a/Board.cpp
+++ b/Board.cpp
@@ -8,18 +8,22 @@ Board::Board() {
 	for (int i = 0; i < 2; ++i) {	
 		for (int j = 0; j < 8; ++j) {
 			xpieces.push_back(new Piece(i, j, 'X'));
+			pieces.push_back(new Piece(i, j, 'X'));
 		}
 	}
+	
 	for (int i = 6; i < 8; ++i) {	
 		for (int j = 0; j < 8; ++j) {
 			opieces.push_back(new Piece(i, j, 'O'));
+			pieces.push_back(new Piece(i, j, 'O'));
 		}
 	}
 }
 
-bool Board::elemInXs(int r, int c){
-	for (int i = 0; i < xpieces.size(); ++i){
-		if (xpieces[i]->getX() == r && xpieces[i]->getY() == c){
+//make this efficient!
+bool Board::isPiece(int r, int c){
+	for (int i = 0; i < pieces.size(); ++i){
+		if (pieces[i]->getX() == r && pieces[i]->getY() == c){
 			return true;
 		}
 	}
@@ -27,18 +31,18 @@ bool Board::elemInXs(int r, int c){
 	return false;
 }
 
-bool Board::elemInOs(int r, int c){
-	for (int i = 0; i < opieces.size(); ++i){
-		if (opieces[i]->getX() == r && opieces[i]->getY() == c){
-			return true;
+//make this efficient!
+Piece* Board::getPiece(int r, int c){
+	for (int i = 0; i < pieces.size(); ++i){
+		if (pieces[i]->getX() == r && pieces[i]->getY() == c){
+			return pieces[i];
 		}
 	}
 	
-	return false;
+	return new Piece();
 }
-	
-moves Board::parse(string input)
-{
+
+moves Board::parse(string input){
 	input = myToUpper(input);
 	
 	int temp1;
@@ -66,43 +70,40 @@ moves Board::parse(string input)
 	moves output(temp1, temp2, temp3);
 	
 	return output;
-	
 }
 	
-bool Board::isGameOver()
-{
+bool Board::isGameOver(){
 	for (int i = 0; i < xpieces.size(); ++i){
-		if (xpieces[i]->getX() == 0){
+		if (xpieces[i]->getX() == 7){
 			cout<<"\n\n\nPlayer X wins!\n\n\n"<<endl;
 			return true;
 		}
 	}
 	
 	for (int i = 0; i < opieces.size(); ++i){
-		if (opieces[i]->getX() == 7){
+		if (opieces[i]->getX() == 0){
 			cout<<"\n\n\nPlayer O wins!\n\n\n"<<endl;
 			return true;
 		}
 	}
 }
 
-void Board::changeTurns()
-{
+void Board::changeTurns(){
 	if (turn == 'O') turn = 'X';
 	else turn = 'O';
 }	
 	
-void Board::displayBoard()
-{
-	cout<<";    A B C D E F G H"<<endl;
+void Board::displayBoard(){
+	cout << ";    A B C D E F G H"<<endl;
 	for (int i = 0; i < 8; ++i) {
 		int label = 8 - i;
 		cout<<"; "<<label<<" ";
 		for (int j = 0; j < 8; ++j){
-			if (elemInXs(i, j))
-				cout << "|" << "X";
-			else if (elemInOs(i, j))
-				cout << "|" << "O";
+			if (isPiece(i, j))
+				if (getPiece(i, j)->getType() == 'X')
+					cout << "|" << "X";
+				else
+					cout << "|" << "O";
 			else
 				cout << "|" << "_";
 		}
@@ -114,8 +115,7 @@ void Board::displayBoard()
 	cout<<"turn: "<<turn << "\n";
 }
 	
-int Board::charToIntColumn(char input)	//converts column number to int
-{
+int Board::charToIntColumn(char input){
 	int kolumn;
 	
 	switch (input)
@@ -133,8 +133,7 @@ int Board::charToIntColumn(char input)	//converts column number to int
 	return kolumn;
 }
 
-char Board::intToCharColumn(int input)	//converts column number to int
-{
+char Board::intToCharColumn(int input){
 	char kolumn;
 	
 	switch (input)
@@ -151,105 +150,84 @@ char Board::intToCharColumn(int input)	//converts column number to int
 	
 	return kolumn;
 }
-/*
-void Board::move(string inputMove)	
-{
+
+void Board::move(string inputMove){
 	moves jugada = parse(inputMove);
 	move(jugada);
 }
-		
-void Board::move(moves jugada)	
-{
+
+void Board::move(moves jugada){
 	int row = 8 - (jugada.row);
 	int column = charToIntColumn(jugada.column);
 	
-	cout << "move coordinates: (" << row << ", " << column << ")\n"; 
-	
 	if (row > 8 || row < 0 || column > 8 || column < 0) {
 		cout<<"ERROR: index out of bound."<<endl;
 	}
 	
-	char temp = boardArray[row][column]->getType();
-	cout << "temp: " << temp << "\n";
+	Piece* piece;
+	if (isPiece(row, column))
+		piece = getPiece(row, column);
 	
-	if (temp != turn || temp == '_') {
-		cout<<"ERROR: attempting to move an invalid piece."<<endl; 
+	else{
+		cout<<"ERROR: attempting to move an invalid piece.\n";
+		return;
+	}
+	
+	if (piece->getType() != turn) {
+		cout<<"ERROR: attempting to move the wrong side's piece.\n"; 
 	}
 	
 	else {
 		if (jugada.moveType == "FWD") {
-				boardArray[row][column]->moveFwd();
+			piece->moveFwd();
 		}
 		
 		else if (jugada.moveType == "LEFT") {
-			if (column == 0)
-				cout<<"Destination Spot out of range!"<<endl;
-			
-			else if (boardArray[row][column-1]->getType() == temp)
-				cout<<"you hate your own team or something? you can't do that!"<<endl;
-			
-			else
-				boardArray[row][column]->moveLeft();	
+			//add error checking
+			piece->moveLeft();	
 		}
 		
 		else if (jugada.moveType == "RIGHT") {
-			if (column == 7)
-				cout<<"Destination Spot out of range!"<<endl;
-			
-			else if (boardArray[row][column+1]->getType() == temp)
-				cout<<"you hate your own team or something? you can't do that!"<<endl;
-			
-			else
-				boardArray[row][column]->moveRight();
+			//add error checking
+			piece->moveRight();
 		}
 	}
 }
-*/
-//FIX THIS
-//take out the prints and turn changes from move
-void Board::moveWOPrint(moves jugada)	
-{
-	//
-}
-/*	
-bool Board::isThisMovePossible(int r, int c, string moveType)
-{
-	char pieceToMove = boardArray[r][c]->getType();
 	
-	if (pieceToMove != turn) //trying to move invalid piece
-	{
+bool Board::isThisMovePossible(int r, int c, string moveType){
+	Piece* piece;
+	if (isPiece(r, c))
+		piece = getPiece(r, c);
+	else
+		return false;
+	
+	if (piece->getType() != turn) {
 		cout << "Error in Board::isThisMovePossible: trying to move a piece outside your turn.\n";
 		return false;
 	}
 	
-	int reflector = 1;
-	
-	if (pieceToMove == 'O')
-	{
-		reflector *= -1;
-	}
-	
-	else
-	{
-		if (moveType == "FWD")
-		{
-			if (boardArray[r+reflector][c]->getType() == '_') 
+	else{
+		int reflector = 1;
+		
+		if (piece->getType() == 'O')
+			reflector *= -1;
+		
+		if (moveType == "FWD"){
+			if (isPiece(r+reflector, c)) 
 				return true;
 			else 
 				return false;
 		}
 		
-		else if (moveType == "RIGHT")
-		{				
-			if (boardArray[r+reflector][c+1]->getType() != pieceToMove && (r+reflector >= 0) && (r+reflector <= 7) && (c+1 <= 7) ) 
+		else if (moveType == "RIGHT"){				
+			if (isPiece(r+reflector, c+1) && (r+reflector >= 0) && (r+reflector <= 7) && (c+1 <= 7)) 
 				return true;
 			else 
 				return false;
 		}
 		
-		else if (moveType == "LEFT")
-		{
-			if (boardArray[r+reflector][c-1]->getType() != pieceToMove && (r+reflector >= 0) && (r+reflector <= 7) && (c+1 >= 0) ) 
+		else if (moveType == "LEFT"){
+			if (isPiece(r+reflector, c+1) && (r+reflector >= 0) && (r+reflector <= 7) && (c+1 >= 0))
 				return true;
 			else 
 				return false;
@@ -259,43 +237,62 @@ bool Board::isThisMovePossible(int r, int c, string moveType)
 	}
 }
 
-vector<moves> Board::viewPossibleMoves()
-{
+vector<moves> Board::viewPossibleMoves(){
+	int r, c = -1;
 	vector<moves> output;
 	
-	for (int r = 0; r < 8; ++r)
-	{
-		for (int c = 0; c < 8; ++c)
-		{
-			if (boardArray[r][c]->getType() == turn)
+	if (turn == 'X'){
+		for (int i = 0; i < xpieces.size(); ++i){
+			r = xpieces[i]->getX();
+			c = xpieces[i]->getY();
+			if (isThisMovePossible(r, c, "FWD"))
 			{
-				if (isThisMovePossible(r,c,"FWD"))
-				{
-					moves temp(8-r,intToCharColumn(c+1),"FWD");
-					output.push_back(temp);
-				}
-				
-				if (isThisMovePossible(r,c,"LEFT"))
-				{
-					moves temp(8-r,intToCharColumn(c+1),"LEFT");
-					output.push_back(temp);
-				}
-				
-				if (isThisMovePossible(r,c,"RIGHT"))
-				{
-					moves temp(8-r,intToCharColumn(c+1),"RIGHT");
-					output.push_back(temp);
-				}
-				
+				moves temp(8-r,intToCharColumn(c+1), "FWD");
+				output.push_back(temp);
+			}
+			
+			if (isThisMovePossible(r,c,"LEFT"))
+			{
+				moves temp(8-r,intToCharColumn(c+1), "LEFT");
+				output.push_back(temp);
+			}
+			
+			if (isThisMovePossible(r,c,"RIGHT"))
+			{
+				moves temp(8-r,intToCharColumn(c+1), "RIGHT");
+				output.push_back(temp);
+			}
+		}
+	}
+	
+	else {
+		for (int i = 0; i < opieces.size(); ++i){
+			r = opieces[i]->getX();
+			c = opieces[i]->getY();
+			if (isThisMovePossible(r, c, "FWD"))
+			{
+				moves temp(8-r,intToCharColumn(c+1), "FWD");
+				output.push_back(temp);
+			}
+			
+			if (isThisMovePossible(r,c,"LEFT"))
+			{
+				moves temp(8-r,intToCharColumn(c+1), "LEFT");
+				output.push_back(temp);
+			}
+			
+			if (isThisMovePossible(r,c,"RIGHT"))
+			{
+				moves temp(8-r,intToCharColumn(c+1), "RIGHT");
+				output.push_back(temp);
 			}
 		}
 	}
 	
 	return output;
 }
-*/
-string Board::myToUpper(string input)
-{
+
+string Board::myToUpper(string input){
 	string output;
 	
 	for (int i = 0 ; i < input.size(); ++i)
@@ -314,8 +311,7 @@ string Board::myToUpper(string input)
 	
 }
 
-void Board::undo(Board& tablero)
-{
+void Board::undo(Board& tablero){
 	vector<Board> record;
 	
 	if (record.size() < 2)
@@ -336,9 +332,8 @@ void Board::undo(Board& tablero)
 		record.pop_back();
 	}	
 }
-/*
-void Board::interpret(string input, Board& tablero)	//determines what kind of command its input is
-{
+
+void Board::interpret(string input, Board& tablero){
 	vector<Board> record;
 	input = myToUpper(input);
 	
@@ -360,9 +355,8 @@ void Board::interpret(string input, Board& tablero)	//determines what kind of co
 	
 	else tablero.move(input);
 }
-*/
-void Board::snapshot(vector<Board>& inputVec, Board inputBoard)
-{
+
+void Board::snapshot(vector<Board>& inputVec, Board inputBoard){
 	if (inputVec.size() == 10)
 	{
 		inputVec.erase(inputVec.begin());
@@ -390,4 +384,9 @@ int Board::evaluate(char max, char min){
 		cout << "Unidentified max, must be either X or O.\n";
 		return 0;
 	}
-}
\ No newline at end of file
+}
+
+
+
+
+
diff --git a/Board.h b/Board.h
index 8f3284c..c4bf1f6 100755
--- a/Board.h
+++ b/Board.h
@@ -22,13 +22,14 @@ class Board {
 	//vector<vector<char>> boardArray;
 	vector<Piece*> xpieces;
 	vector<Piece*> opieces;
+	vector<Piece*> pieces;
 	//char boardArray [8][8];
 	char turn = 'O'; 
 	
 public:
 	Board();
-	bool elemInXs(int r, int c);
-	bool elemInOs(int r, int c);
+	bool isPiece(int r, int c);
+	Piece* getPiece(int r, int c);
 	moves parse(string input);
 	char getTurn() { return turn; }
 	bool isGameOver();
@@ -36,11 +37,11 @@ public:
 	void displayBoard();
 	int charToIntColumn(char input);
 	char intToCharColumn(int input);
-	//void move(string inputMove);
-	//void move(moves jugada);
+	void move(string inputMove);
+	void move(moves jugada);
 	void moveWOPrint(moves jugada);
-	//bool isThisMovePossible(int r, int c, string moveType);
-	//vector<moves> viewPossibleMoves();
+	bool isThisMovePossible(int r, int c, string moveType);
+	vector<moves> viewPossibleMoves();
 	string myToUpper(string input);
 	void undo(Board& tablero);
 	void interpret(string input, Board& tablero);
diff --git a/Client.cpp b/Client.cpp
index 73bb121..4ed70b2 100644
--- a/Client.cpp
+++ b/Client.cpp
@@ -48,46 +48,58 @@ int main(int argc, char *argv[])
 	//Client has successfully joined
 	char buffer[256];
 	char info[256];
+	string final_board;
 	
 	cout<<"WELCOME\n";
 	
 	cout<<"1. Play against AI?\n";
-	cout<<"2. Play against a human?\n";
-	cout<<"Enter choice: \n";
-	
-	string choice;
-	cin >> choice;
+	cout<<"2. Play AI against an AI?\n";
 	
+	string choice = "";
+	while(choice != "1")
+	{	
+		cout<<"Enter choice: \n";
+		cin >> choice;
+		if(choice == "2")
+			cout << "AI vs. AI mode not added yet!\n";
+	}
 	//Check for a valid option
 	cout << "OK!\n" << endl;
 	
 	//Writes off the choice to the server
-	
 	n = write(sockfd, choice.c_str(), choice.length()); //Sends an input to the server
-	
-	
+	cin.clear();
+	cin.ignore(10000,'\n');
 	while(true) {
 		
 			bzero(buffer,256); //resets the input stream
 			n = read(sockfd,buffer,255); //Receives the board from server
 			printf("%s\n",buffer);//Prints the received message
+			final_board = buffer;
 			
 			printf("Please enter a move: ");
 			bzero(buffer,256); //resets input stream
 			fgets(buffer,255,stdin); //Enter a move
-			n = write(sockfd,buffer,strlen(buffer)); //Sends an inputted move to the server
+			n = write(sockfd,buffer,strlen(buffer)); //Sends an input move to the server
 			bzero(info,256); //resets input stream
 			
 			n = read(sockfd,info,255); //Reads from server if move was valid
 			string ref = info;
 			if(ref == "Game_Over") {
+				n = read(sockfd,info,255); //Reads from server if move was valid
 				cout << "GAME OVER!!!" << endl;
 				break;
 			}
 			else
 				continue;
-			
 	}
+	cout << "\nGAME WINNING MOVE: \n";
+	//cout << final_board << endl;
+	//bzero(info,256); //resets input stream
+	n = read(sockfd,info,255); //Reads from server if move was valid
+	
+	printf("%s\n",info);//Prints the received message
+	usleep(1);
 	close(sockfd);
     return 0;
 }
diff --git a/Engine.cpp b/Engine.cpp
index c68e650..3aebf01 100755
--- a/Engine.cpp
+++ b/Engine.cpp
@@ -38,13 +38,11 @@ void Engine::startGame(){
 			cin>>move;
 			cout << "\n";
 			b->interpret(move, *b);
+			b->changeTurns();
 		}
 		
-		b->changeTurns();
-		
 		while(b->getTurn() == 'X' )
 		{
-			cout << "\n\n\n\nit gets here\n\n\n\n";
 			easyAI();
 		}
 		
@@ -56,23 +54,22 @@ void Engine::startGame(){
 
 void Engine::easyAI()
 {
-	//1) see all possible movements
 	vector<moves> listOfMoves = b->viewPossibleMoves();
 	
-	//obvious moves
-	if (false){
-		b->changeTurns();
-	}
-
-	//random
-	else { 
-		srand(time(NULL));
-		int randomChoice = rand() % (listOfMoves.size()-1) - 0; // choose a move betwen listOfMoves[0] to last element
-		
-		//3) execute movement
-		int temp = randomChoice;
-		b->move(listOfMoves[randomChoice]);
-	}
+	cout << listOfMoves[0].row << "\n";
+	cout << listOfMoves[0].column << "\n";
+	cout << listOfMoves[0].moveType << "\n\n";
+	b->move(listOfMoves[0]);
+	b->changeTurns();
+	/*
+	srand(time(NULL));
+	int randomChoice = rand() % (listOfMoves.size()-1) - 0; // choose a move betwen listOfMoves[0] to last element
+	
+	//3) execute movement
+	int temp = randomChoice;
+	b->move(listOfMoves[randomChoice]);
+	b->changeTurns();
+	*/
 }
 
 void Engine::AI(){
@@ -91,7 +88,7 @@ void Engine::AI(){
 		minMax(temp, listOfMoves[i]);
 	}*/
 	
-	b->moveWOPrint(minMax(temp, listOfMoves[0], 0));
+	//b->moveWOPrint(minMax(temp, listOfMoves[0], 0));
 	
 	//verification of correct turn
 	if (b->getTurn() != 'O'){
@@ -116,7 +113,7 @@ moves Engine::minMax(Board temp, moves m, int c){
 	else {
 		if(temp.isThisMovePossible(8 - m.row, temp.charToIntColumn(m.column), m.moveType)){
 			cout << "piece has been moved in minMax\n";
-			temp.moveWOPrint(m);
+			//temp.moveWOPrint(m);
 		}
 		cout << "c: " << c << "\n\n";
 		cout << "current turn: " << temp.getTurn() << "\n";
diff --git a/Piece.h b/Piece.h
index 60a3a00..cc27d24 100755
--- a/Piece.h
+++ b/Piece.h
@@ -19,7 +19,6 @@ public:
 	int getY(){ return y; }
 	void setY(int c){ y = c; }
 	char getType(){ return type; }
-	void setType(char t){ type = t; }
 	void makeEmpty(){ type = '_'; }
 	void isTaken();
 };
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..ac4fdc5
--- /dev/null
+++ b/README.md
@@ -0,0 +1,10 @@
+# Breakthrough
+Reposity for the second CSCE 315 project
+
+compile the server with the folling command:
+g++ -std=c++11 -o server Board.cpp Server.cpp
+
+run:
+./server [port]
+
+Client is still WIP.
diff --git a/Server.cpp b/Server.cpp
index 3630ebc..de4e231 100644
--- a/Server.cpp
+++ b/Server.cpp
@@ -85,6 +85,8 @@ int main(int argc, char *argv[])
     char buffer[256];
     char info[256];
 	int choice;
+	int move_counter = 0;
+	string final_move;
 	
 	//Waiting for client to select game type
 	n = read(newsockfd,info,255);
@@ -100,14 +102,14 @@ int main(int argc, char *argv[])
 			
 			while(b.getTurn() == 'O' )
 			{
-				b.displayBoard(); //Display the board on the server
+				b.displayBoard();//Display the board on the server
 				string boardState = b.boardToString();
-				write(newsockfd, boardState.c_str(), boardState.length()); //Display the board to the client (line by line)
+				final_move = b.boardToString();
+				write(newsockfd, boardState.c_str(), boardState.length());//Display the board to the client (line by line)
 				cout<<"\nWaiting for client: ";
 				n = read(newsockfd,buffer,255);
-				move = buffer;	
+				move = buffer;
 				b.interpret(move,b);
-				
 				gameOver = b.isGameOver();
 				if(gameOver == true) {
 					string endGame = "Game_Over";
@@ -119,42 +121,20 @@ int main(int argc, char *argv[])
 					write(newsockfd, continueGame.c_str(), continueGame.length()); //Display the board to the client (line by line)
 				}
 			}
-			
-			//gameOver = b.isGameOver();
-			// if(gameOver == true) {
-				// string endGame = "Game_Over";
-				// write(newsockfd, endGame.c_str(), endGame.length()); //Display the board to the client (line by line)
-				// break;
-			// }
-			// else {
-				// string continueGame = "Continue_Game";
-				// write(newsockfd, continueGame.c_str(), continueGame.length()); //Display the board to the client (line by line)
-			// }
-			
 			vector<moves> possibleMoves = b.viewPossibleMoves();
 			if(choice == 1)
 				b.easyAI();
+				
 		 }
 		 
+		string final_move = b.boardToString();
+		write(newsockfd, final_move.c_str(), final_move.length());//Display the board to the client (line by line)
+		write(newsockfd, final_move.c_str(), final_move.length());
+		cout << "\n\nGAME OVER!!!";
+		usleep(1);
 		close(newsockfd);
 		close(sockfd);
 		break;
-		 
-		 /*
-			 bzero(buffer,512);
-			 n = read(newsockfd,buffer,255);
-			 if (n < 0) error("ERROR reading from socket");
-			 printf("Here is the message: %s\n",buffer);
-			 n = write(newsockfd,"I got your message",18);
-			 
-			 if (n < 0) error("ERROR writing to socket");
-			 
-			 if(buffer == "y") {
-				  close(newsockfd);
-				  close(sockfd);
-				  break;
-				}	
-				*/
 	 }
 	 return 0; 
 }
diff --git a/test.cpp b/test.cpp
index fd5452f..ba030f6 100755
--- a/test.cpp
+++ b/test.cpp
@@ -7,9 +7,8 @@ int main()
 {
 	//board testing
 	Board b;
-	b.displayBoard();
 	
 	//engine testing
-	//Engine e;
-	//e.startGame();
+	Engine e;
+	e.startGame();
 }