diff --git a/bin/GUI/ChessDrawer.class b/bin/GUI/ChessDrawer.class
index 625069c..ac3f7cf 100644
Binary files a/bin/GUI/ChessDrawer.class and b/bin/GUI/ChessDrawer.class differ
diff --git a/bin/GUI/Controller$1.class b/bin/GUI/Controller$1.class
index 59cdc96..227c98b 100644
Binary files a/bin/GUI/Controller$1.class and b/bin/GUI/Controller$1.class differ
diff --git a/bin/GUI/Controller$2.class b/bin/GUI/Controller$2.class
index 64e3311..d8de59d 100644
Binary files a/bin/GUI/Controller$2.class and b/bin/GUI/Controller$2.class differ
diff --git a/bin/GUI/Controller$3.class b/bin/GUI/Controller$3.class
index 018c464..85910b9 100644
Binary files a/bin/GUI/Controller$3.class and b/bin/GUI/Controller$3.class differ
diff --git a/bin/GUI/Controller.class b/bin/GUI/Controller.class
index 1fc7eca..80d4516 100644
Binary files a/bin/GUI/Controller.class and b/bin/GUI/Controller.class differ
diff --git a/bin/engine/CoordFour.class b/bin/engine/CoordFour.class
index 32c50ea..b61bbb2 100644
Binary files a/bin/engine/CoordFour.class and b/bin/engine/CoordFour.class differ
diff --git a/bin/engine/GameState.class b/bin/engine/GameState.class
index 7b9fe04..63be7e2 100644
Binary files a/bin/engine/GameState.class and b/bin/engine/GameState.class differ
diff --git a/bin/engine/GameStateManager.class b/bin/engine/GameStateManager.class
index 02dbc30..e8b6553 100644
Binary files a/bin/engine/GameStateManager.class and b/bin/engine/GameStateManager.class differ
diff --git a/bin/fileIO/FENExporter.class b/bin/fileIO/FENExporter.class
index 9bccf04..e177dd7 100644
Binary files a/bin/fileIO/FENExporter.class and b/bin/fileIO/FENExporter.class differ
diff --git a/bin/fileIO/FENParser.class b/bin/fileIO/FENParser.class
index 8885458..652851a 100644
Binary files a/bin/fileIO/FENParser.class and b/bin/fileIO/FENParser.class differ
diff --git a/bin/main/Main.class b/bin/main/Main.class
index 4d0c6f7..8426e12 100644
Binary files a/bin/main/Main.class and b/bin/main/Main.class differ
diff --git a/bin/sample.fxml b/bin/sample.fxml
index dd1fe8f..deb0726 100644
--- a/bin/sample.fxml
+++ b/bin/sample.fxml
@@ -13,6 +13,7 @@
 		<MenuBar fx:id="menuBar">
 	        <Menu text="File">
 		       	<MenuItem text="   Open file        " fx:id="open" onAction="#loadGame"/>
+		       	<MenuItem text="   Save Game        " onAction="#saveGameState"/>
 		    </Menu>
 	        <Menu text="Edit" onAction="#handleMenu">
 	        </Menu>
@@ -27,14 +28,14 @@
 		</ScrollPane>
 	</center>
 	<right>
-		<ListView fx:id="notationList" minWidth="200" maxWidth="300" prefWidth="200">
-		</ListView>
+		<ListView fx:id="notationList" minWidth="200" maxWidth="300" prefWidth="200" onMouseClicked="#handleListEvent" />
 	</right>
 	<bottom>
 		<VBox>
 			<HBox Alignment="CENTER_LEFT" spacing="50" >
 				<Button text="Submit Turn" onAction="#handleSubmitButton" />	
 				<Button text="Undo Turn" onAction="#handleUndoButton" />
+				<Button text="~~" onAction="#handlePanButton" />
 			</HBox>
 			<Label fx:id="statusLabel"/>
 		</VBox>
