diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class
index e57c612..17ef4fc 100644
Binary files a/bin/controller/Cashflow.class and b/bin/controller/Cashflow.class differ
diff --git a/bin/model/FinancialStatement.class b/bin/model/FinancialStatement.class
index 3594fa4..959a191 100644
Binary files a/bin/model/FinancialStatement.class and b/bin/model/FinancialStatement.class differ
diff --git a/bin/view/FSWindow.class b/bin/view/FSWindow.class
index a99b9ee..99b261e 100644
Binary files a/bin/view/FSWindow.class and b/bin/view/FSWindow.class differ
diff --git a/src/controller/Cashflow.java b/src/controller/Cashflow.java
index fde4514..631612b 100644
--- a/src/controller/Cashflow.java
+++ b/src/controller/Cashflow.java
@@ -41,6 +41,7 @@ public class Cashflow
 	{
 		while(!isWinner())
 		{
+			
 			// TODO Play method
 			// Get player whose turn it is
 			// Display their financial statement
@@ -51,6 +52,7 @@ public class Cashflow
 			// Call tile's getLandedOn method
 			// Update current/all players' financials
 			// Increment player array (Also needs to wrap like tiles array)
+
 		}
 	}
 	
@@ -76,6 +78,22 @@ public class Cashflow
 		g.movePlayer(p1, 5);
 		System.out.println(p1.getLocation());
 		
+
+		FSWindow  FSWindow = new FSWindow();  
+		FSWindow.prepareGUI(p1);
+		FSWindow.showButtonDemo();
+		
+		
+		// Delay to check how the financial statement updates
+		try {
+			Thread.sleep(10000);
+		} catch (InterruptedException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
+		FSWindow.prepareGUI(p2);
+		
 	}
 	
 	
diff --git a/src/model/FinancialStatement.java b/src/model/FinancialStatement.java
index c3f2d1d..d96f3e5 100644
--- a/src/model/FinancialStatement.java
+++ b/src/model/FinancialStatement.java
@@ -204,10 +204,7 @@ public class FinancialStatement
 	{
 		return _totalIncome;
 	}
-	
-<<<<<<< HEAD
 
-=======
 	//income getters
 	public int getIncome() 
 	{
diff --git a/src/view/FSWindow.java b/src/view/FSWindow.java
index c40270d..054490d 100644
--- a/src/view/FSWindow.java
+++ b/src/view/FSWindow.java
@@ -22,7 +22,7 @@ public class FSWindow {
 //		FSWindow.prepareGUI();
 //		FSWindow.showButtonDemo();
 //	}
-	private void prepareGUI(Player p)
+	public void prepareGUI(Player p)
 	{
 		FinancialStatement currentFS = p.getFinancialStatement();
 		
@@ -103,10 +103,10 @@ public class FSWindow {
 				{"Interest/dividends", "0"},
 				
 				//another table for real estate 
-				{"Real Estate/Business",/**business of user*/},
-				{"Real Estate/Business",/**business of user*/},
-				{"Real Estate/Business",/**business of user*/},
-				{"Real Estate/Business",/**business of user*/},
+				{"Real Estate/Business",""/**business of user*/},
+				{"Real Estate/Business",""/**business of user*/},
+				{"Real Estate/Business",""/**business of user*/},
+				{"Real Estate/Business",""/**business of user*/},
 			};
 		
 		JTable incomeTable = new JTable(income, incomeColumns);
@@ -238,7 +238,8 @@ public class FSWindow {
 	    panel.add(filler);
 	    return panel;
 	}
-	private void showButtonDemo(){
+	
+	public void showButtonDemo(){
 	mainFrame.setVisible(true);  
 	}
 }