From 9b0e473e0b01b673d58c1492b90a770ba981f34b Mon Sep 17 00:00:00 2001
From: Joe <Joe@localhost>
Date: Fri, 3 Mar 2017 15:20:58 -0500
Subject: [PATCH] Fixed market cards. Added the descriptions to the arguments
 of the cards so they can be accessed later.

---
 bin/controller/Cashflow.class | Bin 1090 -> 1102 bytes
 src/controller/Cashflow.java  |   6 +-
 src/model/Card.java           |   1 -
 src/model/MarketCard.java     |  11 +-
 src/model/MarketStack.java    | 211 +++++++++++++++++++++-------------
 5 files changed, 141 insertions(+), 88 deletions(-)

diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class
index 710eb773f9d4d776ebd511af87a81f277d7f73c5..0c0513698444633e9aaeec129fd05ccdc6cb92cc 100644
GIT binary patch
delta 270
zcmX@aagJlc5njRE{FKxjec!~Q?9`Htm;4z`*%^!(83d4pofC^vxEPEWOnDg07|a<N
z_|j8LTvCgZi!uvJGV}8o8ALQDH!zA%PGpJ|X38yQWDxd2);{?%(^CIK3@i++3=9nJ
zyBP!`w=)R&Xm4W>wq>?k&R`_Vl3>QNi9vifgKVTI%MJ$l?F_0y8rvAOfJ*cZFc@uP
zFadJ5F<5M4ux?>yl$BZd|NP`5%u3dF47?0(3_=XtKyytXrZYG&I0AVb4E79849*OU
oKowRDE)1>=Obq-C=0Mf149pDT4C<2=S;V;YfbyO|)l3Xt0QF=&v;Y7A

delta 243
zcmX@dafoBW5k8^Z{FKxjeW%QHm(;|ZjTikHRk;|98BEz3Oc)usAd=3BMJYTCW(?+x
z3>@jHB_Ww5IjNHanJPq?lTwNq8AN<g%$R(KX{q#n1{MZZ1_lO~-3$Ve+Zlv>w6`$`
z+cMiNXV9NKhgnu+8-vj{2CZ!j7TXxCTbLPTWfuOwH2DIvQj9eNFM~6K5Cb<*vkAlq
z1_uU5AdiE=hQSFa#|Ttm&fvn}%D}|H4^-m@WHB>{GpI1Q16eE#9zeC+3{3wRgxDDb
P7#X#J8a#nQOblKC>$Ec4

diff --git a/src/controller/Cashflow.java b/src/controller/Cashflow.java
index 3ac0df3..6ee73c9 100644
--- a/src/controller/Cashflow.java
+++ b/src/controller/Cashflow.java
@@ -7,13 +7,13 @@ public class Cashflow
 {
 	public static void main(String[] args)
 	{
-		BigDealStack bds = new BigDealStack();
+		MarketStack ms = new MarketStack();
 		
-		int initialSize = bds.getSize();
+		int initialSize = ms.getSize();
 		for(int i=0; i<initialSize; i++)
 		{
 			int num = i+1;
-			System.out.println(num + ": " + bds.pop().getTitle());
+			System.out.println(num + ": " + ((MarketCard) ms.pop()).getDescription()); //Always going to need this cast when getting description unfortunately
 		}
 	}
 }
diff --git a/src/model/Card.java b/src/model/Card.java
index 9e625af..c187380 100644
--- a/src/model/Card.java
+++ b/src/model/Card.java
@@ -22,6 +22,5 @@ public String getTitle()
 	{
 		return _title;
 	}
-
 	
 }
diff --git a/src/model/MarketCard.java b/src/model/MarketCard.java
index eb370ab..b8eb2e2 100644
--- a/src/model/MarketCard.java
+++ b/src/model/MarketCard.java
@@ -2,18 +2,25 @@
 
 public class MarketCard extends Card
 {
+	private String _description;
 	private String _type;
 	private boolean _affectAll;
 	private int _value;
 	
-	public MarketCard(String title, String type, boolean affectAll, int value)
+	public MarketCard(String title, String description, String type, boolean affectAll, int value)
 	{
 		super(title);
+		_description = description;
 		_type = type;
 		_affectAll = affectAll;
 		_value = value;
 	}
-
+	
+	public String getDescription()
+	{
+		return _description;
+	}
+	
 	public String getType()
 	{
 		return _type;
diff --git a/src/model/MarketStack.java b/src/model/MarketStack.java
index cf270ba..50e7338 100644
--- a/src/model/MarketStack.java
+++ b/src/model/MarketStack.java
@@ -6,94 +6,141 @@
 public class MarketStack extends CardStack
 {
 	//Not sure how we're working in the descriptions as it's a more graphical concept but for now I'm going to type them out
-	private static MarketCard Profit1 = new MarketCard("Small Business Boom!", "profit", true, 250);
-	//The downtown economy has exploded! EVERYONE is affected! ALL businesses with a cash flow of $1000 or less have their cash flow increased by $250
-	private static MarketCard Profit2 = new MarketCard("New Management System", "profit", false, 400);
-	// A new management system creates new efficiencies and lowers costs. Only the person who drew this MarketCard is affected.
+	private static MarketCard Profit1 = new MarketCard("Small Business Boom!",
+										"The downtown economy has exploded! EVERYONE is affected! ALL businesses with a cash flow of $1000 or less have their cash flow increased by $250", 
+										"profit", true, 250);
+	private static MarketCard Profit2 = new MarketCard("New Management System", 
+										"A new management system creates new efficiencies and lowers costs. Only the person who drew this MarketCard is affected.",
+										"profit", false, 400);
+	
 	//gold MarketCard - value is $ per coin
-	private static MarketCard Gold1 = new MarketCard("Price of Gold Soars", "gold", true, 2000);
-	// The Central Bank is printing money in an attempt to boost the economy causing massive inflation. The price of gold skyrockets. Buyer offers $2000 for each gold coin. Everyone may sell any number of coins at this price.
-	private static MarketCard Gold2 = new MarketCard("Collector wants Gold Coins", "gold", true, 1000);
-	//Wealthy collector is looking for gold coins. Cash offer of $1000 for each coin. Everyone may sell any number of coins at this price.
-	private static MarketCard Gold3 = new MarketCard("Price of Gold Soars", "gold", true, 1000);
-	//Rioting Overseas. Oil prices threatened. Price of gold skyrockets. Buyer offers $1000 cash for each gold coin. Everyone may sell any number of coins at this price.
-	private static MarketCard Gold4 = new MarketCard("Collector wants Gold Coins", "gold", true, 500);
-	//Wealthy collector is looking for gold coins. Cash offer of $500 for each coin. Everyone may sell any number of coins at this price.
+	private static MarketCard Gold1 = new MarketCard("Price of Gold Soars", 
+										"The Central Bank is printing money in an attempt to boost the economy causing massive inflation. The price of gold skyrockets. Buyer offers $2000 for each gold coin. Everyone may sell any number of coins at this price.",
+										"gold", true, 2000);
+	private static MarketCard Gold2 = new MarketCard("Collector wants Gold Coins", 
+										"Wealthy collector is looking for gold coins. Cash offer of $1000 for each coin. Everyone may sell any number of coins at this price.",
+										"gold", true, 1000);
+	private static MarketCard Gold3 = new MarketCard("Price of Gold Soars", 
+										"Rioting Overseas. Oil prices threatened. Price of gold skyrockets. Buyer offers $1000 cash for each gold coin. Everyone may sell any number of coins at this price.",
+										"gold", true, 1000);
+	private static MarketCard Gold4 = new MarketCard("Collector wants Gold Coins", 
+										"Wealthy collector is looking for gold coins. Cash offer of $500 for each coin. Everyone may sell any number of coins at this price.",
+										"gold", true, 500);
+	
 	//expense MarketCard - quite obviously the value is how much this expense costs
-	private static MarketCard Expense1 = new MarketCard("Sewer Line Breaks", "expense", false, 1000);
-	//Water is everywhere at your property! Pay $1000 for a new sewer line (one time). Take out a bank loan if necessary to cover these expenses. MarketCard applies only to the person who drew it. If you own NO real estate, ignore this MarketCard.
-	private static MarketCard Expense2 = new MarketCard("Sewer Line Breaks", "expense", false, 2000);
-	//Water is everywhere at your property! Pay $2000 for a new sewer line (one time). Take out a bank loan if necessary to cover these expenses. MarketCard applies only to the person who drew it. If you own NO real estate, ignore this MarketCard.
-	private static MarketCard Expense3 = new MarketCard("Tenant Damages Your Property", "expense", false, 500);
-	//Tenant refuses to pay rent. After the tenant has been evicted, you discover significant damage to your property. Insurance covers most repairs, but you still must pay $500(one time). Take out a bank loan if necessary to cover these expenses. MarketCard applies only to the person who drew it. If you own NO real estate, ignore this MarketCard.
-	private static MarketCard Expense4 = new MarketCard("Tenant Damages Your Property", "expense", false, 500);
-	//Tenant refuses to pay rent. After the tenant has been evicted, you discover significant damage to your property. Insurance covers most repairs, but you still must pay $500(one time). Take out a bank loan if necessary to cover these expenses. MarketCard applies only to the person who drew it. If you own NO real estate, ignore this MarketCard.
-	private static MarketCard Expense5 = new MarketCard("Tenant Damages Your Property", "expense", false, 1000);
-	//Tenant refuses to pay rent. After the tenant has been evicted, you discover significant damage to your property. Insurance covers most repairs, but you still must pay $1000(one time). Take out a bank loan if necessary to cover these expenses. MarketCard applies only to the person who drew it. If you own NO real estate, ignore this MarketCard.
+	private static MarketCard Expense1 = new MarketCard("Sewer Line Breaks", 
+										"Water is everywhere at your property! Pay $1000 for a new sewer line (one time). Take out a bank loan if necessary to cover these expenses. MarketCard applies only to the person who drew it. If you own NO real estate, ignore this MarketCard.",
+										"expense", false, 1000);
+	private static MarketCard Expense2 = new MarketCard("Sewer Line Breaks", 
+										"Water is everywhere at your property! Pay $2000 for a new sewer line (one time). Take out a bank loan if necessary to cover these expenses. MarketCard applies only to the person who drew it. If you own NO real estate, ignore this MarketCard.",
+										"expense", false, 2000);
+	private static MarketCard Expense3 = new MarketCard("Tenant Damages Your Property", 
+										"Tenant refuses to pay rent. After the tenant has been evicted, you discover significant damage to your property. Insurance covers most repairs, but you still must pay $500(one time). Take out a bank loan if necessary to cover these expenses. MarketCard applies only to the person who drew it. If you own NO real estate, ignore this MarketCard.",
+										"expense", false, 500);
+	private static MarketCard Expense4 = new MarketCard("Tenant Damages Your Property", 
+										"Tenant refuses to pay rent. After the tenant has been evicted, you discover significant damage to your property. Insurance covers most repairs, but you still must pay $500(one time). Take out a bank loan if necessary to cover these expenses. MarketCard applies only to the person who drew it. If you own NO real estate, ignore this MarketCard.",
+										"expense", false, 500);
+	private static MarketCard Expense5 = new MarketCard("Tenant Damages Your Property", 
+										"Tenant refuses to pay rent. After the tenant has been evicted, you discover significant damage to your property. Insurance covers most repairs, but you still must pay $1000(one time). Take out a bank loan if necessary to cover these expenses. MarketCard applies only to the person who drew it. If you own NO real estate, ignore this MarketCard.",
+										"expense", false, 1000);
+	
 	//stock MarketCard - no value necessary
-	private static MarketCard Stock1 = new MarketCard("Stock - MYT4U Electronics Co.","stock",true,0);
-	//MYT4U takes a gamble on new home entertainment tech. Will it hit big or be the next Beta-Max? MarketCardholder Rolls 1 Die. Die = 1-3, STOCK SPLITS! Everyone who owns MYT4U DOUBLES their number of shares. Die 4-6, STOCK REVERSE SPLITS! Everyone who owns MYT4U loses half their shares.
-	private static MarketCard Stock2 = new MarketCard("Stock - GRO4US Fund","stock",true,0);
-	//The market is in flux and there will be monumental market swings over the next few months. How will mutual funds fair in this time of change? MarketCardholder Rolls 1 Die. Die = 1-3, STOCK SPLITS! Everyone who owns GRO4US DOUBLES their number of shares. Die 4-6, STOCK REVERSE SPLITS! Everyone who owns GRO4US loses half their shares.	
-	private static MarketCard Stock3 = new MarketCard("Stock - ON2U Entertainment Co.","stock",true,0);
-	//Studio backs fresh director for its summer blockbuster. Groundbreaking production could be too ambitious. MarketCardholder Rolls 1 Die. Die = 1-3, STOCK SPLITS! Everyone who owns ON2U DOUBLES their number of shares. Die 4-6, STOCK REVERSE SPLITS! Everyone who owns ON2U loses half their shares.
-	private static MarketCard Stock4 = new MarketCard("Stock - OK4U Drug Co.","stock",true,0);
-	//OK4U begins trial on possible life-saving drug. Side effects are untested. Could change the world... if it works. MarketCardholder Rolls 1 Die. Die = 1-3, STOCK SPLITS! Everyone who owns OK4U DOUBLES their number of shares. Die 4-6, STOCK REVERSE SPLITS! Everyone who owns OK4U loses half their shares.
+	private static MarketCard Stock1 = new MarketCard("Stock - MYT4U Electronics Co.", 
+										"MYT4U takes a gamble on new home entertainment tech. Will it hit big or be the next Beta-Max? MarketCardholder Rolls 1 Die. Die = 1-3, STOCK SPLITS! Everyone who owns MYT4U DOUBLES their number of shares. Die 4-6, STOCK REVERSE SPLITS! Everyone who owns MYT4U loses half their shares.",
+										"stock",true,0);
+	private static MarketCard Stock2 = new MarketCard("Stock - GRO4US Fund", 
+										"The market is in flux and there will be monumental market swings over the next few months. How will mutual funds fair in this time of change? MarketCardholder Rolls 1 Die. Die = 1-3, STOCK SPLITS! Everyone who owns GRO4US DOUBLES their number of shares. Die 4-6, STOCK REVERSE SPLITS! Everyone who owns GRO4US loses half their shares.",
+										"stock",true,0);
+	private static MarketCard Stock3 = new MarketCard("Stock - ON2U Entertainment Co.", 
+										"Studio backs fresh director for its summer blockbuster. Groundbreaking production could be too ambitious. MarketCardholder Rolls 1 Die. Die = 1-3, STOCK SPLITS! Everyone who owns ON2U DOUBLES their number of shares. Die 4-6, STOCK REVERSE SPLITS! Everyone who owns ON2U loses half their shares.",
+										"stock",true,0);
+	private static MarketCard Stock4 = new MarketCard("Stock - OK4U Drug Co.", 
+										"OK4U begins trial on possible life-saving drug. Side effects are untested. Could change the world... if it works. MarketCardholder Rolls 1 Die. Die = 1-3, STOCK SPLITS! Everyone who owns OK4U DOUBLES their number of shares. Die 4-6, STOCK REVERSE SPLITS! Everyone who owns OK4U loses half their shares.",
+										"stock",true,0);
+	
 	//repercent - how much percentage selling your property would yield you (aka if it's current cost + 10%, you'd yield 110% of the original cost in the sale minus what you owe
-	private static MarketCard REPercent1 = new MarketCard("House Buyer - 3BR/2BA","repercent",true,110);
-	//Buyer searching for 3Br/2Ba house. Offers your original cost plus 10%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.
-	private static MarketCard REPercent2 = new MarketCard("House Buyer - 2BR/1BA","repercent",true,110);
-	//Buyer looking to aquire 2Br/1Ba rentals. Offers your original cost plus 10%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.
-	private static MarketCard REPercent3 = new MarketCard("House Buyer - 3BR/2BA","repercent",true,120);
-	//Buyer searching for 3Br/2Ba house. Offers your original cost plus 20%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.
-	private static MarketCard REPercent4 = new MarketCard("House Buyer - 2BR/1BA","repercent",true,120);
-	//Buyer looking to aquire 2Br/1Ba rentals. Offers your original cost plus 20%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.
-	private static MarketCard REPercent5 = new MarketCard("House Buyer - 3BR/2BA","repercent",true,115);
-	//Buyer searching for 3Br/2Ba house. Offers your original cost plus 15%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.
-	private static MarketCard REPercent6 = new MarketCard("Plex Buyer","repercent",true,110);
-	//Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus 10%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.
-	private static MarketCard REPercent7 = new MarketCard("Plex Buyer","repercent",true,105);
-	//Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus 5%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.
-	private static MarketCard REPercent8 = new MarketCard("Plex Buyer","repercent",true,115);
-	//Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus 15%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.
-	private static MarketCard REPercent9 = new MarketCard("Plex Buyer","repercent",true,120);
-	//Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus 20%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.
+	private static MarketCard REPercent1 = new MarketCard("House Buyer - 3BR/2BA", 
+										"Buyer searching for 3Br/2Ba house. Offers your original cost plus 10%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.",
+										"repercent",true,110);
+	private static MarketCard REPercent2 = new MarketCard("House Buyer - 2BR/1BA", 
+										"Buyer looking to aquire 2Br/1Ba rentals. Offers your original cost plus 10%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.",
+										"repercent",true,110);
+	private static MarketCard REPercent3 = new MarketCard("House Buyer - 3BR/2BA", 
+										"Buyer searching for 3Br/2Ba house. Offers your original cost plus 20%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.",
+										"repercent",true,120);
+	private static MarketCard REPercent4 = new MarketCard("House Buyer - 2BR/1BA", 
+										"Buyer looking to aquire 2Br/1Ba rentals. Offers your original cost plus 20%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.",
+										"repercent",true,120);
+	private static MarketCard REPercent5 = new MarketCard("House Buyer - 3BR/2BA", 
+										"Buyer searching for 3Br/2Ba house. Offers your original cost plus 15%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.",
+										"repercent",true,115);
+	private static MarketCard REPercent6 = new MarketCard("Plex Buyer", 
+										"Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus 10%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.",
+										"repercent",true,110);
+	private static MarketCard REPercent7 = new MarketCard("Plex Buyer", 
+										"Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus 5%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.",
+										"repercent",true,105);
+	private static MarketCard REPercent8 = new MarketCard("Plex Buyer", 
+										"Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus 15%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.",
+										"repercent",true,115);
+	private static MarketCard REPercent9 = new MarketCard("Plex Buyer", 
+										"Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus 20%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.",
+										"repercent",true,120);
+	
 	//refixed - value is the amount of money you get for selling property
-	private static MarketCard REFixed1 = new MarketCard("House Buyer - 3BR/2BA","refixed",true,15000);
-	//Buyer searching for 3Br/2Ba house. Offers your original cost plus $15,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.
-	private static MarketCard REFixed2 = new MarketCard("House Buyer - 3BR/2BA","refixed",true,1000);
-	//Buyer searching for 3Br/2Ba house. Offers your original cost plus $10,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.
-	private static MarketCard REFixed3 = new MarketCard("House Buyer - 3BR/2BA","refixed",true,20000);
-	//Buyer searching for 3Br/2Ba house. Offers your original cost plus $20,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.
-	private static MarketCard REFixed4 = new MarketCard("House Buyer - 3BR/2BA","refixed",true,5000);
-	//Buyer searching for 3Br/2Ba house. Offers your original cost plus $5,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.
-	private static MarketCard REFixed5 = new MarketCard("Plex Buyer","refixed",true,1000);
-	//Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $1,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.
-	private static MarketCard REFixed6 = new MarketCard("Plex Buyer","refixed",true,30000);
-	//Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $30,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.
-	private static MarketCard REFixed7 = new MarketCard("Plex Buyer","refixed",true,15000);
-	//Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $15,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.
-	private static MarketCard REFixed8 = new MarketCard("Plex Buyer","refixed",true,5000);
-	//Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $5,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.
-	private static MarketCard REFixed9 = new MarketCard("Plex Buyer","refixed",true,1000);
-	//Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $1,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.
-	private static MarketCard REFixed10 = new MarketCard("Plex Buyer","refixed",true,20000);
-	//Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $20,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.
-	private static MarketCard REFixed11 = new MarketCard("Plex Buyer","refixed",true,10000);
-	//Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $10,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.
+	private static MarketCard REFixed1 = new MarketCard("House Buyer - 3BR/2BA", 
+										"Buyer searching for 3Br/2Ba house. Offers your original cost plus $15,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.",
+										"refixed",true,15000);
+	private static MarketCard REFixed2 = new MarketCard("House Buyer - 3BR/2BA", 
+										"Buyer searching for 3Br/2Ba house. Offers your original cost plus $10,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.",
+										"refixed",true,1000);
+	private static MarketCard REFixed3 = new MarketCard("House Buyer - 3BR/2BA", 
+										"Buyer searching for 3Br/2Ba house. Offers your original cost plus $20,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.",
+										"refixed",true,20000);
+	private static MarketCard REFixed4 = new MarketCard("House Buyer - 3BR/2BA", 
+										"Buyer searching for 3Br/2Ba house. Offers your original cost plus $5,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.",
+										"refixed",true,5000);
+	private static MarketCard REFixed5 = new MarketCard("Plex Buyer", 
+										"Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $1,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.",
+										"refixed",true,1000);
+	private static MarketCard REFixed6 = new MarketCard("Plex Buyer", 
+										"Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $30,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.",
+										"refixed",true,30000);
+	private static MarketCard REFixed7 = new MarketCard("Plex Buyer", 
+										"Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $15,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.",
+										"refixed",true,15000);
+	private static MarketCard REFixed8 = new MarketCard("Plex Buyer", 
+										"Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $5,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.",
+										"refixed",true,5000);
+	private static MarketCard REFixed9 = new MarketCard("Plex Buyer", 
+										"Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $1,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.",
+										"refixed",true,1000);
+	private static MarketCard REFixed10 = new MarketCard("Plex Buyer", 
+										"Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $20,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.",
+										"refixed",true,20000);
+	private static MarketCard REFixed11 = new MarketCard("Plex Buyer", 
+										"Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $10,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.",
+										"refixed",true,10000);
+	
 	//aoffer - value is amount of money you get for selling each unit
-	private static MarketCard REHOffer1 = new MarketCard("House or Condo Buyer - 2BR/1BA","hoffer",true,45000);
-	//You are offered $45,000 for a 2Br/1Ba House or Condo. Buyer has their own financing. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.
-	private static MarketCard REHOffer2 = new MarketCard("House or Condo Buyer - 2BR/1BA","hoffer",true,65000);
-	//You are offered $65,000 for a 2Br/1Ba House or Condo. Buyer has their own financing. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.
-	private static MarketCard REAOffer1 = new MarketCard("Apartment House Buyer","aoffer",true,25000);
-	//Buyer offers $25,000 per unit for all units in apartment houses of any size. (His 1031 tax-deferred exchange time is running out.) Buyer has their own financing. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.
-	private static MarketCard REAOffer2 = new MarketCard("Apartment House Buyer","aoffer",true,45000);
-	//Buyer offers $45,000 per unit for all units in apartment houses of any size. (His 1031 tax-deferred exchange time is running out.) Buyer has their own financing. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.
-	private static MarketCard REAOffer3 = new MarketCard("Apartment House Buyer","aoffer",true,30000);
-	//REIT offers $30,000 per unit for all units in apartment houses of 12 units or more. Buyer has capital from the sale of another apartment complex. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.
-	private static MarketCard REAOffer4 = new MarketCard("Apartment House Buyer","aoffer",true,40000);
-	//REIT offers $40,000 per unit for all units in apartment houses of 12 units or more. Buyer has capital from the sale of another apartment complex. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.
+	private static MarketCard REHOffer1 = new MarketCard("House or Condo Buyer - 2BR/1BA", 
+										"You are offered $45,000 for a 2Br/1Ba House or Condo. Buyer has their own financing. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.",
+										"hoffer",true,45000);
+	private static MarketCard REHOffer2 = new MarketCard("House or Condo Buyer - 2BR/1BA", 
+										"You are offered $65,000 for a 2Br/1Ba House or Condo. Buyer has their own financing. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.",
+										"hoffer",true,65000);
+	private static MarketCard REAOffer1 = new MarketCard("Apartment House Buyer", 
+										"Buyer offers $25,000 per unit for all units in apartment houses of any size. (His 1031 tax-deferred exchange time is running out.) Buyer has their own financing. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.",
+										"aoffer",true,25000);
+	private static MarketCard REAOffer2 = new MarketCard("Apartment House Buyer", 
+										"Buyer offers $45,000 per unit for all units in apartment houses of any size. (His 1031 tax-deferred exchange time is running out.) Buyer has their own financing. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.",
+										"aoffer",true,45000);
+	private static MarketCard REAOffer3 = new MarketCard("Apartment House Buyer", 
+										"REIT offers $30,000 per unit for all units in apartment houses of 12 units or more. Buyer has capital from the sale of another apartment complex. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.",
+										"aoffer",true,30000);
+	private static MarketCard REAOffer4 = new MarketCard("Apartment House Buyer", 
+										"REIT offers $40,000 per unit for all units in apartment houses of 12 units or more. Buyer has capital from the sale of another apartment complex. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property.",
+										"aoffer",true,40000);
 	
 	public MarketStack()
 	{