From 5b732a0e35e93e80fd61851eef808384cd754e36 Mon Sep 17 00:00:00 2001
From: Sara-Sadiya <Sara-Sadiya@MyPreciousJr>
Date: Fri, 21 Apr 2017 13:08:23 -0400
Subject: [PATCH 1/2] getters added, updated mostof FS Statement

---
 bin/model/FinancialStatement.class | Bin 4692 -> 6352 bytes
 bin/view/CharityWindow$2.class     | Bin 1141 -> 946 bytes
 bin/view/CharityWindow$3.class     | Bin 713 -> 713 bytes
 bin/view/CharityWindow.class       | Bin 2612 -> 2505 bytes
 bin/view/FSWindow.class            | Bin 1607 -> 7552 bytes
 src/model/FinancialStatement.java  | 107 ++++++++++++++++++++++++++---
 src/view/CharityWindow.java        |   6 +-
 src/view/FSWindow.java             |  73 +++++++++++---------
 8 files changed, 137 insertions(+), 49 deletions(-)

diff --git a/bin/model/FinancialStatement.class b/bin/model/FinancialStatement.class
index 14738b8d04baece62bfdb60049dcdbc7bd83cc01..959a1912e1cd9fdf4e1cff94aefa0a48e90b227a 100644
GIT binary patch
delta 1384
zcmZwF&ubGw6bJA(1=}?BN3v9V=s`iD#eyXuB32JIv{p#98u8-A?Pkm_-R#KjmKqeI
z2gQ>pIr!sm@Ss#YhzMRi2?`!OdGO$&+N#mk+UnbvlD3a`+01<RGjC@m@BO~Fx%8XW
z7q0-|pn|9A`P5)%S;r>>$5ga}Z8$zV;@FWp>YEt_T{s`Pa#;tFjuh;|+1R}&-L-BU
z6dl(XzhLZO!md_y5G%-HoVUYGSwi!nE_unDQj2CVJ{`L{T(53nG@--1>-nX%RKa!(
zPfb@S40WI&*==n&igb({O5vm!8)vEs3!Xjc`CjZLo85u$#_&+%CXCB=84s6ybKC^6
z>sO1mZ->=pbk4-Kzj+&LDv$SYiS8j?G}ED@M?D|w^vtF@Ev5Qqd(({$HCNACJFVPf
zywNtekI!~c_<UDi&K~Xg01t4ym69#+5FX)7!PjI-{}5mDQN-T}ALICwh=&Ou=lHXT
z=Lw(S_=|`a2p2e>6Y+P#XE<IE@eji1Ic|vfC*cbmFNwH8_#($EBK}2ql3}Gp{F`uz
z;|>wK39fk@cZqlr4r7N5V4obpeo8tiv;P@PJ%^XgpVuz0li5%w)9SIMR-HktqM*LV
zYVQyE+TIOo*ZcDioo<HX-6Fn9_!`H1MSPv`4UYRne3S4kjt4}%O!zj(IT8OQe23#h
UB3?=Gfx8?JiFg(Nur~PjA5}v9mjD0&

delta 49
zcmca$ctwTl)W2Q(7#J8#7~XH>`oOVSmrH?>QE;;#_gD7G4Z`Y-mnMG{5@ml2RKdjX
F4gk@-5bgi~

diff --git a/bin/view/CharityWindow$2.class b/bin/view/CharityWindow$2.class
index 2dee356c24fde4658c8057aa0c1d5c0e2e6ef6d8..b3d08afa43958a38ad45b53e6b20ac8229b21366 100644
GIT binary patch
delta 235
zcmey$v5B4Q)W2Q(7#J8#7|b_vZDAA>$Vx0r)Xz!GOV<ysEG|jS<zdiZ(40J<X|6Oo
zgE1q6P+4YbxxRBoVo_#EWq4*@N`5&HgXv^@=I;731||k(pi#mi4B|T&B$qRA`08w9
zkZ0b(pt6yH5h%gNz{#KhR3Zpui!rbQNe7^qBLf$MGXo!kD}xY&8xS*q)c}nFLJ=Sj
z#L{BW2AaUdz`~%zpbNA{4=Bpcz~sr!puhq&P#?%;l3_4lFa$DK7>t0vF$1!=fO<go
G0s#PDsv}bX

delta 431
zcmZXPJ5Rz;7>3_dh^<Xyv|@}7QWA`SXi@Q6Z%Cqn;H1$w9%!RAl_s>@CN>w{n4O(5
zgb)XRfU|$a)%ex8afa{ue$SipCVoru=g<2GfGqMoxz9Rk!?v1w{*KpdzkO|2O}D8a
zfh2>(D;3N0;u(fiqBJTqlBIjz;4R&2+SOaVSmI^NF(fQAES<TosTJLFOuKRGn(0=#
zZ<!i*9IfrvYnsO!bmGNilvkjOSY=R0Sqd^(V-P*dzqDFD!%X7OQFl1`UHCO(7|AOc
z8`u<)Wta>Y|J%0bTMr7hu-*M)FChiF?z8aJd4zxveLot(>=1LWkj~QsL{ohzL&Vk8
z0O`;W>pd_MjbR)b$)~8Erw%x#n1hTwCU8o#0v1q&N}E7OSWF{AIjDB9OB5Ml?7<-0
geVV342n7*ZnA8W<3pm6P<uDeBeL|H?H-R_3U-UX$XaE2J

diff --git a/bin/view/CharityWindow$3.class b/bin/view/CharityWindow$3.class
index 275ba13ce904975e13e8e3f8279e3d691567c848..ee0ab41f162d83a335d79d9d7e195f776a1d016e 100644
GIT binary patch
delta 23
ecmX@fdXja6I}@YlWDh1ARv!iy2H(k@Ob!5100sE~

delta 23
ecmX@fdXja6I}@YtWDh1A)&K?;hQP_4Ob!51bOr?g

diff --git a/bin/view/CharityWindow.class b/bin/view/CharityWindow.class
index b5cac5e674f3ba57d68243dda7e68605a022a77c..20005582253f8ad23e4b023f95fa3a62e72a841b 100644
GIT binary patch
delta 69
zcmdlYa#EP<)W2Q(7#J8#80K!|N@JV6f-Q=XWivDTTqZ$J24@C;1|Nn%hERrJhFFG>
Z$s0M<co>)%W&zbRG0bL|Gg*vF4gj}}5b6K`

delta 175
zcmX>pyhViT)W2Q(7#J8#80K%}N@FwQNK8&nEiP6uU}VtJ@F~koE!TI>NG!@MsSMA|
zOUW;{*7V6rEK97=FD}o_OV{`ENlZ%3v7VgA7Q@K8`83;HCP7~YXNF(~ABIpM3}=XC
zh?rc-sb(+0!7z(qHUlFAAJ8&YAk7G*S+%w>q-_8)m>5KWBpX<ei$N4D0ur4AX3b@o
JH+eOu8~{9aC~W`$

diff --git a/bin/view/FSWindow.class b/bin/view/FSWindow.class
index 701d99f6eceda0ee81472fb47c864b2c34df3e0d..a99b9ee9acd71012a523a6c3c5cd9e721aeb7fc5 100644
GIT binary patch
literal 7552
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
Y75)W9&R53C1#%&u5q@x~=9B;a4=9qm&;S4c

