diff --git a/swap_meet/clothing.py b/swap_meet/clothing.py
index b8afdeb1e..b74679006 100644
--- a/swap_meet/clothing.py
+++ b/swap_meet/clothing.py
@@ -1,2 +1,38 @@
-class Clothing:
-    pass
\ No newline at end of file
+from swap_meet.item import Item
+
+class Clothing(Item):
+    # May have to change fabric default values to None
+    def __init__(self, id=None, fabric="Unknown", condition=0):
+        super().__init__(id, condition)
+        if fabric == None:
+            self.fabric = "Unknown"
+        else:
+            self.fabric = fabric
+            
+    def clothing(self):
+            self.clothing = self.fabric 
+
+    def get_category(self):
+        return "Clothing"
+    
+    def __str__(self):
+        return f"An object of type {self.get_category()} with id {self.id}. It is made from {self.fabric} fabric."    
+
+        # if self.fabric == "unknown":
+            # return f"An object of type {self.get_category()} with id {self.id}. It is made from Unknown fabric."    
+        # else:
+        #     return f"An object of type {self.clothing()} with id {self.id}. It is made from {self.fabric} fabric."    
+    
+    def condition_description(self):
+        if self.condition == 0:
+            return f"Item condition is rated 0. This item is barely holding on!"
+        elif self.condition == 1:
+            return f"Items condition is rated 1. This item is hanging on by a thread!"
+        elif self.condition == 2:
+            return f"Items condition is rated 2. This item is living on a prayer."
+        elif self.condition == 3:
+            return f"Items condition is rated 3. This item is in working order."
+        elif self.condition == 4:
+            return f"Items condition is rated 4. This item is in good condition."
+        else:
+            return f"Items condition is rated 5. This item is in excellent condition."
\ No newline at end of file
diff --git a/swap_meet/decor.py b/swap_meet/decor.py
index eab7a9dbe..fd0a5e148 100644
--- a/swap_meet/decor.py
+++ b/swap_meet/decor.py
@@ -1,2 +1,37 @@
-class Decor:
-    pass
\ No newline at end of file
+from swap_meet.item import Item
+
+class Decor (Item):
+    def __init__(self, id=None, condition=0, width=0, length=0):
+        super().__init__(id, condition)
+        self.width = width
+        self.length = length
+        
+
+    def condition_description(self):
+        if self.condition == 0:
+            return f"Item condition is rated 0. This item is barely holding on!"
+        elif self.condition == 1:
+            return f"Items condition is rated 1. This item is hanging on by a thread!"
+        elif self.condition == 2:
+            return f"Items condition is rated 2. This item is living on a prayer."
+        elif self.condition == 3:
+            return f"Items condition is rated 3. This item is in working order."
+        elif self.condition == 4:
+            return f"Items condition is rated 4. This item is in good condition."
+        else:
+            return f"Items condition is rated 5. This item is in excellent condition."
+
+    def get_category(self):
+        return self.__class__.__name__
+    
+    def __str__(self):
+        return f"An object of type {self.get_category()} with id {self.id}. It takes up a {self.width} by {self.length} sized space."
+
+# ------------------ WAVE 5 -----------------------
+# Has an attribute id that is by default a unique integer
+# Holds 2 integer attributes width and length
+# Both of these values should be 0 by default
+# When we instantiate an instance of Decor, we can optionally pass in integers with the keyword arguments width and length
+# Has a function get_category that returns "Decor"
+# Has a stringify method that returns "An object of type Decor with id <id value>. It takes up a <width value> by <length value> sized space."
+# For example, if we had a Decor instance with an id of 123435, width of 3, and length of 7, its stringify method should return "An object of type Decor with id 12345. It takes up a 3 by 7 sized space."
\ No newline at end of file
diff --git a/swap_meet/electronics.py b/swap_meet/electronics.py
index 2f9dff68a..b1284a567 100644
--- a/swap_meet/electronics.py
+++ b/swap_meet/electronics.py
@@ -1,2 +1,37 @@
-class Electronics:
-    pass
+from swap_meet.item import Item
+
+class Electronics(Item):
+    def __init__(self, id=None, type="Unknown", condition=0):
+        super().__init__(id, condition)
+        self.type = type
+
+    def get_category(self):    
+        return self.__class__.__name__
+        
+    def __str__(self):
+        return f"An object of type {self.get_category()} with id {self.id}. This is a {self.type} device."
+        
+    def condition_description(self):
+        if self.condition == 0:
+            return f"Item condition is rated 0. This item is barely holding on!"
+        elif self.condition == 1:
+            return f"Items condition is rated 1. This item is hanging on by a thread!"
+        elif self.condition == 2:
+            return f"Items condition is rated 2. This item is living on a prayer."
+        elif self.condition == 3:
+            return f"Items condition is rated 3. This item is in working order."
+        elif self.condition == 4:
+            return f"Items condition is rated 4. This item is in good condition."
+        else:
+            return f"Items condition is rated 5. This item is in excellent condition."
+
+        #electronics = "Stereo" key="type"
+
+
+# ------------------ WAVE 5 -----------------------
+# Has an attribute id that is by default a unique integer
+# Has an attribute type that is by default the string "Unknown"
+# This attribute describes what kind of electronic device this is. Some example values might be “Kitchen Appliance”, “Game Console”, or “Health Tracker”
+# When we initialize an instance of Electronics, we can optionally pass in a string with the keyword argument type
+# Has an function get_category that returns "Electronics"
+# Has a stringify method that returns "An object of type Electronics with id <id value>. This is a <type value> device."
diff --git a/swap_meet/item.py b/swap_meet/item.py
index 560d759c2..b8096ac77 100644
--- a/swap_meet/item.py
+++ b/swap_meet/item.py
@@ -1,2 +1,32 @@
+import uuid
+
 class Item:
