diff --git a/res/weapons.txt b/res/weapons.txt
index 2adf900..f6da708 100644
--- a/res/weapons.txt
+++ b/res/weapons.txt
@@ -1,85 +1,85 @@
-#Name	Type	Range	Mt	Hit	Crit	Uses	Worth	Effect	Pref	Mod	
-Tree Branch	Sword	1	1	100	0	20	1	-	-	-
-Iron Sword	Sword	1	5	90	0	23	460	-	-	-
-Steel Sword	Sword	1	8	75	0	15	600	-	-	-
-Silver Sword	Sword	1	13	80	0	10	1500	-	-	-
-Killing Edge	Sword	1	9	75	30	10	1300	-	-	-
-Armorslayer	Sword	1	8	80	0	9	1260	Armor	-	-
-Longsword	Sword	1	6	85	0	9	1260	Mount	-	-
-Lancereaver	Sword	1	9	75	5	7	1800	-	-	-
-Brave Sword	Sword	1	9	75	0	15	8000	-	-	-
-Audhulma	Sword	1	18	85	0	15	10000	-	-	Res 5
-Wo Dao	Sword	1	8	75	35	10	1200	-	-	-
-Durandal	Sword	1	17	90	0	10	-	-	Eliwood	Str 5	
-Sol Katti	Sword	1	12	95	25	15	-	Mount	Lyn	Res 5
-Sieglinde	Sword	1	16	90	0	15	-	-	Eirika	Str 5
-Falchion	Sword	1	15	90	20	15	-	-	Marth	Skl 5
-Ragnell	Sword	1-2	14	85	0	10	-	-	Ike	Def 5
-Sealed Sword	Sword	1-2	16	95	10	10	-	-	Roy	Res 5
-Log	Lance	1	1	100	0	20	1	-	-	-
-Iron Lance	Lance	1	7	80	0	22	360	-	-	-
-Steel Lance	Lance	1	10	70	0	15	480	-	-	-
-Silver Lance	Lance	1	14	75	0	10	1200	-	-	-
-Javelin	Lance	1-2	6	65	0	10	400	-	-	-
-Short Spear	Lance	1-2	9	60	0	9	900	-	-	-
-Killer Lance	Lance	1	10	70	30	10	1200	-	-	-
-Heavy Spear	Lance	1	9	70	0	8	1200	Armor	-	-
-Horseslayer	Lance	1	7	70	0	8	1040	Mount	-	-
-Axereaver	Lance	1	10	70	5	7	1950	-	-	-
-Brave Lance	Lance	1	10	70	0	15	7500	-	-	-
-Gradivus	Lance	1-2	15	85	0	15	10000	-	-	Def 5
-Siegmund	Lance	1	17	80	0	15	-	-	Ephraim	Str 5
+#Name	Type	Range	Mt	Hit	Crit	Uses	Worth	Effect	Pref	Mod	Class
+Tree Branch	Sword	1	1	100	0	20	1	-	-	-	-
+Iron Sword	Sword	1	5	90	0	23	460	-	-	-	-
+Steel Sword	Sword	1	8	75	0	15	600	-	-	-	-
+Silver Sword	Sword	1	13	80	0	10	1500	-	-	-	-
+Killing Edge	Sword	1	9	75	30	10	1300	-	-	-	Killer
+Armorslayer	Sword	1	8	80	0	9	1260	Armor	-	-	Slayer
+Longsword	Sword	1	6	85	0	9	1260	Mount	-	-	Slayer
+Lancereaver	Sword	1	9	75	5	7	1800	-	-	-	Reaver
+Brave Sword	Sword	1	9	75	0	15	8000	-	-	-	Brave
+Audhulma	Sword	1	18	85	0	15	10000	-	-	Res 5	Legend
+Wo Dao	Sword	1	8	75	35	10	1200	-	-	-	Killer
+Durandal	Sword	1	17	90	0	10	-	-	Eliwood	Str 5	-
+Sol Katti	Sword	1	12	95	25	15	-	Mount	Lyn	Res 5	-
+Sieglinde	Sword	1	16	90	0	15	-	-	Eirika	Str 5	-
+Falchion	Sword	1	15	90	20	15	-	-	Marth	Skl 5	-
+Ragnell	Sword	1-2	14	85	0	10	-	-	Ike	Def 5	-
+Sealed Sword	Sword	1-2	16	95	10	10	-	-	Roy	Res 5	-
+Log	Lance	1	1	100	0	20	1	-	-	-	-
+Iron Lance	Lance	1	7	80	0	22	360	-	-	-	-
+Steel Lance	Lance	1	10	70	0	15	480	-	-	-	-
+Silver Lance	Lance	1	14	75	0	10	1200	-	-	-	-
+Javelin	Lance	1-2	6	65	0	10	400	-	-	-	Throw
+Short Spear	Lance	1-2	9	60	0	9	900	-	-	-	Throw
+Killer Lance	Lance	1	10	70	30	10	1200	-	-	-	Killer
+Heavy Spear	Lance	1	9	70	0	8	1200	Armor	-	-	Slayer
+Horseslayer	Lance	1	7	70	0	8	1040	Mount	-	-	Slayer
+Axereaver	Lance	1	10	70	5	7	1950	-	-	-	Reaver
+Brave Lance	Lance	1	10	70	0	15	7500	-	-	-	Brave
+Gradivus	Lance	1-2	15	85	0	15	10000	-	-	Def 5	Legend
+Siegmund	Lance	1	17	80	0	15	-	-	Ephraim	Str 5	-
 #
