diff --git a/README.md b/README.md
index 20ec0dad2..247e5e3da 100644
--- a/README.md
+++ b/README.md
@@ -149,7 +149,7 @@ Now, we may notice that these three classes hold the same types of state and hav
 You'll need to refer to `Item` in order to declare it as a parent. To reference the `Item` class from these modules, try this import line:
 
 ```python
-from swap_meet.item import Item
+ 
 ```
 
 ### Wave 6
diff --git a/swap_meet/clothing.py b/swap_meet/clothing.py
index b8afdeb1e..2393a6a45 100644
--- a/swap_meet/clothing.py
+++ b/swap_meet/clothing.py
@@ -1,2 +1,7 @@
-class Clothing:
-    pass
\ No newline at end of file
+from swap_meet.item import Item
+class Clothing(Item):
+    def __init__(self, condition = 0, age = 0):
+        super().__init__('Clothing', condition, age)
+
+    def __str__(self):
+        return f"The finest clothing you could wear."
diff --git a/swap_meet/decor.py b/swap_meet/decor.py
index eab7a9dbe..e9d515edc 100644
--- a/swap_meet/decor.py
+++ b/swap_meet/decor.py
@@ -1,2 +1,7 @@
-class Decor:
-    pass
\ No newline at end of file
+from swap_meet.item import Item
+class Decor(Item):
+    def __init__(self, condition = 0, age = 0):
+        super().__init__('Decor', condition, age)
+
+    def __str__(self):
+        return f"Something to decorate your space."
diff --git a/swap_meet/electronics.py b/swap_meet/electronics.py
index 2f9dff68a..be333bb53 100644
--- a/swap_meet/electronics.py
+++ b/swap_meet/electronics.py
@@ -1,2 +1,8 @@
-class Electronics:
-    pass
+from swap_meet.item import Item
+class Electronics(Item):
+    def __init__(self, condition = 0, age = 0):
+        super().__init__('Electronics', condition, age)
+
+    def __str__(self):
+        return "A gadget full of buttons and secrets."
+
diff --git a/swap_meet/item.py b/swap_meet/item.py
index 560d759c2..6897bbc7b 100644
--- a/swap_meet/item.py
+++ b/swap_meet/item.py
@@ -1,2 +1,24 @@
 class Item:
-    pass
\ No newline at end of file
+    def __init__(self, category = '', condition = 0, age = 0):
+        self.category = category
+        self.condition = condition
+        self.age = age
+
+
+    def __str__(self):
+        return f"Hello World!"
+
+    def condition_description(self):
+        description = {
+            0: 'bad',
+            1: 'poor',
+            2: 'decent',
+            3: 'average',
+            4: 'good',
+            5: 'pristine'
+        }
+        
+        for rating, quality in description.items():
+            if self.condition == rating:
+                return quality 
+        
diff --git a/swap_meet/vendor.py b/swap_meet/vendor.py
index 87302c056..e16b90c2b 100644
--- a/swap_meet/vendor.py
+++ b/swap_meet/vendor.py
@@ -1,2 +1,57 @@
 class Vendor:
-    pass
\ No newline at end of file
+    
+    def __init__(self,inventory=None):
+        self.inventory = inventory if inventory is not None else []
+
+    def add(self,item):
+        self.inventory.append(item)
+        return item
+
+    def remove(self,item):
+        if item in self.inventory:
+            self.inventory.remove(item)
+            return item
+        return False
+
+    def get_by_category(self, category):
+
+        return [item for item in self.inventory if category == item.category]
+
+    def swap_items(self,friend, my_item, their_item):
+
+        if my_item in self.inventory and their_item in friend.inventory:
+            self.inventory.remove(my_item)
+            friend.inventory.remove(their_item)
+            self.inventory.append(their_item)
+            friend.inventory.append(my_item)
+            return True
+        return False
+    
+    def swap_first_item(self, friend):
+
+        if self.inventory and friend.inventory:
+            return self.swap_items(friend, self.inventory[0], friend.inventory[0])
+
+    def get_best_by_category(self, category):
+
+        categories = self.get_by_category(category)
+
+        if not categories:
+            return None
+        return max(categories, key = lambda x : x.condition)
+
+    def swap_best_by_category(self, other, my_priority, their_priority):
+        
+        other_vendor = other.get_best_by_category(my_priority)
+        my_vendor = self.get_best_by_category(their_priority)
+
+        return self.swap_items(other, my_vendor, other_vendor)
+
+    def swap_by_newest(self, other, their_newest, my_newest):
+
+        return self.swap_items(other, min(self.inventory, key = lambda x : x.age) , min(other.inventory, key = lambda x : x.age))
+
+
+
+
+
diff --git a/tests/integration_tests/test_wave_01_02_03.py b/tests/integration_tests/test_wave_01_02_03.py
index 9912414da..aa8dd0080 100644
--- a/tests/integration_tests/test_wave_01_02_03.py
+++ b/tests/integration_tests/test_wave_01_02_03.py
@@ -2,7 +2,7 @@
 from swap_meet.vendor import Vendor
 from swap_meet.item import Item
 