literal 1607
zcmaJ>+j1L45IrNUEo&p^;#>?)AR7~4rN~hrhCm!b5+`yTl#nVpP8ps?(pZ{gcSkil
zvMh=Z;FUjtD$1(DRq)P#gj*GS0!7bi6JJpAGOOw7KHcYZw|@EO$DaT!;<Fqw4AWau
z^eff+QyH~XKL>~5_%pu6D*=z%mCqZ`MAI<jLoTDL=AmFXRkQEgmAEg-<3VCwVmQ(f
zyd`vvH$?Csr^ITVV#7@@PMr!(6&bC9$2=MnlUONc@`jA0xyg|Ai|Y)|vT6wzSsX8*
zfN6$fH5rLVy|5wl8gB$t;Y>|6d9cp4wD;8Ln2wCC_W{C$?^tdOXZ$Y{Vk6>pqlw*8
zaXp9EC}>ZSds-_!g*k?=pF~>3D%cV&uc^YW47iah^1514*6_OL=GQvH3x(;Z7Fk7?
zYq9cV)qfoDfzU-yMxG%DGw2HMWdl4Jdyz68?{)*(wB>u7N+*6?w|k+8OzinZ*TpQ(
zSpnW)IPH%soWb48$#BB2g(O^18D%GCQ@FtJ?f;XAEsOdfGJM+;mbpg+je0I3Z@$^n
zn#!rx=gS@e3qw>$;?eT~?rmY}Jm7lZ6Y1FNMJ=&OJ!`$9mPjy?+@+BW`E#)*woN)0
z{y2Uk%DitX%cQ-EsFI}|-lpasn9c;k#YMbp#qz1!{uj2XrNfTNNV+KEoIMr_xQq%7
zMJ&vHrR7&Ns64nG$aZ8~U}07*%zF$cli9F^tZ3P)@qy|Y7guoACR}8g@K?#zmhfQ#
z*YFW76M>HW7|y2LZ2ZXfkVm{NG&RV^TrXe=H)!^GtHn^-=e<X}I8F;H(U6388TN)Z
zooXtoJ6gHPO&J72GaQXOs(+_vjEe4xQ02j}T)+e-UEIS;4%NeYC2L>6eXFTUgw|y&
zljU>ks;8TxD(xmtzntsKwg_Ax*ew0|ILKIR`jtTrQ^_}<eq9`)`viH?cGG#3Zdd8c
zthF@6vF{W26Lh*14$KhTDLO#`i4#uJ9mwM}&ZGb(N^9TTUCeIGygtO)pXru?MVU-q
zW)lR9m%*DjpT;dxoVAVOyfJZ&eVN@fvx9lOl_GpYR2)Jm@8aS{c8GT#?xMJHX^2aY
z7P31ill{tu;|%fs4n8O^?BL_4<?oUzY;ALiNH2)XuaxIETKeB<DE>eRe<pcLBkVLU
zWx*%7NtyGM|5Fk&Ltb;ZMbcUxw_gc*jc!(teCY?=advR`u&94g$lv>@<<k@lt4VPW
F{sq4Bd3yi=

diff --git a/src/model/FinancialStatement.java b/src/model/FinancialStatement.java
index b09e122..8b08f21 100644
--- a/src/model/FinancialStatement.java
+++ b/src/model/FinancialStatement.java
@@ -205,27 +205,114 @@ public class FinancialStatement
 		return _totalIncome;
 	}
 	
-	public int getSalary()
+	//income getters
+	public int getIncome() 
+	{
+		return _income;
+	}
+	public int getSalary() 
 	{
 		return _salary;
 	}
+	public int getREcashFlow()
+	{
+		return _REcashFlow;
+	} 
 	
-	public int getSalary()
+	//expense getters
+	public int getExpenses()
 	{
-		return _salary;
+		return _expenses;
+	}
+	public int getTaxes()
+	{
+		return _taxes;
+	}
+	public int getHomeMortgagePayment()
+	{
+		return _homeMortgagePayment;
+	}
+	public int getSchoolLoanPayment()
+	{
+		return _schoolLoanPayment;
+	}
+	public int getCarLoanPayment()
+	{
+		return _carLoanPayment;
+	}
+	public int getCreditCardPayment()
+	{
+		return _creditCardPayment;
+	}
+	public int getOtherExpenses()
+	{
+		return _otherExpenses;
+	}
+	public int getPerChildExpense()
+	{
+		return _perChildExpense;
+	}
+	public int getNumChildren()
+	{
+		return _numChildren;
 	}
 	
-	public int getSalary()
+	//assets getters
+	public int getAssets()
 	{
-		return _salary;
-	} 
-	public int getSalary()
+		return _assets;
+	}
+	public int getSavings()
 	{
-		return _salary;
+		return _savings;
 	}
-	public int getSalary()
+	
+	public int getStock()
 	{
-		return _salary;
+		return _stock.getNumShares() * _stock.getSharePrice();
+	}
+	//for realestate,maybe
+//	public int get()
+//	{
+//		return _;
+//	}
+	
+	//liabilities getters
+	public int getLiabilities()
+	{
+		return _liabilities;
+	}
+	public int getHomeMortgage()
+	{
+		return _homeMortgage;
+	}
+	public int getSchoolLoans()
+	{
+		return _schoolLoans;
+	}
+	public int getCarLoans()
+	{
+		return _carLoans;
+	}
+	public int getCreditCardDebt()
+	{
+		return _creditCardDebt;
+	}
+	
+	//additonal cash flow getters
+	public int getMonthlySalary()
+	{
+		return _monthlySalary;
+	}
+
+	public int getTotalExpenses()
+	{
+		return _totalExpenses;
+	}
+
+	public int getMonthlyCashflow() {
+		// TODO Auto-generated method stub
+		return _monthlyCashFlow;
 	}
 	
 }
diff --git a/src/view/CharityWindow.java b/src/view/CharityWindow.java
index 99f61e2..24acc1d 100644
--- a/src/view/CharityWindow.java
+++ b/src/view/CharityWindow.java
@@ -59,17 +59,13 @@ public class CharityWindow {
 
       Donate.addActionListener(new ActionListener() {
          public void actionPerformed(ActionEvent e) {
-        	 //put message that they donated xx dollars after 10 seconds, close window        	     	
+        	 //update cashbalance for player        	     	
 			try {
 				Thread.sleep(1000);
 			} catch (InterruptedException e1) {
 				// TODO Auto-generated catch block
 				e1.printStackTrace();
 			}
-			
-        	statusLabel.setText("Good Job! You donated all your savings!");
-        	 
-        	 
         	 System.exit(0);
          }          
       });
diff --git a/src/view/FSWindow.java b/src/view/FSWindow.java
index 9585627..c40270d 100644
--- a/src/view/FSWindow.java
+++ b/src/view/FSWindow.java
@@ -3,7 +3,6 @@ import java.awt.*;
 import java.awt.Window;
 import java.awt.event.*;
 import javax.swing.*;
-
 import model.*;
 import controller.*;
 
@@ -18,11 +17,11 @@ public class FSWindow {
 	public FSWindow(){
 		
 	}
-	public static void main(String[] args){
-		FSWindow  FSWindow = new FSWindow();  
-		FSWindow.prepareGUI();
-		FSWindow.showButtonDemo();
-	}
+//	public static void main(String[] args){
+//		FSWindow  FSWindow = new FSWindow();  
+//		FSWindow.prepareGUI();
+//		FSWindow.showButtonDemo();
+//	}
 	private void prepareGUI(Player p)
 	{
 		FinancialStatement currentFS = p.getFinancialStatement();
@@ -38,7 +37,8 @@ public class FSWindow {
 		mainTab.setLayout(new BoxLayout(mainTab, BoxLayout.Y_AXIS));
 
 		JLabel salary = new JLabel();
-		//set salary to salary variable here
+		JTextField salarynum = new JTextField(currentFS.getSalary());
+		salary.add(salarynum);
 		mainTab.add(salary);
 		
 		JLabel plusSymbol = new JLabel("+");
@@ -47,7 +47,8 @@ public class FSWindow {
 		mainTab.add(plusSymbol);
 		
 		JLabel passiveincome = new JLabel();
-		//set passiveincome to passiveincome variable here
+		JTextField pIncome = new JTextField(currentFS.getREcashFlow());
+		passiveincome.add(pIncome);
 		JLabel passiveMes = new JLabel("Cash Flow from Interest/Dividends and Real Estate/Business");
 		passiveincome.setFont(new Font("Verdana",1,35));
 		passiveincome.setAlignmentX(Component.CENTER_ALIGNMENT);
@@ -62,7 +63,8 @@ public class FSWindow {
 		mainTab.add(equalSymbol);
 		
 		JLabel totalincome = new JLabel();
-		//set totalincome to totalincome variable here
+		JTextField tincomenum = new JTextField(currentFS.getTotalIncome());
+		totalincome.add(tincomenum);
 		totalincome.setFont(new Font("Verdana",1,35));
 		totalincome.setAlignmentX(Component.CENTER_ALIGNMENT);
 		mainTab.add(totalincome);
@@ -73,7 +75,8 @@ public class FSWindow {
 		mainTab.add(minusSymbol);
 		
 		JLabel totalexpense = new JLabel();
-		//set totalexpense to totalexpense variable here
+		JTextField texpensenum = new JTextField(currentFS.getTotalExpenses());
+		totalincome.add(texpensenum);
 		totalincome.setFont(new Font("Verdana",1,35));
 		totalincome.setAlignmentX(Component.CENTER_ALIGNMENT);
 		mainTab.add(totalexpense);
@@ -84,7 +87,8 @@ public class FSWindow {
 		mainTab.add(equalSymbol2);
 		
 		JLabel cashflow = new JLabel();
-		//set cashflow to cashflow variable here
+		JTextField cashflownum = new JTextField(currentFS.getMonthlyCashflow());
+		cashflow.add(cashflownum);
 		totalincome.setFont(new Font("Verdana",1,35));
 		totalincome.setAlignmentX(Component.CENTER_ALIGNMENT);
 		mainTab.add(cashflow);
@@ -95,12 +99,14 @@ public class FSWindow {
 		String[] incomeColumns = {"Description", "CashFlow"};
 		Object[][] income = {
 				{"Description", "CashFlow"},
-				{"Salary","" currentFS.getSalary()},
-				{"Interest/dividends", ""/**call interest 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*/},
+				{"Salary",currentFS.getMonthlySalary()},
+				{"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*/},
 			};
 		
 		JTable incomeTable = new JTable(income, incomeColumns);
@@ -111,15 +117,13 @@ public class FSWindow {
 		String[] expenseColumns = {"Description", "CashFlow"};
 		Object[][] expense = {
 				{"Description", "CashFlow"},
-				{"Taxes",""/**user variable*/},
-				{"Home Mortgage Payment", ""/**user variable**/},
-				{"School Loan Payment",""/**user variable**/},
-				{"Car Loan Payment",""/**user variable**/},
-				{"Credit Card Payment",""/**user variable**/},
-				{"Other Expenses",""/**user variable**/},
-				{"Bank Loan Payment",""/**user variable**/},
-				{"Per Child Expense",""/**user variable**/},
-
+				{"Taxes", currentFS.getTaxes()},
+				{"Home Mortgage Payment", currentFS.getHomeMortgagePayment()},
+				{"School Loan Payment",currentFS.getSchoolLoanPayment()},
+				{"Car Loan Payment",currentFS.getCarLoanPayment()},
+				{"Credit Card Payment",currentFS.getCreditCardPayment()},
+				{"Other Expenses", currentFS.getOtherExpenses()},
+				{"Per Child Expense",currentFS.getPerChildExpense()*currentFS.getNumChildren()},
 			};
 		
 		JTable expenseTable = new JTable(expense, expenseColumns);
@@ -127,12 +131,14 @@ public class FSWindow {
 		tabbedPane.addTab("Expenses", expenseTable);
 		tabbedPane.setMnemonicAt(2, KeyEvent.VK_3);
 
+//		private ArrayList<OwnedRealEstate> _realEstate;
+		//find how to keep adding rows from array
 		String[] assetColumns = {"Description", "CashFlow"};
 		Object[][] asset = {
 				{"Description", "CashFlow"},
-				{"Savings",""/**user variable*/},
-				{"Precious Metals", ""/**user variable**/},
-				{"Stocks",""/**user variable**/}, //total stocks number and total money
+				{"Savings",currentFS.getSavings()},
+				{"Precious Metals", "0"},
+				{"Stocks",currentFS.getStockValue()}, //total stocks number and total money
 			};
 		
 		JTable assetTable = new JTable(asset, assetColumns );
@@ -158,11 +164,10 @@ public class FSWindow {
 		String[] liabiltiesColumns = {"Description", "Liabilities"};
 		Object[][] liabilties = {
 				{"Description", "Liabilities"},
-				{"Home Mortgage",""/**user variable*/},
-				{"School Loans", ""/**user variable**/},
-				{"Car Loans",""/**user variable**/, ""/**user variable**/}, 
-				{"Credit Card Debt", ""/**user variable**/},
-				{"Bank Loans", ""/**user variable**/},
+				{"Home Mortgage",currentFS.getHomeMortgage()},
+				{"School Loans", currentFS.getSchoolLoans()},
+				{"Car Loans",currentFS.getCarLoans()}, 
+				{"Credit Card Debt", currentFS.getCreditCardDebt()},
 			};
 		
 		JTable liabiltiesTable = new JTable(liabilties, liabiltiesColumns );

From 2c74087147f2fa8211e2f729e3179ee7aa596b37 Mon Sep 17 00:00:00 2001
From: Joe Hill <hillj1895@yahoo.com>
Date: Fri, 21 Apr 2017 13:08:58 -0400
Subject: [PATCH 2/2] Just trying to pull..... AGAIN

---
 bin/controller/Cashflow.class          | Bin 2328 -> 2286 bytes
 bin/model/DoodadTile.class             | Bin 1096 -> 1245 bytes
 bin/model/DownsizeTile.class           | Bin 545 -> 853 bytes
 bin/model/FinancialStatement.class     | Bin 4692 -> 4631 bytes
 bin/model/GameBoard.class              | Bin 3916 -> 3805 bytes
 bin/model/Tile.class                   | Bin 1243 -> 1263 bytes
 bin/model/TileCircularLinkedList.class | Bin 2549 -> 2545 bytes
 bin/view/CharityWindow$2.class         | Bin 1141 -> 1130 bytes
 bin/view/DoodadCardWindow$1.class      | Bin 710 -> 964 bytes
 bin/view/DoodadCardWindow$2.class      | Bin 964 -> 0 bytes
 bin/view/DoodadCardWindow.class        | Bin 2378 -> 1770 bytes
 bin/view/DownSizeWindow.class          | Bin 2194 -> 2194 bytes
 src/controller/Cashflow.java           |   9 ++++++---
 src/model/DoodadTile.java              |   6 ++++++
 src/model/DownsizeTile.java            |   8 ++++++++
 src/model/FinancialStatement.java      |  23 +----------------------
 src/model/GameBoard.java               |  17 +++++++++--------
 src/model/Stock.java                   |   1 +
 src/model/Tile.java                    |   1 +
 src/model/TileCircularLinkedList.java  |   4 ++--
 src/view/CharityWindow.java            |   4 ++--
 src/view/DoodadCardWindow.java         |   4 ++--
 src/view/DownSizeWindow.java           |   2 +-
 23 files changed, 39 insertions(+), 40 deletions(-)
 delete mode 100644 bin/view/DoodadCardWindow$2.class

diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class
index 13f0cc3c64fc98e214ad65a393f3679342b7193b..e57c612d6a538afdf0ea50ce975543e4715354f6 100644
GIT binary patch
delta 1075
zcmZXS%Wo4`6vlsdX54Xx2}v!5&=M#w2|FZ&1V{lB2v8oAI2bS_7zkt%53Yk9n`B5E
z`baAwv4Kr3A-1g8zygpah=_-}L_+GSe@6cV=$Ro>jVg`KoO@p1cfNZcB>wr*diUYw
zYhX9OJ+&UIb0*!2mP)nYm3vOO74JyZoh?{&(PPuZPDLVlDf20Py6i4^v+2}m6MgJ9
z*`;WmcIVxmvO81k$t}$JUd3h){q?`q=FNL;_OV~Fs_6Nd>Xhr3sxt~bnQ|-+aL{C+
z{$5)<euzPZS(`1*_+`l(NhdWL!XL3Y%6AH@Ql0lcA%|Q(r{bg>g;whgO`k#)6-~Z3
z=O2|F=1hj_XY}^<4$T%0BQ~c(KBn-=m2P<^rxoq>O-B1hi?fIjxzG3Ug;UYyJfrnL
z^{stbE`*BY6>Z5(!`e}qh!W?L(AY1-vW(kY;p!hoddR`GnPf^f7u>MdNi}q5C#StB
zKW*Ygn}(MVa<?cT(BD&1#HH_C$uHNRXkQ=Ba^0pJh5c$Sf)3T3u{lIO+_GkKgIPhV
zRcngX$<&Hq;nZ{-|M?put1aH=3v_t|gUf8mFR^`i<)2xmD<69$LA^7VH@4@N*fH{q
z-p+t;1JYfc@qoi){{^1P42{)dH(-iANnALzGQ?Jf*+E8L!-!DJ(jwW7f*EHo#}-M+
zv6Y=17f(rX2PcG*Ci<SllE^AhcQGUeZ<ld|<nXYt$Q;lI9?{!jOdJ#z%VhKGUvOrL
zvBbrI%bgto6K^R5T$5A4bU@{{raIO={P>qNS4To~>KR_tnV6HluEyGxkx`<%F`@Sx
zkJ!^@7!&=mm7=y-BXFDXf8_dL{Hw+DvhgU*jFBME8ZI&*{xQZyqbs6|E0;XU?{eRF
zxW+w-1meHpdZgG{>5lV)o6L(4%{=D^eiV6H=x0GZO(t&RmUz0%o98EfmRMGvz%SzI
s+#Vzy6&f-+6&1$#Mn-MG_&~zMQL6i++(ImLO$zcU=oN@xrAlM*UoZmh+5i9m

delta 1156
zcmZ{j-E$LV6vlt=?v_oLZHpO#9Vyy@GB!wwRVmm&g%<ijOH)Y=mLha*mbhh`)MTj^
zl?Zgk8<}AyH{5!~jW@u|mZ5`k=ZxO?m-r`uXOoV^ubIrr`=0Zh=RD_}cmH_hUflZi
z`IDc3_qhGQ`cZYa(nreVkYdM@v+AULr&vg3*D8U#Z1Xn#HA~xDeb*NJVMU_g2BTil
zDK2`BpA8%Vxy3-y)tj7JF6CW6_3vof;t21X994AwAI4^ow4zPuXUe53Zl&Utii(|E
zv^hWZ(k*<)`M_jI6gT)@#%xY-Qeg_uw6p9s7@FD&%3iS`1S6a_IaQn1I(LjRCJ8GN
z2z)7-sNL0fR&yp3ijD^Tm@o~OoO0e`oJpHjrWEns`K^v;d}qxqr;|B_Dkxe5w-Ss9
zx?(aTxCY0tS2*R?N49v?B12nbvNp4P)R3F?u8Ul~H#uQ)eo*o1KUEK3^ZdM9wwPny
z<ig+ARqxB@BA?U_={>LIxE#qGi{U7=!ETEji#B=O+Pa>OWhmHuhFAMV@4k3dVKp>H
zqAiw?y%(b?#$<}KUf{b?`ijlxb!Sk@)~iJgRBQsSiR_iqilY6mM-VZkV|?)_Z)CKp
zi;gBQZvQ6x<~De1@*xKgguD|n5OOSJc$4ut{VDr4I5YJ?fEw*$;}~Mci7`PZXXs&y
z4)N@gc#J*tl9XEyinDAJ+sZVS{BH;Kz2t6_=(9~SRjK*mq!c`NOh0~~{w`x-NEB?6
zo7?l4k2km!UkLg1Kv&3>XDo&IatkSmuysv!?f&7#?~+_T8=2{?#Q3VD9c+d+2l|==
zdUe3K&*6k&EDW@4p%N|4g%ieqR5nz?kkY?J^U&+_7^-)FPI}MMCJ!erTiL~V`50z7
z%>|jzysYGsEcP-tarll!?#Rxop<I3zcQm{xJ;r0cWKC{uJmNZE$<R6&;A=T)Lir}&
z$VnH%Rc=rfUq*KSt(<h$N!M|PP$%oS7Tyr1*D;<GH_0f~_kvMcqNB-@{Mr@tONpBT
H)425~GjS1j

diff --git a/bin/model/DoodadTile.class b/bin/model/DoodadTile.class
index 7e73a9ee213d4ceedac6e8d7ab819d5248680565..d47f2298bf57a3e701af358539ffd73e788f662d 100644
GIT binary patch
delta 517
zcmZvX!A=uV6o$V$?J#ASVo?VHMT{ntLR$*0RS~LAD~hOzA;GwuFgMbqok?JzOBOyt
z-@ur-#>JRuV%(S*-@&bqp`O}}G3F*G`A`1;JOBNf`95lY`}yG$P-FYl{;W<c78LGr
zTlbb*Q55(=(?1BFx5FUn+2lDh7)uUCa*FZ8{ix?1#c>q2bT_goQ?Xc9<hoIyJAVNj
zR#;VJUg~()?;L4GYN4=Y%hkHYb;Z;$u-UGJez@26J3Fx->#h!ChZ}?BxFnnY;lAg0
z#GnVsTMld7?l+9NOpOhPh6ru!E$061t+?>`zaQ#<F<y<1F@i&mZ2wuRdh!E9G<Zu1
zvrpbJk#OzlNAfS;Q&>w+rxO-S38lJOOsKl%8?r^$j1z9YWn#E`O{SPiSU(j?igPl{
zjLAHUDayf>H^~fBTw$657pZWGDzmIJcfdX7IWP9cu*M&=NIdRv7bTDl@pw|xp-z*Q
r9C0aepH0$&yvhTCn>>`v48|`Zk60*+%N8|@vPE7&R!CdoFnIJEKv`tc

delta 345
zcmXAl%`O806otQ;DbtRr^hYa55mH*6{!r?_XjxdWw4Zb)EJ_n<VZ}Sl3y4UpYcWYJ
z#8SM2S83eQ+~g+r+;h)4xxbO`u<<ka_ypEz_KYuO+aSk^PF^8)-ErJ@`MA?@Y^Q18
zIwl1yh47`@y|CN&u7Z}!pBj{?=#;&>nweb<2;)L%+ILqCyKUdJ+<;Iu#bCpGQ0KxW
zHchr<cvf3pMSF@w7{wsQnAg{;k9|}|f;<JE%-K6}pT+Z{&vGqf`4m&3SE5!b)b&|=
zBR+&)2wR#@ttWRHN$E>Oq{l=lj!8l)$qXqLNRwq!5=~KMo{7L|=qKAWocsgZ?4Sr-
mW|ut)WXe<asf&0*Bo3G+#Gx>wr~|S(C7qlSm6Ia@RT_WK;WoYi

diff --git a/bin/model/DownsizeTile.class b/bin/model/DownsizeTile.class
index 058fe38505312d624c853def13952f1feca4ea79..e6ada5c6f6e19e92954b78fafd37025ef9c8aefb 100644
GIT binary patch
delta 416
zcmZutyG{a85IvXI;<^%4FfP8<7lNQGf)$-1vC)Kt!f53tdxLA>Ub9@-VB<&d1vd6r
zV4{g1VDIl32dGSFCNt+`&N(wLk)N3U{rm9+pn|iZo@dV*))<z19uMrA3`E0w;@6&V
zWuPO24Fge_<8I4<1(PAsxtGCtS1BoKye;RjgFOwq49N$l=h!VrH0?&eqj=lEKC%p9
z*;Neb%L(mCyY72JHI&btb~TRN9Ydzxa{Ao2XxHVgC51)qqC-Jk9fv4tC{V%~`v#71
z%%DAvC0l}Aa#NdW3Po_UIw&zSoA`g)IM0lW2N&!%8b=KJ;FXpACPE0)r_90#sZV5X
z-m!jF9AWbf+e-%{<cCCtpi^C;HvtJmkc5Fnswu1@jd?<?sR-c<G?5%^oPbT{5>82h
Jp-gxPl|MnPUKs!Y

delta 127
zcmcc0wvdJE)W2Q(7#J8#800o`X)=m1GB6e}GVuB2=BK3Q=m+E^R;CtB4rGdAWn*At
z;F!FD$=Jh|fsug;sD)K~8-vJ3AcKj43rKQ-1$h`)7<d`DfqXHDA_g8H9|Tw#q!^@u
NS{WH+fIKD!Spa5o5rF^z

diff --git a/bin/model/FinancialStatement.class b/bin/model/FinancialStatement.class
index 14738b8d04baece62bfdb60049dcdbc7bd83cc01..dfb60c0484945c06eb3c494806ff0d0d0ad9b8c0 100644
GIT binary patch
delta 18
ZcmcbjGF@eZ6c?kwW@)ak?2~<k*a11G1!e#M

delta 59
zcmbQPaz$l>6c?l5W@)ak>>B0_77UCG+6)W~`aqfyNV95fVX#~SWH2#I2a;@H!Ap~W
H3(5chO_2&$

diff --git a/bin/model/GameBoard.class b/bin/model/GameBoard.class
index d75668dcfffefa4bf642f9d96fed7e7cce8801f9..41e8300849d5eb196820a711dd1b1dcf66b8f65d 100644
GIT binary patch
delta 1145
zcmZvad2Ccw6vltIGxOeba<L7j!eD{1fSGoplb8mR8A02SXiZfTh)JV~c{(r6nCVP2
zyb=k<F-l|8e_UQwK&_%^t5&wsSET~(RzQpUin#Cl7Gn(cycvSH{Bz$q@0{~}-}&x6
zFz?XZ$i5@H_5jWNwmmWwtc}piM$H}EsR(r1j(drbFb28D<ZgG$IJIdL_bN;&EVCR-
zaYDSYy{nM1bIFz2oSjyLviXdCl|r?-)1ifPhIz>3L4~d~EzenN?4ssjM%*RF?D{R5
zt*lp6+c~?-&O0qmgnqVbb};I0HWq~k8Pj--yT2RF;eH;|>|(<0Fc-|*&0do|irOo!
z)mAcR<vWuroMJZLsd<7Y-HqlcrD~q$S(9h}*|cVrV|Qtu<9XSz(BmlT+RGT(LUOqP
zI09o^U1^gS6tn(~-rAGRW$a>@{far2bz<37G0TZLVn8h4({;IBOvNHhQhHI7;3dJ2
zR|t+1nQpw;-}Ip7WkwV;#L(7)Rm`;c?)k&7YF^`Yg<*Af+xd*5KHk>&ADE+R(*DGo
znzxuxgq=dgh%+O+!+R$0Do*^L1vQ6!ab~x_b1olYn8TV6_|QFUMvad(pD;Rl#M~c<
ztJ#F8l1Fl|X`E}CCb+g^oa@H8Ucz1pZy2MmX(xT|YCYu6(DBkFr!mFpTrD#vRVHy6
zkW4VRmD`X9!tJb=bD{h@M|ymG?W3IRvBBf6ZIV~9R!&2@;EdzY^f5HeeQYkH-OmFR
zG*v8#+-eyaNO%k_^)crPW-53zdL$K!hNQGDu-FJJHiu}520eDB!qKqsdOSKa<?;9i
zjCF?E!BZ1VcFf#2&H=wm%2OV%c)a29b~Ky{t}|7gS-)v|Z@C)W&2UGclvv?$Q{wOb
z_sgMBepF|Sh_FC;uU2X$PKnqwHJnA1CCq0j4V+D!7Lv3|v`o(PxQz3;Lb4p~;=={>
zaUnNzQQ4DAE6X19WT3>Sd{#DXfX~IADxtWMFC+>GQ7>Qe6+xj}%hyDt)<BVOq-wB;
zbNN;xQ^=e7PWr-pFCrTVOpB(li82{hatxaEE4i0HiAwSZ3xw|nek@<XEj9DiN;g(h
VH|r;vt>R~Xk#9t5gTnqR>Mz@LFgO4J

delta 1230
zcmZvaYfKzv6o#LV-I-aIu{AZcZV?O=5-vqrgZu!YLcN4YFJ`f3t*M!o2~vl}EL$tl
zWc|@5hG=3kUW%7$)k@W>Kw(;_)RszBTCeqPtJeEntN)C#p4p{@7&FP4^UZnR_nh;7
zb29%}L3rw)u>(Lge-4KGgDHcD6z6TUZndg5B|Ds|#zeyEY3b-rhUp^}=20Fq*seJD
zKag&d$JwFKt!^K!C@EdrlEyezyuE7G`i=I6WL;V2Q(D=F)%mJVnmol$pW4=zYIGb$
zq;wW;d6(k|x1%dwS9ZOR?>E`SGm1dFEq!uJo2ON0H<D_6Q>Q{TD?+k|of#^3mhQ}E
zb&Bk>kkv~S=d5k%>}s=}s#f7iaehnJ2FqDvB|5D2j@{aGi{0ucibemYcIj+#L!H~C
z6)zlNuYsp9GrFrCtH(~5>|@luQ#)VZ?=SR{dni~@u$2QQFSAWXvK_nAjwc(%`Cbm0
zOmNs8)=IJ`dDY;EqR>696>280@w$6Ts}4<a)Z`d%xOrM$*yp@u@;2|d`TC-Q<GgS1
z-q~AA8x>6^I^yjnAMl~OPA^>UGd?!?gi&!ooNel|5^c@#Hv6_PBb+cf$!Ch3ZaeAQ
z;a`U$DBiE}iC>tU;_#m1#?e5Sd(g;|U+M~XS585mF-~tRFhpfE7965F8q<cTiN^FH
z>RrbyYpkb|%eja<gfTzE!{t6Xi30cY0CI~w$To?^pq3Dn2PXE@7u(CjE8HVF{i&6U
zEBEn;#}n5r&hvQsAiV>E32?i_h3FEO5Mn8FxtJH_Js>~)D3_$WmS^;4x=!#c&q=os
zW9;U6nQ4G|ydb=QWMIzJ2BoGLVoz#%xNBtfY=La9@EC3=ALg!nkFna|bT(eAMKmcL
z4Akg>8l#`$NYLYz+E66qG3D{*yjqWU`_Q-ODiW#<ZZTA@alwu=Cw$mcaGa4?pd#vV
zZ$<ip$44HY`e|xPR6ozvcT4Zg(hagI)XO}6wu}guaUqQq(L|{jUM1!(<0?5dbEU*p
zT+NNNa5F1NvNCPV4VhhLjM>bWd?lO8etaz!Wr=!%ZzQt<(&Q$-<vZ~*!aBYuEX5+O
z<p(M2lu*u(k{Qx?0Y3>Y#LpsBMBt3f6EaW+BTB-gL9db?e-n|zU&2-V!msY#bBa~e
Y9h{T9;5XrA@jIvG9hT}OTloX^FVBuW!2kdN

diff --git a/bin/model/Tile.class b/bin/model/Tile.class
index 6f236dedd0e3a7fe66c921a26d94e979e91256a1..521077c4da242c14b42a11cb6de0a1505767901a 100644
GIT binary patch
delta 632
zcmZva%}!HM6otQY3#~m~ern5=mV*3Lg<GJ4B0n>nnJ{qH7)Kp60Rl0ph+)*2_yU9{
zaPB}83kf7VfUn>fMkKrexX!(`5JGOU?>>9)wf0{7oWJSIwEc5+d<wi`W#67HrpOtx
zo3-6q<@3(QR%Nx(sO_z7eA=;O$)qtn_DN%%m-p!=>Aa!+t8?orW_)I;9Avz;!kocx
z)VDwG*57T__Ua9ne(kfU^cU|#bDe}fD1=A!hbLs;A2HA(2+J)7!(xlVFJ(Q7vVr=*
zL%Qgpk6v=JdHNYvbTnpRgeN+QPm!cXa^4sZ#9$a_Lbgw_ivBLw-3)(I_#rRu5F>IC
zqaRna84V?#-bD*M`11}pe=qnM&)eXIs2)tDYc>)Vw=G7<K%*$z5n`BRO6RYHln*Ww
zrDiaF$aM8v!VC{|eZRhNJc)?rkv4;LXQb5WpU})VyD4=jOT1uClo{QiBlnmWPK~ee
zNv1F<UScAv?Hav_|HHpg?OQjWmGq!|$U^nzdTccLq)4Z3DY2clwynglBnFS=e{^R+
AcmMzZ

delta 595
zcmZuuO-lk%6g_XoG^Z&o)66vUBehY}%D$Gh3tY65aOJ{<VFXr!5J=D;2!BEQ76ob0
zB3kzsTGuM*A7tl^r9v@q=Dz#xIp^N{KJBk|?d9w72|y0pSK6Dy4uNSMBe2TI(~61r
zw2Tru?9enANZF7Sa2=NFrOerBrJC8P)k=+g<>XXH8p|z@lJ{i=^ji7oxL)3`mKx=n
z<gM%2;PtsuY#u;?N>7LJ0H={`!)5r}aNjYdV1_sa3vrA%PTL874tSYa=+Q6>A5Rp(
z9IWh4Mt+QvEfByw(ZO7Xe|a}z+{1mtpeJrEnpu~rsP`&<6a|9x_{(<P4%jBa`!6|!
zaO+w1q~!>`w&u(_51m2YZ`%S9M0vizB4RDo5^cs)9V`_tRS|GouDc&{6Y9_=f|x{z
zGY3hG3~eIXmyB}SEF~woFDb5Ig&H*OLWk7`VZ$nfiEy%R4Pm0((k^TFWPcjh6i;@L
bD-0e&Gdqt{G%+-Z*0<GuCK1@Af`YAYrg=K;

diff --git a/bin/model/TileCircularLinkedList.class b/bin/model/TileCircularLinkedList.class
index 25771186acfde1a9f1f5f979a45b531dbe64c65a..1d7bd34a190e93ae1a5fd851bad0e6fdf5e4a17b 100644
GIT binary patch
delta 136
zcmew={84y=20LdL0}}%?0|SG?WJ7jo=2`#0PYz_)R+eLMXAlF4LgX0486<!_5Z{J@
uje(JYpFwc)e0F8dUZ`$mxbD~NdO+R5NV=8bx|QL&MS!{`H-~a8U<3eEXce~r

delta 140
zcmew;{8e~^20LdD0}}%?0|SH7WJ7joR+f}m|G!T5XV+F%U~p#;1Bxp^WEsR6B!E1i
yItCjCHU>rpeg@&mbJ>+S`=R<(k@P=j*8}PgM$)ee*RKlKF9y^vxjB$y0V4pwh!&9m

diff --git a/bin/view/CharityWindow$2.class b/bin/view/CharityWindow$2.class
index 2dee356c24fde4658c8057aa0c1d5c0e2e6ef6d8..bbc9c4f7d396c96fc98e1c911dc70697594fa08a 100644
GIT binary patch
delta 377
zcmY*V%TB^T6g|^cr)jznG(Hfp3M$lU6(1-*kdSC3y3**%MGcMAAR0<Q5)(J>T+RpJ
z&NYc4#DyQ=2lx^0-5M`(<t*;pd*|G9&Yf@dOVvJp-rfPMAlKGXEUjS_A&xPIfh(u(
z*kz}3X`hs;u2a-8jxa-?Uv}MF1|?BQo@$7~;Fu8iEXF3qGaEKynC6Hx1nZvLu=6FS
z>eZTOUZr@`&@qEq@yRkQDFTvZ%we9xB4|(Q&h{G~i4_i=3%9Ie0k$}o;?X56bEN+H
zId1wj_gW{@tD+^fSXN}^r-w&KkZF~O*2TyR)FZ2di1`Y=i>Y9u15@r|u?<EL1)Pk_
z2v8nEKgC_@<)9)D9eeZ#2MD8pAiWrWq!`2yRYZ?9q=`kPiFIs{Xok8RrnFC_3ZXZt
Umav6wx)sE*L+pS?Gd*oOzad^g+W-In

delta 410
zcmY+AJ4*vm5QV?H8{N1pKB6GL*7(*KUEl9_Krm=!(0VnCuErRWkZ5IRW4T~!X)TBZ
z3x9wh_%p=bR-BYhap%m;xie?xJNy$i-+y1<fEf}`=9Eg*2o}@7Oxo!*=ukACxh2=h
zxY-jYb(;6wv_%)TqNb4XyqqF5oE$kYiPCG(qp*Wd&0e(Vqfyb2%lp~le$hQXPvzZX
z&t!lhgF!{4<a=c&aq8y%;`O1QO<$HRh8YPy)RGzv!dg5!hGQ@;)T)3hr%?7qLUPwV
z@-h|^Oa>{f-=1dHVCJ97{p&)}yRevJKDgH&)MhZJ-`(7zq04IBEwol>dnCLUf1x|}
zj8&mO5_=)8SD1Q238|JkSxBczaJxjXA@3$83F_IF+zvKLB2uaHq%F;~h_9jr7Nv_x
lh$WU~?22UL2HK86G$ia*i8a<(7ax*~Y_KKBlt0zkVt=i6N5}vG

diff --git a/bin/view/DoodadCardWindow$1.class b/bin/view/DoodadCardWindow$1.class
index 63ad1b1e87409b6d77c892159095ad8b96849f15..2dba6e040662a8edf0c996275ae4075e90ce9b78 100644
GIT binary patch
literal 964
zcmaJ=ZBJ7%7(Ly_F1udX1cZRROr5$7WX$&jW1<6fWJ43k{9Nv>thlwyz1@bt$j^LG
zi68s{{t|zM@#%Gm!AzSpZJ(Z==Q*eC_n%+C0l1Gx4iXFt11W};9jyZ%)OZ-Yl`7D~
zLe)WvA$P(Dywc(7xbphwMEJ%*nqei5@}a4Sfl#LM%r{c2hK!6*B4kLLwu}l}#N8N6
zzD<xPQc3faVX62JOsU0?s_8&vz%b>(!K8~MvK}(XF(iu?kZnjM_WRu<5gziRj$oK+
zXrFglJd}1l3Z`s942$Da6{=KFmd7IAi13{byCPs%D>laJ+_jpwORWhqky`SHizO^O
zxO%~^!*(cm;9&);3=>gDh#u)F?v+|D^0@Bc8pG-zck9ZCFzok?2zF0>(X)nnxM7uM
zd!bb3z;OTlVaR>q;wEl8xOE}j!3Q$G>!FAer4gsn*lcy{5hGWY|0jhZA*u}d-<bHa
z$CX1SO~q9-d2i&ad!YNFFJ4IN{FT4o(596~_3tXbqa&$~o5Hkp;NTvC$36@X53J(p
zsI7<3`^IRsBf6Twt1Eg~wGNLW5s`g#{nRJGayk1h=oS*xGjJ(-iDr*!Z6j`Z{S&<M
z7fheUn9DX6@7U8d%+T7SGd4PlIU1=l%#T<GgiKOwb`A^YSp0~|=Ei5NCC^bfiw~tK
zWu73GcAf}<mq_Ckk?mm`O`_kAQ&<eqj8fQH8SBL0B83gyp){McPrtG5AfF;|g_a3y
Tp-N*4cj>P_q?uJ`Yo+!J^+4Gi

literal 710
zcmaJ;+e*Vg5Ix(ZMq|`^*Lv5At%6bTLGS`nFBGaT)%v_`mbwx*C5f$mmJg!%;0O3o
z;%wR{sRlMPJ9FmDnc1)Jk52%5ShtX3m~KhYc29%A<6e=6-mO$#(9Z2zFd63Wd5gQe
z9lN3>RP1(=CmwIcB4p@`?_`wQA(C=WmIHzuN+siChHU;1OrgqP76VTVfML)<8hthl
z3^}kc%wXg-V5BUSxO#l3iSU}&e8DhQ4(i;m@=)q~H)v`>470sk<#tKXP&*m0=m(Kh
z4ThzBx#y5)df<aX)y5QNEKD<G5}eOf!>v3=v3PJWi!6y3PckNxFKMNN9sZ=87Wf}I
zgIx(8!@4+^dZNkSkFc#9((Grd-cfrg;=91JutMOT3wN-lcV;(3(d41HxG6C>C8b1I
z^m!DC2+Oo&gPxydGJ4bGrRZ4br}zMQ`*hb4dvoiRes6GI63mE>B^gF_8_3Yzp&A_>
z#TZ$JaZGesj>u}3wDFF~-vkAi*h~nfI-o8A!7+z<DmAb`#VIUeiL6PYSCJ#nrkrj`
F-w!jfogV-I

diff --git a/bin/view/DoodadCardWindow$2.class b/bin/view/DoodadCardWindow$2.class
deleted file mode 100644
index da8c80fee58aceb9b6e13e34155ffd0aef1cc804..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 964
zcmaJ=ZBJ7%7(Ly_F1udX1cZRROr5$7WPq;;#zY6`$c846`MKO%S#fKZd%F#Pk)QdX
z5<mC@{3ZSh<J0RBgPAsI+CDu!&vQ=O??1nO1MmQk9V8g$`ce!kJ6Z=ksPZs)D^;Ke
zg)IjuhTJLd^GchmlgjJkQ{fv2X@;dZ$_J(*`a+q?bKgj<>M}AyiI5>}S~4nZ5O;kf
z`8GkGN+r!RhK1rkFr_9#s;UE#0mFm`2jec1$a=^i$B-;qK(;QGIOuhbMR>%I+k#=L
zu6^Ea@=)6KFqpChG0cxnRoJ3}vOE^?MuhKl*bxE4O0hmt=dRVfU22YziPVxmTr6PG
z!Szda9koKi0}o4BW*CdwLUc(_alh1bk;hF3HyD=xxLZ?3gki61M6i42i>@`)!!4^c
z+YO~Mhlcy_k3#MX7q@ZO!JSL#4nL6j9S=p6D2+Ii#%8Noj~KbK_&+HO39-qL|BZ<+
zdsI1O(nMTEgLj9%x`(<K`eIL7=db<!hSse-s()AcZ5>H<(h#Pl0|)mBJn~_9cxV+*
zMlC&f(KAM?9nsMYUQN-%s<wF)iHPi@>!&^jmdn|9LAQ{go`FlzD>QpTYa4OPtDoSN
zzhLq_#$2_rc*mZuVv5!tow3nr%+N@cVRp#UCuEXh(=(X6!2CyyH`YF5C3%6ud3-2M
zDf0xew6jDAyhIwWh-@E|Xb}BDoWf#=W|+dx%2*`^7b&da9;I2Qefo_x2l*6%E3`~t
T1DiCautk6M5zVYRTPw9+`;gfl

diff --git a/bin/view/DoodadCardWindow.class b/bin/view/DoodadCardWindow.class
index 65ca86fc0bb27bb47b7a8e1a71bf3446665ed9b9..7f68037bd4cbe3690235ae24b71816da94150c21 100644
GIT binary patch
literal 1770
zcmaJ>e^VP(6g@9QHrX!Fru<N(bgfkr&_<N14OH8PQo(JDB?Qy{^^$#UwzJundHW#c
z3;2B;9hi|B{ofDe^uFE9EMP1%Vc*_&?|J8*d*1%@@1K7GSj7tqIfj|TKn$uIQu^Gl
zbLH;`kuL`p@(h<>^Fv+@dGxCKwEbFiG()k+gJ@Ino?w{v%>J8dJP0UbJBh9_T<Qw$
z3+3^)2>+9mL`_nxxju-8Nlr&bTFG#SM<Z&IDAkOw2T`EEXBaD2nhg26^o51X3{x4;
zhe}CRK#Ae^y-0~zhKIs;JF?dgLaqZDxqT(uq3Fdm*Df}?!tDv&l|F?<pDXcbZ>yYX
zQE^`?*>g3e>7%}Ivz=5WSBaNG#jch~PA`aKlHy{nUCip-4v!+K-L|0GAv>z(NsVn|
z3eyf8%+OrQiM*-&yIK+OnrVB=3nKC4pw||v!Ko95k|#SnY;qNt_hB%vyFtt_=ZzdM
zshKyEWSA|#7<G;fhHHk&gjrp8;9`PdGVaR3g9EK)v>|$uK)8BEr(7L@LH5boPUT{-
zGnuKAvX^C0Zv}kDu>J0_nW<$(?^d%&%qtEo6be|TPU}1jha+?wfewY+6-wCn0#ysQ
zNXK(_PORzROEU{A7P=wcXoL8bgQ7uPWmq_ixFO<>3i^r146cQ5NSJewsd5E;M;6}U
zM>cL_+5*jDZsd?|uGpyIu9*Uve!l!aqpUOy&^-tD@qpn9_x<}F!@>(<Eh3>9ZVau&
z2f8W_MWn0eGe~>W*@gofmuzg}M+=WG>XF<+2V2-C_H+ot(izw~-7pyu^jamglQ}C3
z8hFpadl<Lz1UnX<UW8A+9u9uSGja*Z-3;O&ad*D_+}OU@=SS(_>1v$+@T9VmjP|ZP
zP#v)um|HQE*(7z}Ei(%SXDcF6>LHI~5nE_cS(ZuLkJC%sp!*)<BjP<qAIm&)hCHou
z#!tzUT#!6Tvm}FRF+us0^tMV>jGp!>rdp*dC%F1|k~>TP$CI6T%+cCOv+zDXptmCC
z@!=3*i%!Z>Y~mEGb%F(N`5248Q6L8cGMUi2Midqa<az=&n-&o18<bHX!XFc?p>Y$R
z3}Fp11Dg{2bObSX1Tki={}AEVL=2#|^askNrDJ?fi<Q#Xv^d4>R_WUl-0_xAQEM%o
zVEq_B&~}~3KisFqPx)g!&bnA6F@bez{4PqkhXvG8CJ(IO8SY^BOjos`L<`jKE*ivT
Z40}|YLlgU^ABxoIY5tzmFHi5kyan;UszCq%

literal 2378
zcmZ`)+j0{}5It)IlEoTinM<$@*j!~hpcsP#mPx=e0uf;@HX?!qGM3i%!g|-)U0Imi
zfFzI`xj*C!@}8=&s*0-enyS3!1M(QYArGmX*_DlaK~>tB>FMq{-KVGL&;Ne=9l%li
z7)FzVt@FB8Nsd}pNtDvUE?v{jl2r*Kq#$-%%!{NU%<1IC$=h1dRnR;ubTea%Sxv!~
zoZP>gbSgSE&im4of{inpC~0<1Olrm|C0{C)99Otyr>>+HEz`9v<B~Afu<@m|*)Xh|
zy8D`fb%~z5f>7EjX;G|0OofV;C=|q1w4p^obk5f1gsq*unpLnlr<>YXd3I8>C&Z*d
z;PISQ6h>ayx?I<VA$LZ16l~9}nGYTxlA$Zumbl@^9pq))wHbV>CohkW$xo+>of5+)
zXU3|GlwH>{N3~gt_QIa#0c~rT({wcfdkA!Of+N_+Oa$6dbmM>w{vc^gtc9wXfO=G{
z#|Ej}r{ZNCBD87EO*7+~>B`*7n0f+hQE`)UhmmS_DvTtR{UQi949kw<F#6@0M+hU4
z&1PljM===2u{z%5GAAlt#c>5Kj^>Vt;+<*RDw`!{p$>P+ub;wh45>(ASV5Tj<N7^f
zThBv!@?ntowk0TMZM~Ee3s%{U;v`N<Ji{`=5fy2SvP@|n>?`PKI4Y1`5T=-Be9~=(
zl&{J7zWylA;GA^LB5F^(pe|(i-FQPq4i^-(ic<Xo<#dPn)ocZO8qU||ne$|D#TGSu
z7#CNP?ca<DE-OG3V;Gk>CL~j<X=ZvP&v_MLM5OYYDhjyHB$DS0*(9z;f~6=GI(=Vy
zejB&KxJiDNQY&{=yaT~&#A~e2Yk`ZlL^jh<CB74RSW!g@<Vi9XXvP}?_SFJ>(<+(+
zd_!T}UKy`{$)nH_ld;UI#I`XEUYqBnXAG;dNV+L6n~o9r8I%kVa~bpO4P-z;Zv%w1
zH9KdS%zLT<{&S%;zN=yZ_ZTo^$m@>ocZpEqdQU!r_nGvxFpRF?&UH=buAz0!Xf}J#
z7(P_-k-UB~`U&l>8^Hs%fJXgM%_-XYoU2==ZxzPJ^`MqIXV4`g_>}N3iG?U0;y@Um
zy|6NmMDZBsq}rD%zQU8B?oJow8H-i5R^2Vv@Nb+B+0^I6LJ%GMh+khTpt1W!$E~tm
z)H1qkpj%gVtHZK<6sTE~C7(8g<7f`^%6RzFgwP~A5NA!YLj94I;E!b4*Ptz0sK1G;
z6i1dlntQ9*%zx`IzUmf!H~9{C&}BOvbYLrGYM_j5*e;Fm5_Z%bWqDu|Wi2%*g(})}
zeN}X<bheX@cG1ah-`TdnfRf!bj1YGh-71vwVF}zSR~U=L_pG;u?m~QT75kqe(fcbB
z9w<6oXvM#=f!IJ5uXq@c@>b<0Wgbq*MGYql8$wmQ?%{N>K2u<nXFZ&!^;jW(X<Zdp
zp5iJu{lAB6q4*6CZ+VzprZGj0Df*6;Jj`%MXOMTE!l2lw!Q^Vr!@I$1IVzh%iTJ7q
z=URPkG|Z<K=OGW3=NZeOm2r176ML{9dvS!{5gf#2zALwI2o4{I2T0-x`tcKYf5rf6
zIEFtkh`;y{{Eg%I2PYb6dse5dNj{o&+8+580}M%k@%KD@z{ynnJ|{IiEW|&l;!&=z
zhQ~5(pL_U%+eV*<ul-1tBi_Y|1BO`^ClSXfbn<;j5N|)O5XX1}=R<WQo#g%-eCu=m
V9c`QNJ$~RA=j;qe`Fk7;{{vU~H!A=D

diff --git a/bin/view/DownSizeWindow.class b/bin/view/DownSizeWindow.class
index 506d0a8b5c5d6b60bbe956f40a3548e4b48a4228..2f1231ef9aa37fbd24437ae0e2977ff491be17bf 100644
GIT binary patch
delta 20
ccmbOvI7x6rEF0st&2en)jEszvpRun207n%D-T(jq

delta 20
ccmbOvI7x6rEF0tY&2en)jEqc^pRun207oVU-~a#s

diff --git a/src/controller/Cashflow.java b/src/controller/Cashflow.java
index 867a104..fde4514 100644
--- a/src/controller/Cashflow.java
+++ b/src/controller/Cashflow.java
@@ -69,9 +69,12 @@ public class Cashflow
 	
 	private static void testGamePlay()
 	{
-		Player p = new Player();
-		System.out.println(p.getFinancialStatement().getProfession().getName());
-		GameBoard g = new GameBoard();
+		Player p1 = new Player();
+		Player p2 = new Player();
+		GameBoard g = new GameBoard(p1, p2);
+		System.out.println(p1.getLocation());
+		g.movePlayer(p1, 5);
+		System.out.println(p1.getLocation());
 		
 	}
 	
diff --git a/src/model/DoodadTile.java b/src/model/DoodadTile.java
index 97bc6b5..f0bee71 100644
--- a/src/model/DoodadTile.java
+++ b/src/model/DoodadTile.java
@@ -1,5 +1,7 @@
 package model;
 
+import view.*;
+
 public class DoodadTile extends Tile
 {
 	private static DoodadStack _doodadStack;
@@ -15,6 +17,10 @@ public class DoodadTile extends Tile
 	{
 		FinancialStatement f = p.getFinancialStatement();
 		DoodadCard dc = _doodadStack.pickCard();
+		
+		DoodadCardWindow  DoodadCardWindow = new DoodadCardWindow();
+		DoodadCardWindow.showButtonDemo();
+		
 		int amount = dc.getValue();
 		if (f.getCashBalance() > amount)
 		{
diff --git a/src/model/DownsizeTile.java b/src/model/DownsizeTile.java
index 87a49e8..96f4dc3 100644
--- a/src/model/DownsizeTile.java
+++ b/src/model/DownsizeTile.java
@@ -1,5 +1,7 @@
 package model;
 
+import view.DownSizeWindow;
+
 public class DownsizeTile extends Tile{
 	public DownsizeTile(String type, int boardIndex)
 	{
@@ -10,5 +12,11 @@ public class DownsizeTile extends Tile{
 	public void getLandedOn(Player p)
 	{
 		p.increaseDownsizeCount();
+		
+		DownSizeWindow  DownSizeWindow = new DownSizeWindow();      
+		DownSizeWindow.showButtonDemo();
+		
+		// TODO
+		System.out.println("Player landed on downsized");
 	}
 }
diff --git a/src/model/FinancialStatement.java b/src/model/FinancialStatement.java
index b09e122..d0f805e 100644
--- a/src/model/FinancialStatement.java
+++ b/src/model/FinancialStatement.java
@@ -205,28 +205,7 @@ public class FinancialStatement
 		return _totalIncome;
 	}
 	
-	public int getSalary()
-	{
-		return _salary;
-	}
-	
-	public int getSalary()
-	{
-		return _salary;
-	}
-	
-	public int getSalary()
-	{
-		return _salary;
-	} 
-	public int getSalary()
-	{
-		return _salary;
-	}
-	public int getSalary()
-	{
-		return _salary;
-	}
+
 	
 }
 
diff --git a/src/model/GameBoard.java b/src/model/GameBoard.java
index fcb451c..91f967d 100644
--- a/src/model/GameBoard.java
+++ b/src/model/GameBoard.java
@@ -41,16 +41,13 @@ public class GameBoard
 	{
 		_profs = new Professions();
 		_tiles = new TileCircularLinkedList();
-		_tiles.addTiles(t1, t2, t3, t4);
+		_tiles.addTiles(t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24);
 		t1.addPlayers(players);
 	}
-	public Tile getTile(int num) {
-		ArrayList<Tile> tileList = new ArrayList<Tile>();
-		Tile[] tileList1 = {
-				t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24
-		};
-		tileList.addAll(Arrays.asList(tileList1));
-		return tileList.get(num);
+	
+	
+	public Tile getTile(int index) {
+		return _tiles.get(index).getData();
 	}	
 	
 	// TODO This method will move the player and returns the number of pay days they passed along the way.
@@ -70,6 +67,10 @@ public class GameBoard
 			{
 				passedPaydays++;
 			}
+			
+			// TODO update player location on board each iteration and maybe add delay
+			System.out.println("Player is at tile number: " + currentNode.getData().getBoardIndex());
+			
 			currentNode = nextNode;
 		}
 		currentNode.getData().addPlayers(p);
diff --git a/src/model/Stock.java b/src/model/Stock.java
index d224b57..c821ab1 100644
--- a/src/model/Stock.java
+++ b/src/model/Stock.java
@@ -35,4 +35,5 @@ public class Stock
 		return _numShares;
 	}
 	
+	
 }
\ No newline at end of file
diff --git a/src/model/Tile.java b/src/model/Tile.java
index 3342262..dac1f40 100644
--- a/src/model/Tile.java
+++ b/src/model/Tile.java
@@ -10,6 +10,7 @@ public class Tile
 	
 	public Tile(String name, int boardIndex)
 	{
+		_players = new ArrayList<Player>();
 		_name = name;
 		_boardIndex = boardIndex;
 	}
diff --git a/src/model/TileCircularLinkedList.java b/src/model/TileCircularLinkedList.java
index 927eabc..b7834cb 100644
--- a/src/model/TileCircularLinkedList.java
+++ b/src/model/TileCircularLinkedList.java
@@ -64,7 +64,7 @@ public class TileCircularLinkedList
             return  null;
         }
         Node n = head;
-        while(index-1!=0){
+        while(index!=0){
             n=n.next;
             index--;
         }
@@ -76,7 +76,7 @@ public class TileCircularLinkedList
             return null;
         }
         Node n = head;
-        while(index-1!=0){
+        while(index!=0){
             n=n.next;
             index--;
         }
diff --git a/src/view/CharityWindow.java b/src/view/CharityWindow.java
index 99f61e2..dc5f5e5 100644
--- a/src/view/CharityWindow.java
+++ b/src/view/CharityWindow.java
@@ -61,7 +61,7 @@ public class CharityWindow {
          public void actionPerformed(ActionEvent e) {
         	 //put message that they donated xx dollars after 10 seconds, close window        	     	
 			try {
-				Thread.sleep(1000);
+				Thread.sleep(1);
 			} catch (InterruptedException e1) {
 				// TODO Auto-generated catch block
 				e1.printStackTrace();
@@ -77,7 +77,7 @@ public class CharityWindow {
       DontDonate.addActionListener(new ActionListener() {
          public void actionPerformed(ActionEvent e) {
         	//put message that they are greedy. after 10 seconds, close window
-        	 System.exit(0);
+        	System.exit(0);
          }
       });
       controlPanel.add(Donate);
diff --git a/src/view/DoodadCardWindow.java b/src/view/DoodadCardWindow.java
index 8a34247..d93e80d 100644
--- a/src/view/DoodadCardWindow.java
+++ b/src/view/DoodadCardWindow.java
@@ -29,7 +29,7 @@ public class DoodadCardWindow {
 		DoodadCardWindow  DoodadCardWindow = new DoodadCardWindow();      
 		DoodadCardWindow.showButtonDemo();
 	}
-	private void prepareGUI(){
+	private void prepareGUI(DoodadCard dc){
 		mainFrame = new JFrame("Doodad");
 		mainFrame.getContentPane().setBackground(new Color(250, 51, 51));
 		mainFrame.setSize(350,250);
@@ -56,7 +56,7 @@ public class DoodadCardWindow {
 		mainFrame.setVisible(true);  
 	}
 
-	private void showButtonDemo(){
+	public void showButtonDemo(){
 		headerLabel.setText("Call Doodad Title here"); 
 		statusLabel.setText("Call Doodad Description here");
 		//resources folder should be inside SWING folder.
diff --git a/src/view/DownSizeWindow.java b/src/view/DownSizeWindow.java
index f032ed6..8f9265a 100644
--- a/src/view/DownSizeWindow.java
+++ b/src/view/DownSizeWindow.java
@@ -54,7 +54,7 @@ public class DownSizeWindow {
 		mainFrame.setVisible(true);  
 	}
 
-	private void showButtonDemo(){
+	public void showButtonDemo(){
 		headerLabel.setText("Downsize"); 
 		statusLabel.setText("You lose 3 turns.");
 		//resources folder should be inside SWING folder.