-#Name	Type	Range	Mt	Hit	Crit	Uses	Worth	Effect	Pref	Mod
-Ladle	Axe	1	1	100	0	20	1	-	-	-
-Iron Axe	Axe	1	8	75	0	22	270	-	-	-
-Steel Axe	Axe	1	11	65	0	15	360	-	-	-
-Silver Axe	Axe	1	15	70	0	10	1000	-	-	-
-Hand Axe	Axe	1-2	7	60	0	10	300	-	-	-
-Tomahawk	Axe	1-2	13	65	0	7	3000	-	-	-
-Killer Axe	Axe	1	11	65	30	10	1000	-	-	-
-Hammer	Axe	1	10	55	0	10	800	Armor	-	-
-Halberd	Axe	1	10	60	0	8	810	Mount	-	-
-Swordreaver	Axe	1	11	65	5	7	2100	-	-	-
-Brave Axe	Axe	1	10	65	0	15	7500	-	-	-
-Garm	Axe	1	20	75	0	15	10000	-	-	Spd 5
-Armads	Axe	1	18	85	0	12	-	-	Hector	Def 5
-Iron Bow	Bow	2	6	85	0	22	540	Flier	-	-
-Steel Bow	Bow	2	9	70	0	15	720	Flier	-	-
-Silver Bow	Bow	2	13	75	0	10	1600	Flier	-	-
-Killer Bow	Bow	2	9	75	30	10	1400	Flier	-	-
-Brave Bow	Bow	2	10	70	0	15	7500	Flier	-	-
-Debug Short Bow	Bow	1-2	5	85	10	11	1760	Flier	-	-
-Longbow	Bow	2-3	5	65	0	10	2000	Flier	-	-
-Double Bow	Bow	2-3	18	85	5	12	10000	Flier	-	Str 5
-Bowgun	Crossbow	1-2	24	100	0	12	2000	Flier	-	-
-Crossbow	Crossbow	1-2	28	100	0	10	3000	Flier	-	-
-Aqqar	Crossbow	1-2	32	100	0	8	5000	Flier	-	-
-Arbalest	Crossbow	1-2	38	100	15	10	10000	Flier	-	-
-Fire	Anima	1-2	5	90	0	20	560	-	-	-
-Elfire	Anima	1-2	10	85	0	15	1200	-	-	-
-Fimbulvetr	Anima	1-2	13	80	0	10	6000	-	-	-
-Excalibur	Anima	1-2	18	90	10	15	15000	Flier	-	Spd 5
-Lightning	Light	1-2	4	95	5	17	630	-	-	-
-Divine	Light	1-2	8	85	10	12	2500	-	-	-
-Debug Purge	Light	3-10	10	70	5	2	3000	-	-	-
-Aura	Light	1-2	12	85	15	10	8000	-	-	-
-Aureola	Light	1-2	15	90	5	10	15000	-	-	Res 5
-Flux	Dark	1-2	7	80	0	22	900	-	-	-
-Eclipse	Dark	3-10	0	10	-900	2	4000	-	-	-
-Lunase	Dark	1-2	0	50	0	17	4200	-	-	-
-Nosferatu	Dark	1-2	10	70	0	10	3200	-	-	-
-Debug Fenrir	Dark	1-2	15	70	0	10	9000	-	-	-
-Ereshkigal	Dark	1-2	20	95	0	12	15000	-	-	Skl 5
-Heal	Staff	1	10	100	0	15	600	-	-	-
-Mend	Staff	1	20	100	0	10	1000	-	-	-
-Recover	Staff	1	99	100	0	7	2250	-	-	-
-Physic	Staff	1-Mag/2	10	100	0	4	7500	-	-	-
+#Name	Type	Range	Mt	Hit	Crit	Uses	Worth	Effect	Pref	Mod	Class
+Ladle	Axe	1	1	100	0	20	1	-	-	-	-
+Iron Axe	Axe	1	8	75	0	22	270	-	-	-	-
+Steel Axe	Axe	1	11	65	0	15	360	-	-	-	-
+Silver Axe	Axe	1	15	70	0	10	1000	-	-	-	-
+Hand Axe	Axe	1-2	7	60	0	10	300	-	-	-	Throw
+Tomahawk	Axe	1-2	13	65	0	7	3000	-	-	-	Throw
+Killer Axe	Axe	1	11	65	30	10	1000	-	-	-	Killer
+Hammer	Axe	1	10	55	0	10	800	Armor	-	-	Slayer
+Halberd	Axe	1	10	60	0	8	810	Mount	-	-	Slayer
+Swordreaver	Axe	1	11	65	5	7	2100	-	-	-	Reaver
+Brave Axe	Axe	1	10	65	0	15	7500	-	-	-	Brave
+Garm	Axe	1	20	75	0	15	10000	-	-	Spd 5	Legend
+Armads	Axe	1	18	85	0	12	-	-	Hector	Def 5	-
+Iron Bow	Bow	2	6	85	0	22	540	Flier	-	-	-
+Steel Bow	Bow	2	9	70	0	15	720	Flier	-	-	-
+Silver Bow	Bow	2	13	75	0	10	1600	Flier	-	-	-
+Killer Bow	Bow	2	9	75	30	10	1400	Flier	-	-	Killer
+Brave Bow	Bow	2	10	70	0	15	7500	Flier	-	-	Brave
+Debug Short Bow	Bow	1-2	5	85	10	11	1760	Flier	-	-	-
+Longbow	Bow	2-3	5	65	0	10	2000	Flier	-	-	-
+Double Bow	Bow	2-3	18	85	5	12	10000	Flier	-	Str 5	Legend
+Bowgun	Crossbow	1-2	24	100	0	12	2000	Flier	-	-	-
+Crossbow	Crossbow	1-2	28	100	0	10	3000	Flier	-	-	-
+Aqqar	Crossbow	1-2	32	100	0	8	5000	Flier	-	-	-
+Arbalest	Crossbow	1-2	38	100	15	10	10000	Flier	-	-	Legend
+Fire	Anima	1-2	5	90	0	20	560	-	-	-	-
+Elfire	Anima	1-2	10	85	0	15	1200	-	-	-	-
+Fimbulvetr	Anima	1-2	13	80	0	10	6000	-	-	-	-
+Excalibur	Anima	1-2	18	90	10	15	15000	Flier	-	Spd 5	Legend
+Lightning	Light	1-2	4	95	5	17	630	-	-	-	-
+Divine	Light	1-2	8	85	10	12	2500	-	-	-	0
+Debug Purge	Light	3-10	10	70	5	2	3000	-	-	-	Siege
+Aura	Light	1-2	12	85	15	10	8000	-	-	-	-
+Aureola	Light	1-2	15	90	5	10	15000	-	-	Res 5	Legend
+Flux	Dark	1-2	7	80	0	22	900	-	-	-	-
+Eclipse	Dark	3-10	0	10	-900	2	4000	-	-	-	Siege
+Lunase	Dark	1-2	0	50	0	17	4200	-	-	-	-
+Nosferatu	Dark	1-2	10	70	0	10	3200	-	-	-	-
+Debug Fenrir	Dark	1-2	15	70	0	10	9000	-	-	-	-
+Ereshkigal	Dark	1-2	20	95	0	12	15000	-	-	Skl 5	Legend
+Heal	Staff	1	10	100	0	15	600	-	-	-	Healing
+Mend	Staff	1	20	100	0	10	1000	-	-	-	Healing
+Recover	Staff	1	99	100	0	7	2250	-	-	-	Healing
+Physic	Staff	1-Mag/2	10	100	0	4	7500	-	-	-	Healing
 # Debug items