-    pass
\ No newline at end of file
+    def __init__(self, id=None, condition=0):
+        self.condition = condition        
+        #if id is not manually assigned
+        if id == None:
+            self.id = uuid.uuid4().int
+        #if id is manually assigned
+        else:
+            self.id = id
+        
+        
+    def get_category(self):
+        return self.__class__.__name__
+        
+    def __str__(self):
+        return f"An object of type {self.get_category()} with id {self.id}."    
+
+def condition_description(self):
+        if self.condition == 0:
+            return f"Item condition is rated 0. This item is barely holding on!"
+        elif self.condition == 1:
+            return f"Items condition is rated 1. This item is hanging on by a thread!"
+        elif self.condition == 2:
+            return f"Items condition is rated 2. This item is living on a prayer."
+        elif self.condition == 3:
+            return f"Items condition is rated 3. This item is in working order."
+        elif self.condition == 4:
+            return f"Items condition is rated 4. This item is in good condition."
+        else:
+            return f"Items condition is rated 5. This item is in excellent condition."
diff --git a/swap_meet/vendor.py b/swap_meet/vendor.py
index 87302c056..9495ed2b1 100644
--- a/swap_meet/vendor.py
+++ b/swap_meet/vendor.py
@@ -1,2 +1,84 @@
+import uuid
+
+#from item import Item
+
+
 class Vendor:
-    pass
\ No newline at end of file
+    def __init__(self, inventory=[]):
+        self.inventory = inventory #each vendor will have an attribute named :inventory (an empty list)
+        
+    def add(self, item):
+        self.inventory.append(item)
+        print(self.inventory)
+        print(item)
+        return item 
+    
+    def remove(self, item): 
+        
+        if item not in self.inventory:
+            return False
+        else:
+            self.inventory.remove(item)
+            return item
+    
+    def get_by_id(self, id):
+        for item in self.inventory:
+            print(item.id)
+            print(id)
+            if item.id == id:
+                return item
+        return None
+        
+
+    def swap_items(self, other_vendor, my_item, their_item):
+        if not my_item in self.inventory or not their_item in other_vendor.inventory: 
+            return False
+        else:
+            self.remove(my_item)
+            self.add(their_item)
+            other_vendor.remove(their_item)
+            other_vendor.add(my_item)
+            return True 
+    # these functions will return uuid objects **(not int)**  
+
+    def swap_first_item(self, other_vendor):
+        if other_vendor.inventory == [] or self.inventory == []:
+            return False
+        else:
+            #look at the syntax here
+            other_vendor.add(self.inventory[0])
+            self.remove(self.inventory[0])
+            self.add(other_vendor.inventory[0])
+            other_vendor.remove(other_vendor.inventory[0])
+            return True
+    
+    def get_by_category(self, category):
+        objects = []
+
+        for item in self.inventory:
+            if item.get_category() == category:
+                objects.append(item)
+        return objects
+    
+    def get_best_by_category(self, category):
+    
+        items = self.get_by_category(category)
+        if items == []:
+            return None
+        else:
+            highest_condition = items[0]
+            for item in items:
+                if item.condition >= highest_condition.condition:
+                    highest_condition = item
+            return highest_condition
+    
+    def swap_best_by_category(self, other_vendor, my_priority, their_priority):
+        my_best_item = self.get_best_by_category(their_priority)
+
+        their_best_item = other_vendor.get_best_by_category(my_priority)
+
+        if my_best_item == None or their_best_item == None:
+            return False
+        else:
+            self.swap_items(other_vendor, my_best_item, their_best_item)
+            return True
diff --git a/tests/integration_tests/test_wave_01_02_03.py b/tests/integration_tests/test_wave_01_02_03.py
index 0e521771a..ebe3642ba 100644
--- a/tests/integration_tests/test_wave_01_02_03.py
+++ b/tests/integration_tests/test_wave_01_02_03.py
@@ -4,6 +4,7 @@
 
 @pytest.mark.skip
 @pytest.mark.integration_test