-@pytest.mark.skip
+# @pytest.mark.skip
 @pytest.mark.integration_test
 def test_integration_wave_01_02_03():
     # make a vendor  
@@ -50,5 +50,3 @@ def test_integration_wave_01_02_03():
     assert len(other_vendor.inventory) == 1
     assert item2 in other_vendor.inventory
     assert item3 in vendor.inventory
-
-
diff --git a/tests/integration_tests/test_wave_04_05_06.py b/tests/integration_tests/test_wave_04_05_06.py
index 4d0be9909..91b1362b6 100644
--- a/tests/integration_tests/test_wave_04_05_06.py
+++ b/tests/integration_tests/test_wave_04_05_06.py
@@ -4,7 +4,7 @@
 from swap_meet.decor import Decor
 from swap_meet.electronics import Electronics
 
-@pytest.mark.skip
+# @pytest.mark.skip
 @pytest.mark.integration_test
 def test_integration_wave_04_05_06():
     camila = Vendor()
diff --git a/tests/unit_tests/test_wave_01.py b/tests/unit_tests/test_wave_01.py
index 58478ccf9..1e03315b0 100644
--- a/tests/unit_tests/test_wave_01.py
+++ b/tests/unit_tests/test_wave_01.py
@@ -2,12 +2,12 @@
 import pytest
 from swap_meet.vendor import Vendor
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_vendor_has_inventory():
     vendor = Vendor()
     assert len(vendor.inventory) == 0
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_vendor_takes_optional_inventory():
     inventory = ["a", "b", "c"]
     vendor = Vendor(inventory=inventory)
@@ -16,7 +16,7 @@ def test_vendor_takes_optional_inventory():
     assert "b" in vendor.inventory
     assert "c" in vendor.inventory
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_adding_to_inventory():
     vendor = Vendor()
     item = "new item"