-Debug Sword	Sword	1	10	100	200	20	1000	-	-	-
-Debug Axe	Axe	1	10	100	200	20	1000	-	-	-
-Debug Bow	Bow	1-3	10	100	0	1	1000	-	-	-
-Debug Lance	Lance	1	10	100	200	20	1000	-	-	-
-Debug Javelin	Lance	1-2	10	100	200	20	1000	-	-	-
-Debug Noodle	Axe	1	1	100	0	2	9999	-	-	-	
-Debug Aether	Sword	1	1	100	-900	20	1000	-	-	Skl 999
\ No newline at end of file
+Debug Sword	Sword	1	10	100	200	20	1000	-	-	-	-
+Debug Axe	Axe	1	10	100	200	20	1000	-	-	-	-
+Debug Bow	Bow	1-3	10	100	0	1	1000	-	-	-	-
+Debug Lance	Lance	1	10	100	200	20	1000	-	-	-	-
+Debug Javelin	Lance	1-2	10	100	200	20	1000	-	-	-	-
+Debug Noodle	Axe	1	1	100	0	2	9999	-	-	-	-
+Debug Aether	Sword	1	1	100	-900	20	1000	-	-	Skl 999	-
\ No newline at end of file
diff --git a/src/net/fe/builderStage/ClientWaitStage.java b/src/net/fe/builderStage/ClientWaitStage.java
index 1f0c6dc..5364dcc 100644
--- a/src/net/fe/builderStage/ClientWaitStage.java
+++ b/src/net/fe/builderStage/ClientWaitStage.java
@@ -37,6 +37,7 @@ public ClientWaitStage(Session s) {
 		super("preparations");
 		start = false;
 		session = s;
+		
 	}
 	
 	/* (non-Javadoc)
diff --git a/src/net/fe/builderStage/ShopInventory.java b/src/net/fe/builderStage/ShopInventory.java
new file mode 100644
index 0000000..3827ceb
--- /dev/null
+++ b/src/net/fe/builderStage/ShopInventory.java
@@ -0,0 +1,154 @@
+package net.fe.builderStage;
+import java.util.Dictionary;
+import java.util.HashMap;
+import java.util.Map;
+
+import net.fe.builderStage.ShopInventory;
+import net.fe.modifier.Modifier;
+import net.fe.unit.Item;
+import net.fe.unit.Unit;
+import net.fe.unit.Weapon;
+
+public class ShopInventory {
+	private static ShopInventory obj;
+
+	private Map<String, Integer> inventory;
+	private Map<String, Integer> classInventory;
+
+	public ShopInventory(Iterable<Modifier> mods){
+		inventory = new HashMap<String, Integer>();
+		classInventory = new HashMap<String, Integer>();
+
+		for(Item i : Item.getAllItems()){
+			inventory.put(i.name, -1);
+			if(i.getItemClass() != "" && !inventory.containsKey(i.getItemClass())){
+				classInventory.put(i.getItemClass(), -1);
+			}
+		}
+
+		if(mods != null){
+
+			for(Modifier m : mods){
+				m.setShopLimits(inventory, classInventory);
+			}
+		}
+	}
+
+
+	/**
+	 * Takes the item name of the item the player is trying to buy.  Returns true and decrements the remaining
+	 * stock (both from class and item) if it succeeds, false if the weapon can't be bought.
+	 * 
+	 * @param itemName - The name of the item to buy
+	 * @return
+	 */
+	public boolean buyItem(Item item){
+		if(classInventory.get(item.getItemClass()) != null){
+
+			if(inventory.get(item.name) != 0 && classInventory.get(item.getItemClass()) != 0){
+				if(inventory.get(item.name) != -1){
+					inventory.put(item.name, inventory.get(item.name) - 1);
+				}
+
+				if(classInventory.get(item.getItemClass()) != -1){
+					classInventory.put(item.getItemClass(), classInventory.get(item.getItemClass())-1);
+				}
+
+				return true;
+			}
+			return false;
+		}
+		else{
+			if(inventory.get(item.name) != 0){
+				if(inventory.get(item.name) != -1){
+					inventory.put(item.name, inventory.get(item.name) - 1);
+				}
+
+				return true;
+			}
+			return false;
+		}
+	}
+
+	/**
+	 * Returns true if the item is still in stock, false otherwise.
+	 * 
+	 * @param itemName
+	 * @return
+	 */
+	public boolean itemInStock(Item item){
+		if(classInventory.get(item.getItemClass()) != null){
+			return ((inventory.get(item.name) != 0) && (classInventory.get(item.getItemClass()) != 0));
+
+		}
+		else{
+			return inventory.get(item.name) != 0;
+		}
+
+	}
+
+	/**
+	 * Returns the items that this unit has to the shop inventory.  Does not remove the items from
+	 * the unit!
+	 * 
+	 * @param unit
+	 */
+	public void refundItems(Unit unit){
+		System.out.println("Refunding items on: " + unit.name);
+		for(Item i : unit.getInventory()){
+			System.out.println("Refunding: " + i.name);
+			if(!(i instanceof Weapon && ((Weapon) i).pref != null)){
+				if(inventory.get(i.name) != -1){
+					System.out.println("+1 : " + i.name + " available");
+					inventory.put(i.name, inventory.get(i.name) + 1);					
+				}
+				if(classInventory.get(i.getItemClass()) != null && classInventory.get(i.getItemClass()) != -1){
+					System.out.println("+1 : " + i.getItemClass() + " available");
+					classInventory.put(i.getItemClass(), classInventory.get(i.getItemClass()) + 1);
+				}
+			}
+
+		}
+	}
+
+	/**
+	 * Increases the stock of a single item by 1.
+	 * 
+	 * @param item
+	 */
+	public void returnItem(Item item){
+		if(inventory.get(item.name) != -1){
+			inventory.put(item.name, inventory.get(item.name) + 1);
+		}
+		if(classInventory.get(item.getItemClass()) != null && classInventory.get(item.getItemClass()) != -1){
+			classInventory.put(item.getItemClass(), classInventory.get(item.getItemClass()) + 1);
+		}
+	}
+
+	/**
+	 * Takes in an item and returns the number currently available.  Returns -1 if there are infinitely many left.
+	 * 
+	 * @param itemName
+	 * @return
+	 */
+	public int countOf(Item item){
+		//If it has a class, check it.  Otherwise, return the individual value.
+		if(classInventory.get(item.getItemClass()) != null){
+
+			//If both are infinite, it's infinite
+			if(inventory.get(item.name) <= -1 && classInventory.get(item.getItemClass()) <= -1){
+				return -1;
+			}
+			//If one is -1, the other (higher) value should be returned.
+			if(inventory.get(item.name) <= -1 || classInventory.get(item.getItemClass()) <= -1){
+				return Math.max(inventory.get(item.name), classInventory.get(item.getItemClass()));
+			}
+			else{
+				return Math.min(inventory.get(item.name), classInventory.get(item.getItemClass()));
+			}
+		}
+		else{
+			return inventory.get(item.name);
+		}
+	}
+}
diff --git a/src/net/fe/builderStage/ShopMenu.java b/src/net/fe/builderStage/ShopMenu.java
index 78f00f2..705b801 100644
--- a/src/net/fe/builderStage/ShopMenu.java
+++ b/src/net/fe/builderStage/ShopMenu.java
@@ -9,6 +9,7 @@
 import net.fe.unit.Item;
 import net.fe.unit.ItemDisplay;
 import net.fe.unit.RiseTome;
+import net.fe.unit.Unit;
 import net.fe.unit.Weapon;
 import net.fe.unit.WeaponFactory;
 