+
 def test_integration_wave_01_02_03():
     # make a vendor
     vendor = Vendor()
diff --git a/tests/unit_tests/test_wave_01.py b/tests/unit_tests/test_wave_01.py
index 58478ccf9..fa13f8eb6 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,4 @@ def test_removing_not_found_is_false():
 
     result = vendor.remove(item)
 
-    raise Exception("Complete this test according to comments below.")
-    # *********************************************************************
-    # ****** Complete Assert Portion of this test **********
-    # *********************************************************************
+    assert result == False
diff --git a/tests/unit_tests/test_wave_02.py b/tests/unit_tests/test_wave_02.py
index 229165c75..67e774af6 100644
--- a/tests/unit_tests/test_wave_02.py
+++ b/tests/unit_tests/test_wave_02.py
@@ -2,30 +2,30 @@
 from swap_meet.vendor import Vendor
 from swap_meet.item import Item
 
-@pytest.mark.skip
+#@pytest.mark.skip
 def test_items_have_default_uuid_length_id():
     item = Item()
     assert isinstance(item.id, int)
     assert len(str(item.id)) >= 32
 
-@pytest.mark.skip
+#@pytest.mark.skip
 def test_item_instances_have_different_default_ids():
     item_a = Item()
     item_b = Item()
     assert item_a.id != item_b.id
 
-@pytest.mark.skip
+#@pytest.mark.skip
 def test_items_use_custom_id_if_passed():
     item = Item(id=12345)
     assert isinstance(item.id, int)
     assert item.id == 12345
 
-@pytest.mark.skip
+#@pytest.mark.skip
 def test_item_obj_returns_text_item_for_category():
     item = Item()
     assert item.get_category() == "Item"
 
-@pytest.mark.skip
+#@pytest.mark.skip
 def test_get_item_by_id():
     test_id = 12345
     item_custom_id = Item(id=test_id)
@@ -36,7 +36,7 @@ def test_get_item_by_id():
     result_item = vendor.get_by_id(test_id)
     assert result_item is item_custom_id
 
-@pytest.mark.skip
+#@pytest.mark.skip
 def test_get_item_by_id_no_matching():
     test_id = 12345
     item_a = Item()
diff --git a/tests/unit_tests/test_wave_03.py b/tests/unit_tests/test_wave_03.py
index c85da6797..07e73a640 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():
     test_id = 12345
     item = Item(id=test_id)
@@ -12,7 +12,7 @@ def test_item_overrides_to_string():
     expected_result = f"An object of type Item with id {test_id}."
     assert item_as_string == expected_result
 
-@pytest.mark.skip
+#@pytest.mark.skip
 def test_swap_items_returns_true():
     item_a = Item()
     item_b = Item()
@@ -40,7 +40,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()
     item_b = Item()
@@ -67,7 +67,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()
     item_b = Item()
@@ -94,7 +94,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=[]
@@ -114,7 +114,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()
     item_b = Item()
@@ -131,7 +131,6 @@ def test_swap_items_from_their_empty_returns_false():
 
     result = fatimah.swap_items(jolie, item_b, nobodys_item)
 