diff --git a/bin/test/FENParserTest.class b/bin/test/FENParserTest.class
index 9a19cdb..8f4d848 100644
Binary files a/bin/test/FENParserTest.class and b/bin/test/FENParserTest.class differ
diff --git a/res/Variations/Standard-TwoTimeline.FEN.txt b/res/Variations/Standard-TwoTimeline.FEN.txt
new file mode 100644
index 0000000..c6972bf
--- /dev/null
+++ b/res/Variations/Standard-TwoTimeline.FEN.txt
@@ -0,0 +1,3 @@
+8;8;1;2;0;w
+rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR;KQkq;-;b1
+rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR;KQkq;-;w1
\ No newline at end of file
diff --git a/res/exampleGame.txt b/res/exampleGame.txt
new file mode 100644
index 0000000..5a96295
--- /dev/null
+++ b/res/exampleGame.txt
@@ -0,0 +1,3 @@
+8;8;0;1;0;w
+rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR;KQkq;-;w1
+(6,0,1,0)(5,2,1,0);(6,7,1,0)(5,5,1,0);(4,1,2,0)(4,3,2,0);(4,6,2,0)(4,4,2,0);(5,2,3,0)(5,4,2,0);(4,6,2,1)(4,5,2,1);(4,1,3,1)(4,2,3,1);(5,7,3,1)(2,4,3,1);(1,7,3,0)(2,5,3,0);
\ No newline at end of file
diff --git a/res/sample.fxml b/res/sample.fxml
index dd1fe8f..deb0726 100644
--- a/res/sample.fxml
+++ b/res/sample.fxml
@@ -13,6 +13,7 @@
 		<MenuBar fx:id="menuBar">
 	        <Menu text="File">
 		       	<MenuItem text="   Open file        " fx:id="open" onAction="#loadGame"/>
+		       	<MenuItem text="   Save Game        " onAction="#saveGameState"/>
 		    </Menu>
 	        <Menu text="Edit" onAction="#handleMenu">
 	        </Menu>
@@ -27,14 +28,14 @@
 		</ScrollPane>
 	</center>
 	<right>
-		<ListView fx:id="notationList" minWidth="200" maxWidth="300" prefWidth="200">
-		</ListView>
+		<ListView fx:id="notationList" minWidth="200" maxWidth="300" prefWidth="200" onMouseClicked="#handleListEvent" />
 	</right>
 	<bottom>
 		<VBox>
 			<HBox Alignment="CENTER_LEFT" spacing="50" >
 				<Button text="Submit Turn" onAction="#handleSubmitButton" />	
 				<Button text="Undo Turn" onAction="#handleUndoButton" />
+				<Button text="~~" onAction="#handlePanButton" />
 			</HBox>
 			<Label fx:id="statusLabel"/>
 		</VBox>
diff --git a/src/GUI/ChessDrawer.java b/src/GUI/ChessDrawer.java
index 0a3c15b..d33b132 100644
--- a/src/GUI/ChessDrawer.java
+++ b/src/GUI/ChessDrawer.java
@@ -88,7 +88,6 @@ public static void drawTimelineV(GraphicsContext gc, int x, int y, int screenx,
 		}
 	}
 	