@@ -31,6 +32,9 @@ public class ShopMenu extends Entity {
 	/** The shop icons. */
 	private Texture[] shopIcons;
 	
+	/** The shop inventory */
+	private ShopInventory shopInventory;
+	
 	/** The selected. */
 	private int selected;
 	
@@ -53,10 +57,12 @@ public class ShopMenu extends Entity {
 	 * @param y the y
 	 * @param s the s
 	 */
-	public ShopMenu(float x, float y, Set<Modifier> ms) {
+	public ShopMenu(float x, float y, Set<Modifier> ms, ShopInventory si) {
 		super(x, y);
+		System.out.println("new shop");
 		shops = new ItemMenu[9];
 		shopIcons = new Texture[9];
+		shopInventory = si;
 		for(int i = 0; i < shops.length; i++){
 			shops[i] = new ItemMenu(x + 140*i,y){{
 				drawCost = true;
@@ -149,6 +155,43 @@ public Item getItem(){
 		return getSelectedShop().getSelection().getItem().getCopy();
 	}
 	
+	/**
+	 * Reduce the number available by 1.  False if there isn't enough stock left.
+	 * 
+	 * @return
+	 */
+	public boolean buyItem(){
+		return shopInventory.buyItem(getSelectedShop().getSelection().getItem());
+	}
+	
+	/**
+	 * Returns true if the currently selected item can be gotten (if the inventory is present)
+	 * 
+	 * @return
+	 */
+	public boolean canGetItem(){
+		return shopInventory.itemInStock(getSelectedShop().getSelection().getItem());
+	}
+	
+	/**
+	 * Returns the item i to the shop's inventory.
+	 * 
+	 * @param i
+	 */
+	public void returnItem(Item i){
+		shopInventory.returnItem(i);
+	}
+	
+	
+	/**
+	 * Returns all items possessed by this unit to the shop's inventory.
+	 * 
+	 * @param u
+	 */
+	public void massReturnItem(Unit u){
+		shopInventory.refundItems(u);
+	}
+	
 	/**
 	 * Left.
 	 */
diff --git a/src/net/fe/builderStage/TeamBuilderStage.java b/src/net/fe/builderStage/TeamBuilderStage.java
index 93cafc3..e5d2197 100644
--- a/src/net/fe/builderStage/TeamBuilderStage.java
+++ b/src/net/fe/builderStage/TeamBuilderStage.java
@@ -38,58 +38,64 @@
  * The Class TeamBuilderStage.
  */
 public class TeamBuilderStage extends Stage {
-	
+
 	/** The units. */
 	private List<Unit> units;
-	
+
 	/** The cursor. */
 	private Cursor cursor;
-	
+
 	/** The repeat timers. */
 	private final float[] repeatTimers;
-	
+
 	/** The funds. */
 	private int funds;
-	
+
 	/** The exp. */
 	private int exp;
-	
+
 	/** The select. */
 	private final TeamSelectionStage select;
-	
+
 	/** The buttons. */
 	private final List<Button> buttons;
-	
+
 	/** The curr button. */
 	private int currButton;
-	
+
 	/** The session. */
 	private Session session;
-	
+
 	/** The control. */
 	private boolean control = true;
-	
+
 	/** The controls. */
 	private final ControlsDisplay controls;
-	
+
 	/** The can edit units. */
 	private final boolean canEditUnits;
-	
+
+
 	/** The hgap. */
 	//CONFIG
 	private final static int name = 30, clazz = 100, lv = 170, hgap = 30; //xvals
-	
+
 	/** The table_ystart. */
 	private final static int yStart = 40, vgap = 20, table_ystart = 10;
-	
+
 	/** The default maximum funds */
 	public final static int FUNDS = 48000;
-	
+
 	/** The default maximum EXP */
 	public final static int EXP = 84000;
-	
-	
-	
+
+	/**
+	 * Shop inventory. Needed for when units are deleted.
+	 */
+	public ShopInventory shopInventory;
+
+
+
 	/**
 	 * Instantiates a new team builder stage.
 	 *
@@ -103,9 +109,16 @@ public TeamBuilderStage(boolean toMainMenu, List<Unit> presetUnits, Session s) {
 		addEntity(new RunesBg(new Color(0xd2b48c)));
 		session = s;
 		canEditUnits = (presetUnits == null);
-		
+
 		Button end;
-		
+
+		if(s != null){
+			shopInventory = new ShopInventory(s.getModifiers());
+		}
+		else{
+			shopInventory = new ShopInventory(null);
+		}
+
 		controls = new ControlsDisplay();
 		controls.addControl("Z", "Items/Train");
 		controls.addControl("X", "Back");
@@ -115,7 +128,7 @@ public TeamBuilderStage(boolean toMainMenu, List<Unit> presetUnits, Session s) {
 			controls.addControl("Enter", "Fight!");
 		}
 		addEntity(controls);
-		
+
 		if(!toMainMenu) {
 			end = new Button(390, 270, "Fight!", Color.green, 80){
 				@Override
@@ -155,21 +168,21 @@ public void cancel(){
 			};
 		}
 		addEntity(end);
-		
+
 		if(canEditUnits) {
 			select = new TeamSelectionStage(this, s);
 			units = new ArrayList<Unit>();
 			setUnits(select.getSelectedUnits());
-			
+
 			Button save = new Button(220, 270, "Save", Color.blue, 80){
 				@Override
 				public void execute() {
 					new TeamNameInput(true).setStage(TeamBuilderStage.this);
 				}
-				
+
 			};
 			addEntity(save);
-			
+
 			Button load = new Button(305, 270, "Load", Color.blue, 80){
 				@Override
 				public void execute() {
@@ -177,7 +190,7 @@ public void execute() {
 				}
 			};
 			addEntity(load);
-			
+
 			Button back = new Button(10,270, "Back to Unit Selection", Color.red, 120){
 				public void execute() {
 					AudioPlayer.playAudio("cancel");
@@ -186,14 +199,14 @@ public void execute() {
 				}
 			};
 			addEntity(back);
-			
+
 			buttons = Arrays.asList( end, back, save, load );
 		} else {
 			select = null;
 			units = presetUnits;
 			buttons = Arrays.asList( end );
 		}
-		
+
 		TeamBuilderResources res = new TeamBuilderResources(FUNDS, EXP);
 		if(session != null) {
 			for(Modifier m : session.getModifiers()) {
@@ -202,11 +215,11 @@ public void execute() {
 		}
 		this.setFunds(res.funds);
 		this.setExp(res.exp);
-		
+
 		cursor = new Cursor(9, yStart-4, 462, vgap, units.size());
 		cursor.on = true;
 		addEntity(cursor);
-		
+
 		int y = yStart;
 		float d = 0.1f;
 		for(Unit u: units){
@@ -215,21 +228,40 @@ public void execute() {
 			d-=0.001f;
 		}
 	}
-	
-	
-	
+
+
+
 	/**
 	 * Sets the units.
 	 *
 	 * @param units the new units
 	 */
 	public void setUnits(List<Unit> units){
+
+		//I know it seems strange that this is out here and not in the for loop below, but it wasn't recognizing
+		//the units' inventories in that one.  No idea why.
+		for(Unit u : this.units){
+			if(!(units.contains(u))){
+				shopInventory.refundItems(u);
+			}
+		}
+
 		this.units.removeAll(units);
 		for(Unit u: this.units){
 			funds += u.squeezeGold();
 			exp += u.squeezeExp();
+
 		}
 		this.units = units;
+		if(session != null){
+
+			System.out.println("Session isn't null");
+			for(Modifier m : session.getModifiers()) {
+
+				System.out.println("Modifier: " + m.toString());
+				m.initBuilderUnits(units);
+			}
+		}
 		for(Entity e: entities){
 			if(e instanceof UnitIcon) e.destroy();
 		}
@@ -240,21 +272,22 @@ public void setUnits(List<Unit> units){
 			y+=vgap;
 			d-=0.001f;
 		}
+
 	}
-	
+
 	/* (non-Javadoc)
 	 * @see chu.engine.Stage#render()
 	 */
 	@Override
 	public void render() {
-		
+
 		List<String> stats = Arrays.asList(
-			"Lvl", "HP", "Str", "Mag", "Skl", "Spd", "Lck", "Def", "Res", "Mov"
-		);
-		
+				"Lvl", "HP", "Str", "Mag", "Skl", "Spd", "Lck", "Def", "Res", "Mov"
+				);
+
 		Renderer.drawBorderedRectangle(9, table_ystart-2, 471, table_ystart+14, 0.9f, 
 				FightStage.NEUTRAL, FightStage.BORDER_LIGHT, FightStage.BORDER_DARK);
-		
+
 		Renderer.drawString("default_med", "Name", name, table_ystart, 0.5f);
 		Renderer.drawString("default_med", "Class", clazz, table_ystart, 0.5f);
 		int x = lv;
@@ -262,11 +295,11 @@ public void render() {
 			Renderer.drawString("default_med", s, x, table_ystart, 0.5f);
 			x+= hgap;
 		}
-		
+
 		Renderer.drawBorderedRectangle(
 				9, yStart-6, 471, yStart + vgap * units.size()-2, 0.9f, 
 				FightStage.NEUTRAL, FightStage.BORDER_LIGHT, FightStage.BORDER_DARK);
-		
+
 		int y = yStart;
 		for(Unit u: units){
 			Renderer.drawString("default_med", u.name, name, y, 0.5f);
@@ -299,19 +332,19 @@ public void beginStep(List<Message> messages) {
 			if (Keyboard.isKeyDown(FEResources.getKeyMapped(Keyboard.KEY_UP)) && repeatTimers[0] == 0) {
 				repeatTimers[0] = 0.15f;
 				if(control)
-				if(!cursor.on){
-					buttons.get(currButton).setHover(false);
-					cursor.on = true;
-					cursor.index = cursor.max - 1;
-					cursor.instant = true;
-					controls.set("Z", "Items/Train");
-				}else if(cursor.index == 0){
-					cursor.on = false;
-					controls.set("Z", "Select");
-					buttons.get(currButton).setHover(true);
-				} else {
-					cursor.up();
-				}
+					if(!cursor.on){
+						buttons.get(currButton).setHover(false);
+						cursor.on = true;
+						cursor.index = cursor.max - 1;
+						cursor.instant = true;
+						controls.set("Z", "Items/Train");
+					}else if(cursor.index == 0){
+						cursor.on = false;
+						controls.set("Z", "Select");
+						buttons.get(currButton).setHover(true);
+					} else {
+						cursor.up();
+					}
 				AudioPlayer.playAudio("cursor2");
 			}
 			if (Keyboard.isKeyDown(FEResources.getKeyMapped(Keyboard.KEY_DOWN)) && repeatTimers[1] == 0) {
@@ -356,12 +389,12 @@ public void beginStep(List<Message> messages) {
 					if(ke.key == FEResources.getKeyMapped(Keyboard.KEY_Z)) {
 						AudioPlayer.playAudio("select");
 						if(cursor.on){
-							FEMultiplayer.setCurrentStage(new UnitBuilderStage(units.get(cursor.getIndex()), this, session));
+							FEMultiplayer.setCurrentStage(new UnitBuilderStage(units.get(cursor.getIndex()), this, session, shopInventory));
 						} else {
 							buttons.get(currButton).setHover(false);
 							buttons.get(currButton).execute();
 						}
-						
+
 					} else if (ke.key == FEResources.getKeyMapped(Keyboard.KEY_X)){
 						if(canEditUnits) {
 							AudioPlayer.playAudio("cancel");
@@ -372,10 +405,10 @@ public void beginStep(List<Message> messages) {
 						AudioPlayer.playAudio("select");
 						buttons.get(0).execute();
 					}
-						
+
 				}
 			}
-		
+
 			for(int i=0; i<repeatTimers.length; i++) {
 				if(repeatTimers[i] > 0) {
 					repeatTimers[i] -= Game.getDeltaSeconds();
@@ -395,7 +428,7 @@ public void onStep() {
 		}
 		processAddStack();
 		processRemoveStack();
-		
+
 	}
 
 	/* (non-Javadoc)
@@ -458,7 +491,7 @@ public void refresh() {
 		}
 		addEntity(cursor);
 	}
-	
+
 	/**
 	 * Save team.
 	 *
@@ -488,10 +521,10 @@ public boolean saveTeam(String teamName){
 			controls.setTempMessage("Could not save team [" + teamName + "].", 3.2f);
 			return false;
 		}
-		
-		
+
+
 	}
-	
+
 	/**
 	 * Load team.
 	 *
@@ -561,7 +594,7 @@ public boolean loadTeam(String teamName){
 		}
 		setUnits(select.getSelectedUnits());
 		refresh();
-		
+
 		return true;
 	}
 
@@ -617,7 +650,7 @@ public Cursor(int x, int y, int width, int height, int max) {
 		renderDepth = 0.6f;
 		this.max = max;
 	}
-	
+
 	public void onStep(){
 		int supposedY = initialY + index*height;
 		if(instant){
@@ -631,7 +664,7 @@ public void onStep(){
 			}
 		}
 	}
-	
+
 	public void render(){
 		if(on){
 			if(max == 0)
@@ -640,7 +673,7 @@ public void render(){
 				Renderer.drawRectangle(x, y, x+width, y+height, renderDepth, new Color(128,128,213,128));
 		}
 	}
-	
+
 	public void up(){
 		if(max == 0) return;
 		index--;
@@ -649,7 +682,7 @@ public void up(){
 			instant = true;
 		}
 	}
-	
+
 	public void down(){
 		if(max == 0) return;
 		index++;
@@ -658,13 +691,13 @@ public void down(){
 			instant = true;
 		}
 	}
-	
+
 	public int getIndex(){
 		return index;
 	}
-	
+
 	public void setIndex(int i){
 		index = i;
 	}
-	
+
 }
\ No newline at end of file
diff --git a/src/net/fe/builderStage/TeamSelectionStage.java b/src/net/fe/builderStage/TeamSelectionStage.java
index 1bc714d..0cc7b15 100644
--- a/src/net/fe/builderStage/TeamSelectionStage.java
+++ b/src/net/fe/builderStage/TeamSelectionStage.java
@@ -108,7 +108,9 @@ public TeamSelectionStage(TeamBuilderStage stage, Session s){
 		addEntity(vassalList);
 		ok = new Button(OK_BUTTON_X, BUTTON_Y, "OK", Color.green, 95) {
 			public void execute() {
-				builderStage.setUnits(getSelectedUnits());
+				List<Unit> units = getSelectedUnits();
+
+				builderStage.setUnits(units);
 				builderStage.refresh();
 				FEMultiplayer.setCurrentStage(builderStage);
 			}
@@ -194,6 +196,7 @@ public List<Unit> getSelectedUnits(){
 		ArrayList<Unit> units = new ArrayList<Unit>();
 		units.addAll(lordList.getSelectedUnits());
 		units.addAll(vassalList.getSelectedUnits());
+
 		
 		return units;
 	}
diff --git a/src/net/fe/builderStage/UnitBuilderStage.java b/src/net/fe/builderStage/UnitBuilderStage.java
index f2c7858..2a801b2 100644
--- a/src/net/fe/builderStage/UnitBuilderStage.java
+++ b/src/net/fe/builderStage/UnitBuilderStage.java
@@ -39,38 +39,39 @@
  * The Class UnitBuilderStage.
  */
 public class UnitBuilderStage extends Stage {
-	
+
 	/** The unit. */
 	private Unit unit;
-	
+
 	/** The shop. */
 	private ShopMenu shop;
-	
+
 	/** The inv. */
 	private InventoryMenu inv;
-	
+
 	/** The repeat timers. */
 	private float[] repeatTimers = new float[4];
-	
+
 	/** The back. */
 	private TeamBuilderStage back;
-	
+
 	/** The state. */
 	private State state;
-	
+
 	/** The level down. */
 	private Button levelUp, levelDown;
-	
+
 	/** The controls. */
 	private ControlsDisplay controls;
 	
+
 	/** The Constant INFO_H. */
 	//CONFIG
 	public static final int
 	INVENTORY_X = 30, INVENTORY_Y = 115, SHOP_X = 335, SHOP_Y = 20, 
 	LEVEL_X = 175, LEVEL_Y = 115,
 	INFO_X = 7, INFO_Y = 236, INFO_W = 316, INFO_H = 56;
-	
+
 	/**
 	 * Instantiates a new unit builder stage.
 	 *
@@ -78,7 +79,7 @@ public class UnitBuilderStage extends Stage {
 	 * @param s the s
 	 * @param session the session
 	 */
-	public UnitBuilderStage(Unit u, TeamBuilderStage s, Session session){
+	public UnitBuilderStage(Unit u, TeamBuilderStage s, Session session, ShopInventory si){
 		super("preparations");
 		addEntity(new RunesBg(new Color(0xd2b48c)));
 		back = s;
@@ -88,30 +89,30 @@ public UnitBuilderStage(Unit u, TeamBuilderStage s, Session session){
 			setWidth(135);
 		}};
 		addEntity(inv);
-		
+
 		controls = new ControlsDisplay();
 		controls.addControl("Z", "Buy");
 		controls.addControl("X", "Back");
 		addEntity(controls);
-		
+
 		UnitInfo ui = new UnitInfo(5,5);
 		ui.setUnit(u);
 		addEntity(ui);
-		
-		shop = new ShopMenu(SHOP_X, SHOP_Y, (session != null ? session.getModifiers() : java.util.Collections.emptySet()));
+
+		shop = new ShopMenu(SHOP_X, SHOP_Y, (session != null ? session.getModifiers() : java.util.Collections.emptySet()),si);
 		shop.clearSelection();
-		
+
 		addEntity(shop);
-		
+
 		levelUp = new Button(LEVEL_X, LEVEL_Y, "Level Up", Color.green, 135){
 			public void onStep(){
 				String exp =  Unit.getExpCost(unit.getLevel() + 1)+"";
-				if(unit.getLevel() == 20)
+				if(unit.getLevel() == unit.getMaxLv())
 					exp = "--";
 				text = "Level Up: " +exp + " EXP";
 			}
 			public void execute() {
-				if(unit.getLevel() != 20){
+				if(unit.getLevel() != unit.getMaxLv()){
 					int cost = Unit.getExpCost(unit.getLevel() + 1);
 					if(cost <= back.getExp()){
 						unit.setLevel(unit.getLevel() + 1);
@@ -123,25 +124,25 @@ public void execute() {
 		levelDown = new Button(LEVEL_X, LEVEL_Y + 24, "Level Down", Color.red, 135){
 			public void onStep(){
 				String exp =  Unit.getExpCost(unit.getLevel())+"";
-				if(unit.getLevel() == 1)
+				if(unit.getLevel() == unit.getMinLv())
 					exp = "--";
 				text = "Level Down: " + exp + " EXP";
 			}
 			public void execute() {
-				if(unit.getLevel() != 1){
+				if(unit.getLevel() != unit.getMinLv()){
 					int cost = Unit.getExpCost(unit.getLevel());
 					unit.setLevel(unit.getLevel()-1);
 					back.setExp(back.getExp() + cost);
 				}
 			}
 		};;
-		
+
 		addEntity(levelUp);
 		addEntity(levelDown);
-		
+
 		state = new Normal();
 	}
-	
+
 	/* (non-Javadoc)
 	 * @see chu.engine.Stage#render()
 	 */
@@ -156,7 +157,7 @@ public void render(){
 		Renderer.drawString("default_med", "EXP: " + back.getExp(), LEVEL_X+135-width, LEVEL_Y + 50, 0);
 		state.render();
 	}
-	
+
 	/* (non-Javadoc)
 	 * @see chu.engine.Stage#beginStep()
 	 */
@@ -199,17 +200,17 @@ public void beginStep(List<Message> messages) {
 					state.cancel();
 					state.updateControls();
 				}
-					
+
 			}
 		}
-	
+
 		for(int i=0; i<repeatTimers.length; i++) {
 			if(repeatTimers[i] > 0) {
 				repeatTimers[i] -= Game.getDeltaSeconds();
 				if(repeatTimers[i] < 0) repeatTimers[i] = 0;
 			}
 		}
-		
+
 	}
 
 	/* (non-Javadoc)
@@ -222,7 +223,7 @@ public void onStep() {
 		}
 		processAddStack();
 		processRemoveStack();
-		
+
 	}
 
 	/* (non-Javadoc)
@@ -236,7 +237,7 @@ public void endStep() {
 		processAddStack();
 		processRemoveStack();
 	}
-	
+
 	/**
 	 * Render item.
 	 *
@@ -259,7 +260,7 @@ public void renderItem(Item i){
 			Renderer.drawString("default_med", "Hit " + wep.hit, INFO_X+68, INFO_Y+20, 1);
 			Renderer.drawString("default_med", "Crit " + wep.crit, INFO_X+128, INFO_Y+20, 1);
 			Renderer.drawString("default_med", "Rng " + wep.range.toString(), INFO_X+ 188, INFO_Y+20, 1);
-			
+
 			ArrayList<String> flavor = new ArrayList<String>();
 			if(wep.type == Weapon.Type.CROSSBOW) {
 				flavor.add("A Crossbow");
@@ -315,7 +316,7 @@ public void renderItem(Item i){
 				if(effText.length() != 0)
 					flavor.add("Effective against " + effText.substring(2) + " units");
 			}
-			
+
 			if(flavor.size() != 0){
 				String flavorText = "";
 				for(String s: flavor){
@@ -325,58 +326,58 @@ public void renderItem(Item i){
 			}
 		}
 	}
-	
+
 	/**
 	 * The Class State.
 	 */
 	private abstract class State{
-		
+
 		/**
 		 * Up.
 		 */
 		public abstract void up();
-		
+
 		/**
 		 * Down.
 		 */
 		public abstract void down();
-		
+
 		/**
 		 * Left.
 		 */
 		public abstract void left();
-		
+
 		/**
 		 * Right.
 		 */
 		public abstract void right();
-		
+
 		/**
 		 * Select.
 		 */
 		public abstract void select();
-		
+
 		/**
 		 * Cancel.
 		 */
 		public abstract void cancel();
-		
+
 		/**
 		 * Render.
 		 */
 		public abstract void render();
-		
+
 		/**
 		 * Update controls.
 		 */
 		public abstract void updateControls();
 	}
-	
+
 	/**
 	 * The Class Normal.
 	 */
 	private class Normal extends State {
-		
+
 		/* (non-Javadoc)
 		 * @see net.fe.builderStage.UnitBuilderStage.State#up()
 		 */
@@ -460,7 +461,7 @@ public void right() {
 		 */
 		@Override
 		public void select() {
-			
+
 			if(levelUp.hovered()){
 				AudioPlayer.playAudio("select");
 				levelUp.execute();
@@ -472,6 +473,7 @@ public void select() {
 					AudioPlayer.playAudio("cancel");
 					Item i = inv.getSelection().getItem();
 					if(!(i instanceof Weapon && ((Weapon) i).pref != null)){
+						shop.returnItem(i);
 						back.setFunds(back.getFunds() + i.getCost());
 						unit.removeFromInventory(i);
 					}
@@ -492,7 +494,7 @@ public void cancel() {
 			AudioPlayer.playAudio("cancel");
 			FEMultiplayer.setCurrentStage(back);
 		}
-		
+
 		/* (non-Javadoc)
 		 * @see net.fe.builderStage.UnitBuilderStage.State#render()
 		 */
@@ -524,7 +526,7 @@ public void render(){
 				Renderer.drawString("default_med", "Equips: " + wepText.substring(2), INFO_X+8, INFO_Y+36, 1);
 			}
 		}
-		
+
 		/* (non-Javadoc)
 		 * @see net.fe.builderStage.UnitBuilderStage.State#updateControls()
 		 */
@@ -538,14 +540,14 @@ public void updateControls(){
 				controls.set("Z", "Sell");
 			}
 		}
-		
+
 	}
-	
+
 	/**
 	 * The Class Shop.
 	 */
 	private class Shop extends State{
-		
+
 		/* (non-Javadoc)
 		 * @see net.fe.builderStage.UnitBuilderStage.State#up()
 		 */
@@ -587,11 +589,15 @@ public void right() {
 		 */
 		@Override
 		public void select() {
-			Item i = shop.getItem();
-			if(i.getCost() <= back.getFunds()){
-				back.setFunds(back.getFunds() - i.getCost());
-				unit.addToInventory(i);
-				cancel();
+			if(shop.canGetItem()){
+
+				Item i = shop.getItem();
+				if(i != null && i.getCost() <= back.getFunds()){
+					back.setFunds(back.getFunds() - i.getCost());
+					shop.buyItem();
+					unit.addToInventory(i);
+					cancel();
+				}
 			}
 		}
 
@@ -605,7 +611,7 @@ public void cancel() {
 			shop.clearSelection();
 			state = new Normal();
 		}
-		
+
 		/* (non-Javadoc)
 		 * @see net.fe.builderStage.UnitBuilderStage.State#render()
 		 */
@@ -614,7 +620,7 @@ public void render(){
 					FightStage.NEUTRAL, FightStage.BORDER_LIGHT, FightStage.BORDER_DARK);
 			renderItem(shop.getItem());
 		}
-		
+
 		/* (non-Javadoc)
 		 * @see net.fe.builderStage.UnitBuilderStage.State#updateControls()
 		 */
@@ -622,6 +628,6 @@ public void updateControls(){
 			controls.set("Z", "Buy");
 			controls.set("X", "Cancel");
 		}
-		
+
 	}
 }
diff --git a/src/net/fe/modifier/DivineIntervention.java b/src/net/fe/modifier/DivineIntervention.java
index 073a03c..e5c21cf 100644
--- a/src/net/fe/modifier/DivineIntervention.java
+++ b/src/net/fe/modifier/DivineIntervention.java
@@ -1,5 +1,7 @@
 package net.fe.modifier;
 
+import java.util.Map;
+
 import net.fe.builderStage.ShopMenu;
 import net.fe.builderStage.TeamBuilderResources;
 import net.fe.builderStage.TeamSelectionStage;
@@ -59,4 +61,16 @@ public String toString() {
 	public String getDescription() {
 		return "All units have a version of Miracle that is guarenteed to activate.";
 	}
+
+	@Override
+	public void initBuilderUnits(Iterable<Unit> units) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void setShopLimits(Map<String, Integer> inventory, Map<String, Integer> classInventory) {
+		// TODO Auto-generated method stub
+		
+	}
 }
diff --git a/src/net/fe/modifier/MadeInChina.java b/src/net/fe/modifier/MadeInChina.java
index 519ba72..1fd496c 100644
--- a/src/net/fe/modifier/MadeInChina.java
+++ b/src/net/fe/modifier/MadeInChina.java
@@ -1,5 +1,7 @@
 package net.fe.modifier;
 
+import java.util.Map;
+
 import net.fe.builderStage.ShopMenu;
 import net.fe.builderStage.TeamBuilderResources;
 import net.fe.builderStage.TeamSelectionStage;
@@ -66,4 +68,16 @@ public String getDescription() {
 		return "All weapons have greatly reduced durability. Start with extra gold.";
 	}
 
+	@Override
+	public void initBuilderUnits(Iterable<Unit> units) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void setShopLimits(Map<String, Integer> inventory, Map<String, Integer> classInventory) {
+		// TODO Auto-generated method stub
+		
+	}
+
 }
diff --git a/src/net/fe/modifier/Modifier.java b/src/net/fe/modifier/Modifier.java
index a5b1df0..3944301 100644
--- a/src/net/fe/modifier/Modifier.java
+++ b/src/net/fe/modifier/Modifier.java
@@ -1,6 +1,7 @@
 package net.fe.modifier;
 
 import java.io.Serializable;
+import java.util.Map;
 
 import net.fe.builderStage.ShopMenu;
 import net.fe.builderStage.TeamBuilderResources;
@@ -42,11 +43,24 @@ public interface Modifier extends Serializable{
 	 */
 	public void initOverworldUnits(Iterable<Unit> units);
 	
+	/**
+	 * Modifies a list of units; for use immediately before team building.
+	 * 
+	 * @param units
+	 */
+	public void initBuilderUnits(Iterable<Unit> units);
+	
 	/**
 	 * Gets the description.
 	 *
 	 * @return the description
 	 */
 	public String getDescription();
+	
+	/**
+	 * Sets the limits on items in the shop.  -1 is no limit.
+	 * @param classInventory 
+	 */
+	public void setShopLimits(Map<String, Integer> inventory, Map<String, Integer> classInventory);
 
 }
diff --git a/src/net/fe/modifier/ProTactics.java b/src/net/fe/modifier/ProTactics.java
index 1b362a2..bb0b57f 100644
--- a/src/net/fe/modifier/ProTactics.java
+++ b/src/net/fe/modifier/ProTactics.java
@@ -1,6 +1,9 @@
 package net.fe.modifier;
 
 import net.fe.modifier.Pavise;
+
+import java.util.Map;
+
 import net.fe.builderStage.ShopMenu;
 import net.fe.builderStage.TeamBuilderResources;
 import net.fe.builderStage.TeamSelectionStage;
@@ -38,4 +41,16 @@ public String getDescription() {
 		return "Halves damage to better emulate traditional GBA games. All units get 100%Pavise.";
 	}
 
+	@Override
+	public void initBuilderUnits(Iterable<Unit> units) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void setShopLimits(Map<String, Integer> inventory, Map<String, Integer> classInventory) {
+		// TODO Auto-generated method stub
+		
+	}
+
 }
diff --git a/src/net/fe/modifier/SuddenDeath.java b/src/net/fe/modifier/SuddenDeath.java
index 7a87a09..e1a4d04 100644
--- a/src/net/fe/modifier/SuddenDeath.java
+++ b/src/net/fe/modifier/SuddenDeath.java
@@ -1,5 +1,7 @@
 package net.fe.modifier;
 
+import java.util.Map;
+
 import net.fe.builderStage.ShopMenu;
 import net.fe.builderStage.TeamBuilderResources;
 import net.fe.builderStage.TeamSelectionStage;
@@ -60,4 +62,16 @@ public String toString() {
 		return "Sudden Death";
 	}
 
+	@Override
+	public void initBuilderUnits(Iterable<Unit> units) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void setShopLimits(Map<String, Integer> inventory, Map<String, Integer> classInventory) {
+		// TODO Auto-generated method stub
+		
+	}
+
 }
diff --git a/src/net/fe/modifier/TournamentRules.java b/src/net/fe/modifier/TournamentRules.java
new file mode 100644
index 0000000..34f4015
--- /dev/null
+++ b/src/net/fe/modifier/TournamentRules.java
@@ -0,0 +1,85 @@
+package net.fe.modifier;
+
+import java.util.Map;
+
+import net.fe.builderStage.ShopMenu;
+import net.fe.builderStage.TeamBuilderResources;
+import net.fe.builderStage.TeamSelectionStage;
+import net.fe.overworldStage.OverworldStage;
+import net.fe.unit.Unit;
+import net.fe.unit.Item;
+
+public class TournamentRules implements Modifier {
+	public final int newFunds = 48000;
+	public final int newExp = 26400;
+	public final int minLevel = 10;
+	public final int maxLevel = 20;
+
+	@Override
+	public TeamBuilderResources modifyTeamResources(TeamBuilderResources limits) {
+		return limits.copyWithNewExp(newExp).copyWithNewFunds(newFunds);
+	}
+
+	@Override
+	public Iterable<Item> modifyShop(Iterable<Item> shop) {
+		return shop;
+	}
+
+	@Override
+	public void initOverworldUnits(Iterable<Unit> units) {
+
+	}
+
+	@Override
+	public String toString() {
+		return "Tournament ruleset";
+	}
+
+	@Override
+	public String getDescription() {
+		return "A balance-improving tournament ruleset (temporary while I figure out how to make this work"
+				+ "customizably";
+	}
+
+	@Override
+	public void initBuilderUnits(Iterable<Unit> units) {
+		for(Unit u : units){
+			u.setMinLv(minLevel);
+			u.setMaxLv(maxLevel);
+		}
+		
+	}
+
+	@Override
+	public void setShopLimits(Map<String, Integer> inventory, Map<String, Integer> classInventory) {
+		
+		//1 longbow, for demonstration purposes
+		for(String key : inventory.keySet()){
+			if(key.equals("Longbow")){
+				inventory.put(key, 1);
+			}
+		}
+		
+		//item classes
+		for(String key : classInventory.keySet()){
+			//1 killing weapon, 3 slaying weapons, 2 reavers, no braves or legends
+			if(key.equals("Killer")){
+				classInventory.put(key, 1);
+			}
+
+			if(key.equals("Slayer")){
+				classInventory.put(key, 3);
+			}
+			
+			if(key.equals("Reaver")){
+				classInventory.put(key, 2);
+			}
+
+			if(key.equals("Brave") || key.equals("Legend")){
+				classInventory.put(key, 0);
+			}
+		}
+		
+	}
+
+}
diff --git a/src/net/fe/modifier/Treasury.java b/src/net/fe/modifier/Treasury.java
index 4613bc1..2d1ffa6 100644
--- a/src/net/fe/modifier/Treasury.java
+++ b/src/net/fe/modifier/Treasury.java
@@ -1,5 +1,7 @@
 package net.fe.modifier;
 
+import java.util.Map;
+
 import net.fe.builderStage.ShopMenu;
 import net.fe.builderStage.TeamBuilderResources;
 import net.fe.unit.Item;
@@ -54,4 +56,16 @@ public String getDescription() {
 		return "Start with the maximum amount of gold.";
 	}
 
+	@Override
+	public void initBuilderUnits(Iterable<Unit> units) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void setShopLimits(Map<String, Integer> inventory, Map<String, Integer> classInventory) {
+		// TODO Auto-generated method stub
+		
+	}
+
 }
diff --git a/src/net/fe/modifier/Vegas.java b/src/net/fe/modifier/Vegas.java
index 3e2581b..accf61b 100644
--- a/src/net/fe/modifier/Vegas.java
+++ b/src/net/fe/modifier/Vegas.java
@@ -1,5 +1,7 @@
 package net.fe.modifier;
 
+import java.util.Map;
+
 import net.fe.builderStage.ShopMenu;
 import net.fe.builderStage.TeamBuilderResources;
 import net.fe.unit.Item;
@@ -54,6 +56,18 @@ public String getDescription() {
 	public String toString() {
 		return "Vegas";
 	}
+
+	@Override
+	public void initBuilderUnits(Iterable<Unit> units) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void setShopLimits(Map<String, Integer> inventory, Map<String, Integer> classInventory) {
+		// TODO Auto-generated method stub
+		
+	}
 	
 
 }
diff --git a/src/net/fe/modifier/Veterans.java b/src/net/fe/modifier/Veterans.java
index ac1ce6f..7f6af8b 100644
--- a/src/net/fe/modifier/Veterans.java
+++ b/src/net/fe/modifier/Veterans.java
@@ -1,5 +1,7 @@
 package net.fe.modifier;
 
+import java.util.Map;
+
 import net.fe.builderStage.ShopMenu;
 import net.fe.builderStage.TeamBuilderResources;
 import net.fe.unit.Item;
@@ -51,5 +53,17 @@ public String getDescription() {
 	public String toString() {
 		return "Veterans";
 	}
+
+	@Override
+	public void initBuilderUnits(Iterable<Unit> units) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void setShopLimits(Map<String, Integer> inventory, Map<String, Integer> classInventory) {
+		// TODO Auto-generated method stub
+		
+	}
 	
 }
diff --git a/src/net/fe/network/FEServer.java b/src/net/fe/network/FEServer.java
index 223470f..3bf2aa5 100644
--- a/src/net/fe/network/FEServer.java
+++ b/src/net/fe/network/FEServer.java
@@ -49,6 +49,7 @@
 import net.fe.modifier.Modifier;
 import net.fe.modifier.ProTactics;
 import net.fe.modifier.SuddenDeath;
+import net.fe.modifier.TournamentRules;
 import net.fe.modifier.Treasury;
 import net.fe.modifier.Vegas;
 import net.fe.modifier.Veterans;
@@ -113,6 +114,7 @@ public static void main(String[] args) {
 		unselectedModifiersModel.addElement(new SuddenDeath());
 		unselectedModifiersModel.addElement(new Vegas());
 		unselectedModifiersModel.addElement(new ProTactics());
+		unselectedModifiersModel.addElement(new TournamentRules());
 		
 		final JPanel mainPanel = new JPanel();
 		frame.getContentPane().add(mainPanel, BorderLayout.CENTER);
diff --git a/src/net/fe/unit/HealingItem.java b/src/net/fe/unit/HealingItem.java
index 8c8fa4b..48c2a9d 100644
--- a/src/net/fe/unit/HealingItem.java
+++ b/src/net/fe/unit/HealingItem.java
@@ -11,13 +11,13 @@ public final class HealingItem extends Item {
 	private static final long serialVersionUID = -6169687038185884864L;
 	
 	/** The vulnerary. */
-	public static final HealingItem VULNERARY = new HealingItem("Vulnerary", 10, 0, 300);
+	public static final HealingItem VULNERARY = new HealingItem("Vulnerary", 10, 0, 300, "Healing");
 	
 	/** The concoction. */
-	public static final HealingItem CONCOCTION = new HealingItem("Concoction", 20, 1, 1300);
+	public static final HealingItem CONCOCTION = new HealingItem("Concoction", 20, 1, 1300, "Healing");
 	
 	/** The elixir. */
-	public static final HealingItem ELIXIR = new HealingItem("Elixir", 99, 2, 3000);
+	public static final HealingItem ELIXIR = new HealingItem("Elixir", 99, 2, 3000, "Healing");
 	
 	/** The amount. */
 	public final int amount;
@@ -30,8 +30,8 @@ public final class HealingItem extends Item {
 	 * @param id the icon index
 	 * @param cost the item's shop price
 	 */
-	public HealingItem(String name, int amount, int id, int cost){
-		super(name, 3, id, cost);
+	public HealingItem(String name, int amount, int id, int cost, String itemClass){
+		super(name, 3, id, cost, itemClass);
 		this.amount = amount;
 	}
 	
@@ -49,7 +49,7 @@ public int use(Unit user){
 	 * @see net.fe.unit.Item#getCopy()
 	 */
 	public HealingItem getCopy(){
-		return new HealingItem(name, amount, id, getCost());
+		return new HealingItem(name, amount, id, getCost(), getItemClass());
 	}
 	
 	/* (non-Javadoc)
diff --git a/src/net/fe/unit/Item.java b/src/net/fe/unit/Item.java
index 39a814a..9c0322f 100644
--- a/src/net/fe/unit/Item.java
+++ b/src/net/fe/unit/Item.java
@@ -27,17 +27,21 @@ public abstract class Item implements Serializable, Comparable<Item>{
 	/** The id. */
 	public final int id;
 	
+	/** The item class.  Used for weapon class limiting/server rules. */
+	private final String itemClass;
+	
 	/**
 	 * Instantiates a new item.
 	 *
 	 * @param name the name
 	 */
-	public Item(String name, int maxUses, int id, int cost){
+	public Item(String name, int maxUses, int id, int cost, String itemClass){
 		this.name = name;
 		this.id = id;
 		this.maxUses = maxUses;
 		this.uses = maxUses;
 		this.cost = cost;
+		this.itemClass = itemClass;
 	}
 	
 	/**
@@ -87,6 +91,15 @@ public final int getCost(){
 		return cost;
 	}
 	
+	/**
+	 * Gets the item class.
+	 * 
+	 * @return the class
+	 */
+	public final String getItemClass(){
+		return (itemClass == null?"":itemClass);
+	}
+	
 	/**
 	 * Gets the copy.
 	 *
diff --git a/src/net/fe/unit/RiseTome.java b/src/net/fe/unit/RiseTome.java
index b9f0722..1f71d8b 100644
--- a/src/net/fe/unit/RiseTome.java
+++ b/src/net/fe/unit/RiseTome.java
@@ -13,7 +13,7 @@ public class RiseTome extends Item{
 	 * Instantiates a new rise tome.
 	 */
 	public RiseTome(){
-		super("Rise", 1, 3, 5000);
+		super("Rise", 1, 3, 5000, null);
 	}
 	
 	/* (non-Javadoc)
diff --git a/src/net/fe/unit/Unit.java b/src/net/fe/unit/Unit.java
index f5557c8..f4d23e2 100644
--- a/src/net/fe/unit/Unit.java
+++ b/src/net/fe/unit/Unit.java
@@ -51,6 +51,12 @@ public final class Unit extends GriddedEntity implements Serializable, DoNotDest
 	/** The unit's current level */
 	private int level;
 	
+	/** The unit's min level.  For use with rulesets */
+	private int minLevel = 1;
+
+	/** The unit's max level.  For use with rulesets */
+	private int maxLevel = 20;
+	
 	/** The unit's current stats. */
 	private Statistics stats;
 	
@@ -149,6 +155,8 @@ public Unit(String name, Class c, char gender, Statistics bases,
 		skills = new ArrayList<CombatTrigger>();
 		battleStats = new BattleStats();
 		this.setLevel(1);
+		this.setMinLv(1);
+		this.setMaxLv(20);
 		fillHp();
 		
 		renderDepth = ClientOverworldStage.UNIT_DEPTH;
@@ -731,7 +739,7 @@ public ArrayList<CombatTrigger> getTriggers() {
 	 * @param lv the new level
 	 */
 	public void setLevel(int lv) {
-		if (lv > 20 || lv < 1) {
+		if (lv > maxLevel || lv < minLevel) {
 			return;
 		}
 		this.level = lv;
@@ -741,6 +749,48 @@ public void setLevel(int lv) {
 		fillHp();
 	}
 	
+	/**
+	 * Sets the minimum level.
+	 *
+	 * @param lv the new minimum level
+	 */
+	public void setMinLv(int lv){
+		if(this.getLevel() < lv){
+			this.setLevel(lv);
+		}
+		
+		this.minLevel = lv;
+	}
+	
+	/**
+	 * Sets the maximum level.
+	 *
+	 * @param lv the new maximum level
+	 */
+	public void setMaxLv(int lv){
+		if(this.getLevel() > lv){
+			this.setLevel(lv);
+		}
+		
+		this.maxLevel = lv;
+	}
+	
+	/**
+	 * Gets the max level.
+	 *
+	 */
+	public int getMaxLv(){
+		return this.maxLevel;
+	}
+	
+	/**
+	 * Gets the min level.
+	 *
+	 */
+	public int getMinLv(){
+		return this.minLevel;
+	}
+	
 	/**
 	 * Fill hp.
 	 */
@@ -765,7 +815,7 @@ public static int getExpCost(int level){
 	 */
 	public int squeezeExp(){
 		int exp = 0;
-		while(getLevel() != 1){
+		while(getLevel() != minLevel){
 			exp += getExpCost(getLevel());
 			setLevel(getLevel() - 1);
 		}
diff --git a/src/net/fe/unit/Weapon.java b/src/net/fe/unit/Weapon.java
index daf9fd4..f31c0ea 100644
--- a/src/net/fe/unit/Weapon.java
+++ b/src/net/fe/unit/Weapon.java
@@ -54,8 +54,8 @@ public Weapon(String name, int maxUses, int id, int cost,
 			Type type, int mt, int hit, int crit, 
 			Function<Statistics, List<Integer>> range,
 			Statistics modifiers,
-			List<String> effective, String pref) {
-		super(name, maxUses, id, cost);
+			List<String> effective, String pref, String itemClass) {
+		super(name, maxUses, id, cost, itemClass);
 		this.type = type;
 		this.modifiers = modifiers;
 		this.mt = mt;
@@ -192,14 +192,14 @@ public List<CombatTrigger> getTriggers(){
 	public Weapon getCopy(){
 		return new Weapon(name, getMaxUses(), id, getCost(),
 				type, mt, hit, crit, range,
-				modifiers, effective, pref);
+				modifiers, effective, pref, getItemClass());
 	}
 	
 	/** Returns an item identical to this one, with the exception of an updated mt, hit and crit */
 	public Weapon getCopyWithNewMtHitCrit(int newmt, int newhit, int newcrit){
 		return new Weapon(name, getMaxUses(), id, getCost(),
 				type, newmt, newhit, newcrit, range,
-				modifiers, effective, pref);
+				modifiers, effective, pref, getItemClass());
 	}
 
 	/* (non-Javadoc)
diff --git a/src/net/fe/unit/WeaponFactory.java b/src/net/fe/unit/WeaponFactory.java
index d6dc477..5826999 100644
--- a/src/net/fe/unit/WeaponFactory.java
+++ b/src/net/fe/unit/WeaponFactory.java
@@ -98,6 +98,10 @@ public static void loadWeapons() {
 				w.modifiers = w.modifiers.copy(modArgs[0], Integer.parseInt(modArgs[1]));
 			}
 			
+			if(!args[11].equals("-")){
+				w.itemClass = args[11];
+			}
+			
 			weapons.put(name, w.build());
 		}
 		in.close();
@@ -134,6 +138,7 @@ private static final class WeaponBuilder {
 		public int maxUses, cost;
 		public final ArrayList<String> effective;
 		public String pref;
+		public String itemClass;
 		
 		public WeaponBuilder() {
 			modifiers = new Statistics();
@@ -146,7 +151,7 @@ public Weapon build() {
 			return new Weapon(
 				name, maxUses, id, cost,
 				type, mt, hit, crit, range,
-				modifiers, effective, pref
+				modifiers, effective, pref, itemClass
 			);
 		}
 	}