-    raise Exception("Complete this test according to comments below.")
-    # *********************************************************************
-    # ****** Complete Assert Portion of this test **********
-    # *********************************************************************
+    assert len(fatimah.inventory) == 3
+    assert len(jolie.inventory) == 0
+    assert not result
\ No newline at end of file
diff --git a/tests/unit_tests/test_wave_04.py b/tests/unit_tests/test_wave_04.py
index 87addbbf6..3d1433d1d 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()
     item_b = Item()
@@ -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()
     item_b = Item()
diff --git a/tests/unit_tests/test_wave_05.py b/tests/unit_tests/test_wave_05.py
index 46e208237..7c012249a 100644
--- a/tests/unit_tests/test_wave_05.py
+++ b/tests/unit_tests/test_wave_05.py
@@ -7,17 +7,17 @@
 
 # ~~~~~ Clothing Tests ~~~~~
 
-@pytest.mark.skip
+#@pytest.mark.skip
 def test_clothing_has_default_uuid_length_id():
     clothing = Clothing()
     check_for_default_uuid_length_id(clothing)
 
-@pytest.mark.skip
+#@pytest.mark.skip
 def test_clothing_has_expected_category_and_custom_id():
     clothing = Clothing(id=TEST_CUSTOM_ID)
     check_category_and_custom_id(clothing, TEST_CUSTOM_ID, "Clothing")
 
-@pytest.mark.skip
+#@pytest.mark.skip
 def test_clothing_has_expected_default_to_str():
     clothing = Clothing(id=TEST_CUSTOM_ID)
     expected_str = (
@@ -26,7 +26,7 @@ def test_clothing_has_expected_default_to_str():
     )
     assert str(clothing) == expected_str
 
-@pytest.mark.skip
+#@pytest.mark.skip
 def test_clothing_has_expected_to_str_with_custom_fabric():
     clothing = Clothing(id=TEST_CUSTOM_ID, fabric="Pinstriped")
     expected_str = (
@@ -37,17 +37,17 @@ def test_clothing_has_expected_to_str_with_custom_fabric():
 
 # ~~~~~ Decor Tests ~~~~~
 
-@pytest.mark.skip
+#@pytest.mark.skip
 def test_decor_has_default_uuid_length_id():
     decor = Decor()
     check_for_default_uuid_length_id(decor)
 
-@pytest.mark.skip
+#@pytest.mark.skip
 def test_decor_has_expected_category_and_custom_id():
     decor = Decor(id=TEST_CUSTOM_ID)
     check_category_and_custom_id(decor, TEST_CUSTOM_ID, "Decor")
 
-@pytest.mark.skip
+#@pytest.mark.skip
 def test_decor_has_expected_default_to_str():
     decor = Decor(id=TEST_CUSTOM_ID)
     expected_str = (
@@ -56,7 +56,7 @@ def test_decor_has_expected_default_to_str():
     )
     assert str(decor) == expected_str
 
-@pytest.mark.skip
+#@pytest.mark.skip
 def test_decor_has_expected_to_str_with_custom_size():
     decor = Decor(id=TEST_CUSTOM_ID, width=3, length=12)
     expected_str = (
@@ -67,17 +67,17 @@ def test_decor_has_expected_to_str_with_custom_size():
 
 # ~~~~~ Electronics Tests ~~~~~
 
-@pytest.mark.skip
+#@pytest.mark.skip
 def test_electronics_has_default_uuid_length_id():
     electronics = Electronics()
     check_for_default_uuid_length_id(electronics)
 
-@pytest.mark.skip
+#@pytest.mark.skip
 def test_electronics_has_expected_category_and_custom_id():
     electronics = Electronics(id=TEST_CUSTOM_ID)
     check_category_and_custom_id(electronics, TEST_CUSTOM_ID, "Electronics")
 
-@pytest.mark.skip
+#@pytest.mark.skip
 def test_electronics_has_expected_default_to_str():
     electronics = Electronics(id=TEST_CUSTOM_ID)
     expected_str = (
@@ -86,7 +86,7 @@ def test_electronics_has_expected_default_to_str():
     )
     assert str(electronics) == expected_str
 
-@pytest.mark.skip
+#@pytest.mark.skip
 def test_electronics_has_expected_to_str_with_custom_type():
     electronics = Electronics(id=TEST_CUSTOM_ID, type="Mobile Phone")
     expected_str = (
@@ -98,7 +98,7 @@ def test_electronics_has_expected_to_str_with_custom_type():
 
 # ~~~~~ Item Tests ~~~~~
 
-@pytest.mark.skip
+#@pytest.mark.skip
 def test_items_have_condition_as_float():
     items = [
         Clothing(condition=3.5),
@@ -108,7 +108,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 ad51bf42d..97301fc7c 100644
--- a/tests/unit_tests/test_wave_06.py
+++ b/tests/unit_tests/test_wave_06.py
@@ -5,7 +5,7 @@
 from swap_meet.decor import Decor
 from swap_meet.electronics import Electronics
 
-@pytest.mark.skip
+#@pytest.mark.skip
 def test_get_items_by_category():
     item_a = Clothing()
     item_b = Electronics()
@@ -22,7 +22,7 @@ def test_get_items_by_category():
     assert item_a in items
     assert item_c in items
 
-@pytest.mark.skip
+#@pytest.mark.skip
 def test_get_no_matching_items_by_category():
     item_a = Clothing()
     item_b = Item()
@@ -33,12 +33,9 @@ def test_get_no_matching_items_by_category():
 
     items = vendor.get_by_category("Electronics")
 
-    raise Exception("Complete this test according to comments below.")
-    # *********************************************************************
-    # ****** Complete Assert Portion of this test **********
-    # *********************************************************************
+    assert len(items) == 0
 
-@pytest.mark.skip
+#@pytest.mark.skip
 def test_best_by_category():
     item_a = Clothing(condition=2.0)
     item_b = Decor(condition=2.0)
@@ -54,7 +51,7 @@ def test_best_by_category():
     assert best_item.get_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)
@@ -67,7 +64,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)
@@ -84,7 +81,7 @@ def test_best_by_category_with_duplicates():
     assert best_item.get_category() == "Clothing"
     assert best_item.condition == pytest.approx(4.0)
 
-@pytest.mark.skip
+#@pytest.mark.skip
 def test_swap_best_by_category():
     # Arrange
     # me
@@ -110,16 +107,23 @@ def test_swap_best_by_category():
         their_priority="Decor"
     )
 
-    raise Exception("Complete this test according to comments below.")
-    # *********************************************************************
-    # ****** Complete Assert Portion of this test **********
-    # *********************************************************************
+    assert result == True
+    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 jesse.inventory
+    assert item_d in jesse.inventory 
+    assert item_e in jesse.inventory
+    assert item_f in tai.inventory
+    assert item_c not in tai.inventory
+    assert item_f not in jesse.inventory
     # Assertions should check:
     # - That the results is truthy
     # - 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)
@@ -143,16 +147,22 @@ def test_swap_best_by_category_reordered():
         their_priority="Decor"
     )
 