@@ -27,7 +27,7 @@ def test_adding_to_inventory():
     assert item in vendor.inventory
     assert result == item
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_removing_from_inventory_returns_item():
     item = "item to remove"
     vendor = Vendor(
@@ -40,7 +40,7 @@ def test_removing_from_inventory_returns_item():
     assert item not in vendor.inventory
     assert result == item
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_removing_not_found_is_false():
     item = "item to remove"
     vendor = Vendor(
@@ -49,7 +49,13 @@ def test_removing_not_found_is_false():
 
     result = vendor.remove(item)
 
-    raise Exception("Complete this test according to comments below.")
+    assert item not in vendor.inventory
+    assert len(vendor.inventory) == 3
+    assert result is False
+    
+    # raise Exception("Complete this test according to comments below.")
     # *********************************************************************
     # ****** Complete Assert Portion of this test **********
     # *********************************************************************
+
+
diff --git a/tests/unit_tests/test_wave_02.py b/tests/unit_tests/test_wave_02.py
index 3d7060d7c..ec8611a87 100644
--- a/tests/unit_tests/test_wave_02.py
+++ b/tests/unit_tests/test_wave_02.py
@@ -2,12 +2,12 @@
 from swap_meet.vendor import Vendor
 from swap_meet.item import Item
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_items_have_blank_default_category():
     item = Item()
     assert item.category == ""
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_get_items_by_category():
     item_a = Item(category="clothing")
     item_b = Item(category="electronics")
@@ -23,7 +23,7 @@ def test_get_items_by_category():
     assert item_c in items
     assert item_b not in items
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_get_no_matching_items_by_category():
     item_a = Item(category="clothing")
     item_b = Item(category="clothing")
@@ -34,7 +34,10 @@ def test_get_no_matching_items_by_category():
 
     items = vendor.get_by_category("electronics")
 
-    raise Exception("Complete this test according to comments below.")
+    assert len(vendor.inventory) == 3
+    assert item_a is not items
+    assert item_b is not items
+    assert item_c is not items
     # *********************************************************************
     # ****** Complete Assert Portion of this test **********
     # *********************************************************************
diff --git a/tests/unit_tests/test_wave_03.py b/tests/unit_tests/test_wave_03.py
index 0300b638f..2d573fa52 100644
--- a/tests/unit_tests/test_wave_03.py
+++ b/tests/unit_tests/test_wave_03.py
@@ -2,7 +2,7 @@
 from swap_meet.vendor import Vendor
 from swap_meet.item import Item
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_item_overrides_to_string():
     item = Item()
 
@@ -10,7 +10,7 @@ def test_item_overrides_to_string():
 
     assert stringified_item == "Hello World!"
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_swap_items_returns_true():
     item_a = Item(category="clothing")
     item_b = Item(category="clothing")
@@ -38,7 +38,7 @@ def test_swap_items_returns_true():
     assert item_b in jolie.inventory
     assert result
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_swap_items_when_my_item_is_missing_returns_false():
     item_a = Item(category="clothing")
     item_b = Item(category="clothing")
@@ -65,7 +65,7 @@ def test_swap_items_when_my_item_is_missing_returns_false():
     assert item_e in jolie.inventory
     assert not result
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_swap_items_when_their_item_is_missing_returns_false():
     item_a = Item(category="clothing")
     item_b = Item(category="clothing")
@@ -92,7 +92,7 @@ def test_swap_items_when_their_item_is_missing_returns_false():
     assert item_e in jolie.inventory
     assert not result
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_swap_items_from_my_empty_returns_false():
     fatimah = Vendor(
         inventory=[]
@@ -112,7 +112,7 @@ def test_swap_items_from_my_empty_returns_false():
     assert len(jolie.inventory) == 2
     assert not result
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_swap_items_from_their_empty_returns_false():
     item_a = Item(category="clothing")
     item_b = Item(category="clothing")
diff --git a/tests/unit_tests/test_wave_04.py b/tests/unit_tests/test_wave_04.py
index 8190a4ebb..4ef21ff8e 100644
--- a/tests/unit_tests/test_wave_04.py
+++ b/tests/unit_tests/test_wave_04.py
@@ -2,7 +2,7 @@
 from swap_meet.vendor import Vendor
 from swap_meet.item import Item
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_swap_first_item_returns_true():
     item_a = Item(category="clothing")
     item_b = Item(category="clothing")
@@ -30,7 +30,7 @@ def test_swap_first_item_returns_true():
     assert item_a in jolie.inventory
     assert result
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_swap_first_item_from_my_empty_returns_false():
     fatimah = Vendor(
         inventory=[]
@@ -48,7 +48,7 @@ def test_swap_first_item_from_my_empty_returns_false():
     assert len(jolie.inventory) == 2
     assert not result
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_swap_first_item_from_their_empty_returns_false():
     item_a = Item(category="clothing")
     item_b = Item(category="clothing")
diff --git a/tests/unit_tests/test_wave_05.py b/tests/unit_tests/test_wave_05.py
index 7abea06cd..fdeb063a9 100644
--- a/tests/unit_tests/test_wave_05.py
+++ b/tests/unit_tests/test_wave_05.py
@@ -3,25 +3,25 @@
 from swap_meet.decor import Decor
 from swap_meet.electronics import Electronics
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_clothing_has_default_category_and_to_str():
     cloth = Clothing()
     assert cloth.category == "Clothing"
     assert str(cloth) == "The finest clothing you could wear."
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_decor_has_default_category_and_to_str():
     decor = Decor()
     assert decor.category == "Decor"
     assert str(decor) == "Something to decorate your space."
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_electronics_has_default_category_and_to_str():
     electronics = Electronics()
     assert electronics.category == "Electronics"
     assert str(electronics) == "A gadget full of buttons and secrets."
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_items_have_condition_as_float():
     items = [
         Clothing(condition=3.5),
@@ -31,7 +31,7 @@ def test_items_have_condition_as_float():
     for item in items:
         assert item.condition == pytest.approx(3.5)
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_items_have_condition_descriptions_that_are_the_same_regardless_of_type():
     items = [
         Clothing(condition=5),
diff --git a/tests/unit_tests/test_wave_06.py b/tests/unit_tests/test_wave_06.py
index 1f7065ab4..44d8c07ef 100644
--- a/tests/unit_tests/test_wave_06.py
+++ b/tests/unit_tests/test_wave_06.py
@@ -4,7 +4,7 @@
 from swap_meet.decor import Decor
 from swap_meet.electronics import Electronics
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_best_by_category():
     item_a = Clothing(condition=2.0)
     item_b = Decor(condition=2.0)
@@ -20,7 +20,7 @@ def test_best_by_category():
     assert best_item.category == "Clothing"
     assert best_item.condition == pytest.approx(4.0)
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_best_by_category_no_matches_is_none():
     item_a = Decor(condition=2.0)
     item_b = Decor(condition=2.0)
@@ -33,7 +33,7 @@ def test_best_by_category_no_matches_is_none():
 
     assert best_item is None
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_best_by_category_with_duplicates():
     # Arrange
     item_a = Clothing(condition=2.0)
@@ -50,7 +50,7 @@ def test_best_by_category_with_duplicates():
     assert best_item.category == "Clothing"
     assert best_item.condition == pytest.approx(4.0)
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_swap_best_by_category():
     # Arrange
     # me
@@ -76,7 +76,13 @@ def test_swap_best_by_category():
         their_priority="Decor"
     )
 
-    raise Exception("Complete this test according to comments below.")
+    assert result
+    assert len(jesse.inventory) == 3
+    assert len(tai.inventory) == 3
+    assert [item_a, item_b, item_f] == tai.inventory
+    assert item_c not in tai.inventory
+    assert [item_d, item_e, item_c] == jesse.inventory
+    assert item_f not in jesse.inventory
     # *********************************************************************
     # ****** Complete Assert Portion of this test **********
     # *********************************************************************
@@ -85,7 +91,7 @@ def test_swap_best_by_category():
     # - That tai and jesse's inventories are the correct length
     # - That all the correct items are in tai and jesse's inventories, including the items which were swapped from one vendor to the other
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_swap_best_by_category_reordered():
     # Arrange
     item_a = Decor(condition=2.0)
@@ -109,7 +115,17 @@ def test_swap_best_by_category_reordered():
         their_priority="Decor"
     )
 
-    raise Exception("Complete this test according to comments below.")
+    assert result
+    assert len(jesse.inventory) == 3
+    assert len(tai.inventory) == 3
+    assert item_a in tai.inventory
+    assert item_b in tai.inventory
+    assert item_f in tai.inventory
+    assert item_c not in tai.inventory
+    assert item_c in jesse.inventory
+    assert item_d in jesse.inventory
+    assert item_e in jesse.inventory
+    assert item_f not in jesse.inventory
     # *********************************************************************
     # ****** Complete Assert Portion of this test **********
     # *********************************************************************
@@ -118,7 +134,7 @@ def test_swap_best_by_category_reordered():
     # - That tai and jesse's inventories are the correct length
     # - That all the correct items are in tai and jesse's inventories, and that the items that were swapped are not there
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_swap_best_by_category_no_inventory_is_false():
     tai = Vendor(
         inventory=[]
@@ -144,7 +160,7 @@ def test_swap_best_by_category_no_inventory_is_false():
     assert item_b in jesse.inventory
     assert item_c in jesse.inventory
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_swap_best_by_category_no_other_inventory_is_false():
     item_a = Clothing(condition=2.0)
     item_b = Decor(condition=4.0)
@@ -170,7 +186,7 @@ def test_swap_best_by_category_no_other_inventory_is_false():
     assert item_b in tai.inventory
     assert item_c in tai.inventory
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_swap_best_by_category_no_match_is_false():
     # Arrange
     item_a = Decor(condition=2.0)
@@ -193,8 +209,11 @@ def test_swap_best_by_category_no_match_is_false():
         my_priority="Clothing",
         their_priority="Clothing"
     )
-
-    raise Exception("Complete this test according to comments below.")
+    assert not result
+    assert len(tai.inventory) == 3
+    assert len(jesse.inventory) == 3
+    assert [item_a, item_b, item_c] == tai.inventory
+    assert [item_d, item_e, item_f] == jesse.inventory
     # *********************************************************************
     # ****** Complete Assert Portion of this test **********
     # *********************************************************************
@@ -203,7 +222,7 @@ def test_swap_best_by_category_no_match_is_false():
     # - That tai and jesse's inventories are the correct length
     # - That all the correct items are in tai and jesse's inventories
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_swap_best_by_category_no_other_match_is_false():
     # Arrange
     item_a = Decor(condition=2.0)
@@ -227,7 +246,13 @@ def test_swap_best_by_category_no_other_match_is_false():
         their_priority="Decor"
     )
 
-    raise Exception("Complete this test according to comments below.")
+    assert not result
+    assert len(tai.inventory) == 3
+    assert len(jesse.inventory) == 3
+    assert item_a in tai.inventory
+    assert item_b in tai.inventory
+    assert item_c in tai.inventory
+    assert [item_f, item_e, item_d] == jesse.inventory
     # *********************************************************************
     # ****** Complete Assert Portion of this test **********
     # *********************************************************************
@@ -235,3 +260,73 @@ def test_swap_best_by_category_no_other_match_is_false():
     # - That result is falsy
     # - That tai and jesse's inventories are the correct length
     # - That all the correct items are in tai and jesse's inventories
+def test_swap_by_newest_swaps_correct():
+    # Arrange
+    item_a = Decor(age=3.0)
+    item_b = Clothing(age=4.0)
+    item_c = Decor(age=2.0)
+    tai = Vendor(
+        inventory=[item_c, item_b, item_a]
+    )
+
+    item_d = Clothing(age=2.0)
+    item_e = Decor(age=4.0)
+    item_f = Clothing(age=4.0)
+    jesse = Vendor(
+        inventory=[item_f, item_e, item_d]
+    )
+
+    # Act
+    result = tai.swap_by_newest(
+        other=jesse,
+        my_newest="Decor",
+        their_newest="Clothing"
+    )
+
+    assert result
+    assert len(tai.inventory) == 3
+    assert len(jesse.inventory) == 3
+    assert item_a in tai.inventory
+    assert item_b in tai.inventory
+    assert item_c not in tai.inventory
+    assert item_d in tai.inventory
+    assert item_f in jesse.inventory
+    assert item_e in jesse.inventory
+    assert item_d not in jesse.inventory
+    assert item_c in jesse.inventory
+
+def test_swap_best_by_newest_is_reordered():
+    # Arrange
+    item_a = Decor(age = 1.0)
+    item_b = Electronics(age=4.0)
+    item_c = Decor(age=3.0)
+    tai = Vendor(
+        inventory=[item_c, item_b, item_a]
+    )
+
+    item_d = Clothing(age=0)
+    item_e = Decor(age=4.0)
+    item_f = Clothing(age=2.0)
+    jesse = Vendor(
+        inventory=[item_f, item_e, item_d]
+    )
+
+    # Act
+    result = tai.swap_by_newest(
+        other=jesse,
+        my_newest="Clothing",
+        their_newest="Decor"
+    )
+
+    assert result
+    assert len(jesse.inventory) == 3
+    assert len(tai.inventory) == 3
+    assert item_a not in tai.inventory
+    assert item_b in tai.inventory
+    assert item_c in tai.inventory
+    assert item_d in tai.inventory
+    assert item_a in jesse.inventory
+    assert item_d not in jesse.inventory
+    assert item_e in jesse.inventory
+    assert item_f in jesse.inventory
+    
\ No newline at end of file