-	//TODO fix loading of file.
 	public static void drawFullBoardV(GraphicsContext gc, Board b, boolean color, boolean playable, int x, int y, int screenx, int screeny) {
 		if (piecesprites == null) {
 			try {
diff --git a/src/GUI/Controller.java b/src/GUI/Controller.java
index e3717fd..7e86946 100644
--- a/src/GUI/Controller.java
+++ b/src/GUI/Controller.java
@@ -33,6 +33,7 @@
 import engine.GameStateManager;
 import engine.Move;
 import engine.MoveGenerator;
+import fileIO.FENExporter;
 import fileIO.FENParser;
 
 public class Controller {
@@ -78,7 +79,7 @@ public class Controller {
 
 	// This func is called in the very start of initialization of this class
 	public Controller() {
-		g = new GameStateManager(FENParser.FENtoGSNew("res/Standard.FEN.txt"));
+		g = FENParser.FENtoGSM("res/Standard.FEN.txt");
 	}
 
 	// This func is called after all initializations from the FXML parser.
@@ -174,10 +175,23 @@ public void handleSubmitButton(ActionEvent e) {
 		boolean submitted = g.submitMoves();
 		setStatusLabel();
 		if(submitted) {			
-			notationStringArray.add(g.turns.get(g.turns.size() - 1).toString());//Sometimes one move will show a phantom move TODO fix that.
+			notationStringArray.add(g.turns.get(g.turns.size() - 1).toString());
 		}
 	}
-
+	
+	@FXML
+	private void handlePanButton(ActionEvent event) {
+		System.out.println("Pan");
+	}
+	
+	@FXML
+	private void handleListEvent(MouseEvent event) {
+		System.out.println("Chagne");
+		//TODO set this -- test this
+		int turnIndex = 0;
+		//g.setTurn(turnIndex);
+	}
+	
 	@FXML
 	private void handleMenu(ActionEvent event) {
 		if (event.getSource() instanceof Menu)
@@ -197,7 +211,7 @@ private void handleEventList(ActionEvent event) {
 	private void loadGame(ActionEvent event) {
 		File selectedFile = getFile();
 		if (selectedFile != null) {
-			g =  new GameStateManager(FENParser.FENtoGSNew(selectedFile));
+			g = FENParser.FENtoGSM(selectedFile);
 			drawStage();
 			setStatusLabel();
 			screenX = 0;
@@ -205,6 +219,16 @@ private void loadGame(ActionEvent event) {
 		}
 	}
 	
+	@FXML
+	private void saveGameState(ActionEvent event) {
+		Popup p = new Popup();
+		FileChooser fileChooser = new FileChooser();
+		fileChooser.setInitialDirectory(new File(new File("").getAbsolutePath()));
+		fileChooser.setTitle("Open Resource File");
+		File selectedFile = fileChooser.showSaveDialog(p.getOwnerWindow());
+		FENExporter.exportString(selectedFile, FENExporter.GameStateToFEN(this.g));
+	}
+	
 	@FXML
 	private void setProperties(ActionEvent e) {
 		
@@ -297,8 +321,11 @@ public static boolean alContains(ArrayList<CoordFour> al, CoordFour target) {
 		return false;
 	}
 	
-	private static void panToBoard(int T, int L) {
-		//TODO finish this function.
+	private void panToBoard(int T, int L) {
+		int pany = L * (ChessDrawer.padding + (ChessDrawer.squarewidth * g.height)) + 100;
+		int panx = T * (ChessDrawer.padding + (ChessDrawer.squarewidth * g.width)) + 100;
+		screenX = panx;
+		screenY = pany;
 	}
 
 }
diff --git a/src/Protocol/EngineListener.java b/src/Protocol/EngineListener.java
index 60cb1f7..5c65002 100644
--- a/src/Protocol/EngineListener.java
+++ b/src/Protocol/EngineListener.java
@@ -4,7 +4,7 @@ public class EngineListener implements Runnable{
 
 	@Override
 	public void run() {
-		// TODO Auto-generated method stub
+		//XXX Auto-generated method stub
 		//figure out how to get info
 	}
 
diff --git a/src/engine/CoordFour.java b/src/engine/CoordFour.java
index 70a2f9f..5140926 100644
--- a/src/engine/CoordFour.java
+++ b/src/engine/CoordFour.java
@@ -2,9 +2,8 @@
 
 public class CoordFour {
 	/*
-	 * X represents file ie. a,b,c... files
-	 * y represents rank
-	 * T/L represent their raw coordinates as per 5d chess rules
+	 * X represents file ie. a,b,c... files y represents rank T/L represent their
+	 * raw coordinates as per 5d chess rules
 	 */
 	public int x;
 	public int y;
@@ -25,7 +24,7 @@ public CoordFour(int x, int y) {
 	public CoordFour clone() {
 		return new CoordFour(this.x, this.y, this.T, this.L);
 	}
-	
+
 	/**
 	 * A comparison function to compare this coordinate and another.
 	 * 
@@ -56,45 +55,62 @@ public void add(CoordFour c) {
 		T += c.T;
 		L += c.L;
 	}
-	
-	//turns a coord into a vector, or a coord with only 1/0's
+
+	public void sub(CoordFour c) {
+			x -= c.x;
+			y -= c.y;
+			T -= c.T;
+			L -= c.L;
+	}
+
+	// turns a coord into a vector, or a coord with only 1/0's
 	public void makeVector() {
-		if(this.x != 0) {
+		if (this.x != 0) {
 			this.x = 1;
 		}
-		if(this.y != 0) {
+		if (this.y != 0) {
 			this.y = 1;
 		}
-		if(this.T != 0) {
+		if (this.T != 0) {
 			this.T = 1;
 		}
-		if(this.L != 0) {
+		if (this.L != 0) {
 			this.L = 1;
 		}
 	}
-	
-	//TODO make a func that flattents the vector ie. 2,2,2,2 would be 1,1,1,1 but something like 2,4,0,0 would be 1,2,0,0 not 1,1,0,0
-	
-	//gets the n-diagonal that a vector is
-	public int getNagonal(){
+
+	public void flatten() {
+		int gcd = GCD(GCD(Math.abs(x),Math.abs(y)), GCD(Math.abs(T),Math.abs(L)));
+		if(gcd == 0) {			
+			return;
+		}
+		this.x = this.x / gcd;
+		this.y = this.y / gcd;
+		this.T = this.T / gcd;
+		this.L = this.L / gcd;
+	}
+
+	// gets the n-diagonal that a vector is
+	public int getNagonal() {
 		int nagonal = 0;
-		if(this.x != 0)
+		if (this.x != 0)
 			nagonal++;
-		if(this.y != 0)
+		if (this.y != 0)
 			nagonal++;
-		if(this.T != 0)
+		if (this.T != 0)
 			nagonal++;
-		if(this.L != 0)
+		if (this.L != 0)
 			nagonal++;
 		return nagonal;
 	}
-	
+
 	public String toString() {
 		return "(" + L + "L." + "T" + T + "." + intToFile(x) + "" + (y + 1) + ")";
 	}
-	
+
 	/**
 	 * gets a string raw representation of this.
+	 * 
 	 * @return raw coord string
 	 */
 	public String rawCoordString() {
@@ -103,25 +119,40 @@ public String rawCoordString() {
 
 	/**
 	 * get a SAN 2d coord of the given object such as a1 e4 ....
+	 * 
 	 * @return String SAN representation
 	 */
 	public String SANString() {
-		return intToFile(this.x) + "" + (this.y +1);
+		return intToFile(this.x) + "" + (this.y + 1);
 	}
-	
-	//add
-	public static CoordFour add(CoordFour c1, CoordFour c2) {
-		CoordFour sum = new CoordFour( c2.x + c1.x, c2.y +c1.y, c2.T + c1.T, c2.L + c1.L);
-		return sum;
+
+	public static int GCD(int num1, int num2) {
+		while(num1 > 0 && num2 > 0) {
+			if(num1 > num2) {
+				num1 -= num2;
+			}
+			else {
+				num2 -= num1;
+			}
+		}
+		return num1 + num2;
 	}
 
-	//sub
+	// sub
 	public static CoordFour sub(CoordFour c1, CoordFour c2) {
-		return new CoordFour( c2.x - c1.x, c2.y - c1.y, c2.T - c1.T, c2.L - c1.L);
+		return new CoordFour(c2.x - c1.x, c2.y - c1.y, c2.T - c1.T, c2.L - c1.L);
+	}
+	
+	// add
+	public static CoordFour add(CoordFour c1, CoordFour c2) {
+		CoordFour sum = new CoordFour(c2.x + c1.x, c2.y + c1.y, c2.T + c1.T, c2.L + c1.L);
+		return sum;
 	}
 
 	/**
-	 * returns the corrisponding file from the int file sent, 0 indexed so a is 0 b is 1 and so on.
+	 * returns the corrisponding file from the int file sent, 0 indexed so a is 0 b
+	 * is 1 and so on.
+	 * 
 	 * @param file file to get char for
 	 * @return char corrisponding to sent file.
 	 */
diff --git a/src/engine/GameState.java b/src/engine/GameState.java
index 1dade1f..b082821 100644
--- a/src/engine/GameState.java
+++ b/src/engine/GameState.java
@@ -530,20 +530,21 @@ public void undoTempMoves() {
 		turnMoves.clear();
 	}
 
-	// TODO add handicap to this.
+	
 	/**
 	 * this function changes the object to reflect which TL are 'active'
+	 * Uses 'handicap' for even tl things -- May be wrong but we will see.
 	 */
 	protected void determineActiveTLS() {
 		// case 1 -- black has branched more.
 		if (maxTL < Math.abs(minTL)) {
 			maxActiveTL = maxTL;
-			minActiveTL = -1 - maxActiveTL;
+			minActiveTL = Math.max(-1 - maxActiveTL + tlHandicap, minTL);
 		}
 		// case 2 -- white has branched more.
 		else if (Math.abs(minTL) < maxTL) {
 			minActiveTL = minTL;
-			maxActiveTL = 1 + Math.abs(minActiveTL);
+			maxActiveTL = Math.min(1 + Math.abs(minActiveTL) + tlHandicap, maxTL);
 		}
 		// case 3 -- they have branched the same # of times
 		else {
diff --git a/src/engine/GameStateManager.java b/src/engine/GameStateManager.java
index 632ee8d..82d8ced 100644
--- a/src/engine/GameStateManager.java
+++ b/src/engine/GameStateManager.java
@@ -17,6 +17,8 @@ public class GameStateManager extends GameState{
 	public GameStateManager(Timeline[] origins, int width, int height, boolean evenStart, boolean color, int minTL, Move[] moves) {
 		super(origins, width, height, evenStart, color, minTL, moves);
 		this.preMoves = moves;
+		originBoards = new Board[origins.length];
+		this.turns = new ArrayList<Turn>();
 		for(int i = 0; i < origins.length ; i++){
 			if(origins[i].colorStart) {
 				originBoards[i] = origins[i].wboards.get(0);
@@ -26,17 +28,12 @@ public GameStateManager(Timeline[] origins, int width, int height, boolean evenS
 		}
 	}
 	
-	public GameStateManager(GameState game) {//TODO fix this
-		super(game);
-		this.turns = new ArrayList<Turn>();
-		currTurn = 1; 
-	}
-	
 	public boolean submitMoves() {
 		determineActiveTLS();
 		boolean presColor = calcPresent();
 		if(!opponentCanCaptureKing() && !(presColor == color)) {
 			turns.add(new Turn( turnMoves, turnTLs));
+			currTurn++;
 			turnTLs.clear();
 			turnMoves.clear();
 			color =! color;
@@ -47,8 +44,24 @@ public boolean submitMoves() {
 	}
 	
 	//Set the gamestate to a previous or future turn depending on the int given.
-	public boolean setTurn(int turnNum) {//TODO finish this func
-		
-		return false;
+	public boolean setTurn(int turnNum) {//TODO test this
+		if(turnNum < 0 || turnNum > turns.size()) {
+			return false;
+		}
+		if(currTurn == turnNum) {
+			return true;
+		}
+		if(turnNum > currTurn) {
+			while(currTurn < turnNum) {
+				this.makeTurn(turns.get(currTurn).moves);
+				currTurn++;
+			}
+		}else {
+			while(currTurn > turnNum) {
+				undoTurn(turns.get(currTurn).tls);
+				currTurn--;
+			}
+		}
+		return true;
 	}
 }
diff --git a/src/engine/Turn.java b/src/engine/Turn.java
index e350ba5..970c5f4 100644
--- a/src/engine/Turn.java
+++ b/src/engine/Turn.java
@@ -4,8 +4,8 @@
 
 public class Turn {
 	
-	private Move[] moves;
-	private int[] tls;
+	public Move[] moves;
+	public int[] tls;
 	public int numTL;
 	public boolean color;
 	public int turnNum;
diff --git a/src/fileIO/FENExporter.java b/src/fileIO/FENExporter.java
index 82ce1c0..cd303d7 100644
--- a/src/fileIO/FENExporter.java
+++ b/src/fileIO/FENExporter.java
@@ -1,5 +1,9 @@
 package fileIO;
 
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+
 import engine.Board;
 import engine.GameState;
 import engine.GameStateManager;
@@ -7,6 +11,19 @@
 import engine.Turn;
 
 public class FENExporter {
+	
+	public static void exportString(File saveFile, String export) {
+		try {
+		      FileWriter myWriter = new FileWriter(saveFile);
+		      myWriter.write(export);
+		      myWriter.close();
+		      System.out.println("Successfully wrote to the file.");
+		} catch (IOException e) {
+		      System.out.println("An error occurred while saving file.");
+		      e.printStackTrace();
+		}
+	}
+	
 	public static String GameStateToFEN(GameStateManager game) {
 		String header = "";
 		header +=  game.width + ";" + game.height + ";" + game.tlHandicap + ";" + game.originBoards.length + ";" + game.startminTL + ";";
@@ -21,6 +38,7 @@ public static String GameStateToFEN(GameStateManager game) {
 			origins += '\n';
 		}
 		String moves = "";
+		//if(game.turns != null)
 		for(Turn t: game.turns) {
 			for(Move m : t.getMoves()) {
 				moves += m.rawMoveNotation() + ";";
diff --git a/src/fileIO/FENParser.java b/src/fileIO/FENParser.java
index 79e2183..a1204ef 100644
--- a/src/fileIO/FENParser.java
+++ b/src/fileIO/FENParser.java
@@ -11,6 +11,7 @@
 import engine.Board;
 import engine.CoordFour;
 import engine.GameState;
+import engine.GameStateManager;
 import engine.Move;
 import engine.Timeline;
 
@@ -65,6 +66,55 @@ public static GameState FENtoGSNew(File file) {
 		return game;
 	}
 	
+	public static GameStateManager FENtoGSM(String fileLoc) {
+		File file = new File(fileLoc);
+		return FENtoGSM(file);
+	}
+	
+	public static GameStateManager FENtoGSM(File file) {
+		ArrayList<String> lines = new ArrayList<String>();
+		try {
+			FileReader fr = new FileReader(file);
+			BufferedReader br = new BufferedReader(fr);
+			String line;
+			while ((line = br.readLine()) != null) {
+				lines.add(line);
+			}
+			br.close();
+		} catch (IOException e) {
+			System.out.println("File Cound not be opened for reading: " + file.getAbsolutePath());
+			return null;
+		}
+		if (lines.size() < 2) {
+			return null;
+		}
+		String[] firstLine = lines.get(0).split(";");
+		int width = Integer.parseInt(firstLine[0]);
+		int height = Integer.parseInt(firstLine[1]);
+		boolean evenTimelines = firstLine[2].charAt(0) == '1';
+		int numOrigins = Integer.parseInt(firstLine[3]);
+		int minTL = Integer.parseInt(firstLine[4]);
+		boolean color = firstLine[5].charAt(0) == 'w';
+		Timeline[] origins = new Timeline[numOrigins];
+		for (int i = 1; i <= numOrigins; i++) {
+			String tlString = lines.get(i);
+			origins[i-1] = getTimelineFromString(tlString,i-minTL,width,height);
+		}
+		Move[] moves;
+		if(lines.size() == 1 + numOrigins) {
+			moves = null;
+		}
+		else {
+			String[] movestr = lines.get(lines.size() - 1).split(";");
+			moves = new Move[movestr.length];			
+			for(int i = 0; i < movestr.length; i++) {
+				moves[i] = FENParser.stringToMove(movestr[i]);
+			}
+		}
+		GameStateManager game = new GameStateManager(origins,width,height,evenTimelines,color,minTL,moves);
+		return game;
+	}
+	
 	public static Timeline getTimelineFromString(String Timeline, int layer, int width, int height) {
 		String[] fields = Timeline.split(";");
 		String[] rows = fields[0].split("/");
diff --git a/src/main/Main.java b/src/main/Main.java
index 4ba1e11..70092d9 100644
--- a/src/main/Main.java
+++ b/src/main/Main.java
@@ -1,5 +1,6 @@
 package main;
 
+import test.CoordTester;
 import test.FENExporterTester;
 import test.FENParserTest;
 import test.MoveTester;
@@ -15,8 +16,7 @@
 public class Main extends Application {
 	
 	public static void main(String[] args) {
-		//runTests();
-
+		runTests();
 		launch();
 	}
 
@@ -24,8 +24,9 @@ public static void runTests() {
 		System.out.println("Starting Tests");
 		FENParserTest.testFENFileParser();
 		FENParserTest.testMoveParser();
-		MoveTester.TestBishopMoves();
-		FENExporterTester.testExporter();
+		CoordTester.testAllCoordFourFuncs();
+		//MoveTester.TestBishopMoves();
+		//FENExporterTester.testExporter();
 		System.out.println("Done.");
 	}
 
diff --git a/src/test/CoordTester.java b/src/test/CoordTester.java
new file mode 100644
index 0000000..907d33e
--- /dev/null
+++ b/src/test/CoordTester.java
@@ -0,0 +1,50 @@
+package test;
+
+import engine.CoordFour;
+
+public class CoordTester {
+	
+	public static void testAllCoordFourFuncs() {
+		ArithmaticTest();
+		vecTest();
+	}
+	
+	public static void ArithmaticTest() {
+		System.out.print("    Arithmatic testing:");
+		CoordFour add1 = new CoordFour(2,2,3,4);
+		CoordFour sum = CoordFour.add(add1, add1);
+		testCoord(sum,4,4,6,8);
+		CoordFour add2 = new CoordFour(2,3,7,10);
+		add2.add(add1);
+		testCoord(add2,4,5,10,14);
+		CoordFour sub1 = new CoordFour(4,4,1,0);
+		sub1.sub(new CoordFour(5,5,1,0));
+		testCoord(sub1, -1, -1, 0, 0);
+		assert sub1.getNagonal() == 2;
+		System.out.println(" passed.");
+	}
+	
+	public static void vecTest() {
+		System.out.print("    Flatten Testing:");
+		CoordFour test = new CoordFour(3,9,6,18);
+		test.flatten();
+		testCoord(test,1,3,2,6);
+		CoordFour test2 = new CoordFour(3,9,0,0);
+		test2.flatten();
+		testCoord(test2,1,3,0,0);
+		CoordFour test3 = new CoordFour(-2,-2,0,-4);
+		test3.flatten();
+		testCoord(test3,-1,-1,0,-2);
+		CoordFour test4 = new CoordFour(0,0,0,0);
+		test4.flatten();
+		testCoord(test4,0,0,0,0);
+		System.out.println(" passed.");
+	}
+	
+	public static void testCoord(CoordFour test, int x, int y, int T, int L) {
+		assert test.x == x;
+		assert test.y == y;
+		assert test.T == T;
+		assert test.L == L;
+	}
+}
diff --git a/src/test/FENParserTest.java b/src/test/FENParserTest.java
index 5e777bb..c07a46c 100644
--- a/src/test/FENParserTest.java
+++ b/src/test/FENParserTest.java
@@ -10,7 +10,7 @@
 public class FENParserTest {
 
 	public static void testMoveParser() {
-		System.out.println("Testing Move Parser: ");
+		System.out.println("    Testing Move Parser: ");
 		CoordFour x = FENParser.stringtoCoord("(0,0,0,0)");
 		assert new CoordFour(0,0,0,0).equals(x) : x;
 		x = FENParser.stringtoCoord("(10,5,10,5)");
@@ -21,15 +21,15 @@ public static void testMoveParser() {
 	}
 	
 	public static void testFENFileParser() {
-		System.out.println("Testing Parsing Rookie.FEN.txt:");
-		GameState g = FENParser.FENtoGSNew("res/RookieTactics4.FEN.txt");
+		System.out.print("    Testing Parsing Rookie.FEN.txt:");
+		GameState g = FENParser.FENtoGSNew("res/RookTactics4.FEN.txt");
 		assert g != null : g;
 		assert g.getColor() == false;
 		assert g.minTL == 0;
 		assert g.maxTL == 1;
 		assert g.getTimeline(0).Tend == 2;
 		assert g.getTimeline(1).Tend == 2;
-		System.out.println("    Done.");
+		System.out.println(" passed.");
 	}
 	
 }
diff --git a/test b/test
new file mode 100644
index 0000000..b00e612
--- /dev/null
+++ b/test
@@ -0,0 +1,2 @@
+8;8;0;1;0;w
+rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR;KQkq;-;b0