-    raise Exception("Complete this test according to comments below.")
-    # *********************************************************************
-    # ****** Complete Assert Portion of this test **********
-    # *********************************************************************
+    assert result == True
+    assert len(tai.inventory) == 3
+    assert len(jesse.inventory) == 3
+    assert item_a in tai.inventory
+    assert item_b in tai.inventory
+    assert item_f in tai.inventory
+    assert item_c in jesse.inventory
+    assert item_d in jesse.inventory
+    assert item_e in jesse.inventory
+
     # Assertions should check:
     # - That result is truthy
     # - 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=[]
@@ -178,7 +188,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)
@@ -204,7 +214,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)
@@ -228,16 +238,22 @@ def test_swap_best_by_category_no_match_is_false():
         their_priority="Clothing"
     )
 
-    raise Exception("Complete this test according to comments below.")
-    # *********************************************************************
-    # ****** Complete Assert Portion of this test **********
-    # *********************************************************************
+    assert result == False
+    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_d in jesse.inventory
+    assert item_e in jesse.inventory
+    assert item_f in jesse.inventory
+
     # Assertions should check:
     # - 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
 
-@pytest.mark.skip
+#@pytest.mark.skip
 def test_swap_best_by_category_no_other_match_is_false():
     # Arrange
     item_a = Decor(condition=2.0)
@@ -261,11 +277,15 @@ def test_swap_best_by_category_no_other_match_is_false():
         their_priority="Decor"
     )
 
-    raise Exception("Complete this test according to comments below.")
-    # *********************************************************************
-    # ****** Complete Assert Portion of this test **********
-    # *********************************************************************
-    # Assertions should check:
+    assert result == False
+    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_d in jesse.inventory
+    assert item_e in jesse.inventory
+    assert item_f in jesse.inventory
     # - 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