diff --git a/commands/command.py b/commands/command.py
index f2332e9..e2b8692 100644
--- a/commands/command.py
+++ b/commands/command.py
@@ -265,7 +265,7 @@ class CmdSearch(Command):
         caller = self.caller
 
         if has_effect(caller, "is_busy"):
-            caller.msg("You are already busy {}.".format(caller.current_action.busy_msg()))
+            caller.msg("You are already busy {}.".format(caller.db.current_action.busy_msg()))
             return
 
         if not self.args:
diff --git a/utils/crafting.py b/utils/crafting.py
index 56a7e2d..52ad81f 100644
--- a/utils/crafting.py
+++ b/utils/crafting.py
@@ -1082,7 +1082,7 @@ class CmdCraft(Command):
             return
 
         if has_effect(caller, "is_busy"):
-            caller.msg("You are already busy {}.".format(caller.current_action.busy_msg()))
+            caller.msg("You are already busy {}.".format(caller.db.current_action.busy_msg()))
             return
 
         ingredients = []
diff --git a/world/batches/tutorial.ev b/world/batches/tutorial.ev
index bc5b992..9e722c3 100644
--- a/world/batches/tutorial.ev
+++ b/world/batches/tutorial.ev
@@ -4,7 +4,7 @@
 #
 zone/add tutorial_zone = 32
 #
-# rooms
+# ROOMS
 spawn/noloc start_00
 #
 spawn/noloc start_01
@@ -15,7 +15,7 @@ spawn/noloc start_03
 #
 spawn/noloc start_04
 #
-# exits
+# EXITS
 popen start_door_00 = start_00,start_01
 #
 popen start_door_01 = start_01,start_02
@@ -35,11 +35,20 @@ addtozone start_03 = tutorial_zone, 17, 29
 #
 addtozone start_04 = tutorial_zone, 18, 29
 #
+# ROOM START_00
 tel start_00
 #
 spawn f_armored_skeleton
 #
+spawn wood_material
+#
+spawn cloth_material
+#
+# ROOM START_01
 tel start_01
 #
 spawn f_rubble_01
+#
+
+tel start_00
 #
\ No newline at end of file
diff --git a/world/prototypes.py b/world/prototypes.py
index 93c7760..a0b7e98 100644
--- a/world/prototypes.py
+++ b/world/prototypes.py
@@ -223,9 +223,20 @@ LANTERN = {
     "locks": "light:all()",
 }
 
+TORCH = {
+    "prototype_parent": "ITEM",
+    "prototype_tags": ["item"],
+    "prototype_key": "torch",
+    "key": "torch",
+    "aliases": ["torch"],
+    "desc": "A crude torch made from a splinter of wood.",
+    "attrs": [("is_lit", False, None, None)],
+    "locks": "light:all()",
+}
+
 BLADE_TOOL = {
     "prototype_parent": "ITEM_EQUIPPABLE",
-    "prototype_tags": ["item", "equippable"],
+    "prototype_tags": ["item", "equippable", "material"],
     "prototype_key": "blade tool",
     "key": "steel blade",
     "aliases": ["blade"],
@@ -236,7 +247,7 @@ BLADE_TOOL = {
 
 WOOD_MATERIAL = {
     "prototype_parent": "ITEM",
-    "prototype_tags": ["item"],
+    "prototype_tags": ["item", "material"],
     "prototype_key": "wood_material",
     "key": "piece of wood",
     "aliases": ["wood"],
@@ -244,9 +255,19 @@ WOOD_MATERIAL = {
     "tags": [("wood", "crafting_material", None)],
 }
 
+CLOTH_MATERIAL = {
+    "prototype_parent": "ITEM",
+    "prototype_tags": ["item", "material"],
+    "prototype_key": "cloth_material",
+    "key": "old rags",
+    "aliases": ["rags"],
+    "desc": "A torn piece of dirty cloth.",
+    "tags": [("cloth", "crafting_material", None)],
+}
+
 BLOOD_MATERIAL = {
     "prototype_parent": "ITEM",
-    "prototype_tags": ["item"],
+    "prototype_tags": ["item", "material"],
     "prototype_key": "blood_material",
     "key": "vial of blood",
     "aliases": ["blood, vial"],
diff --git a/world/recipes_base.py b/world/recipes_base.py
index b9826b8..0eaa5f6 100644
--- a/world/recipes_base.py
+++ b/world/recipes_base.py
@@ -33,6 +33,19 @@ class SummoningCircleRecipe(CraftingRecipe):
     success_message = "You draw an arcane circle on the ground."
 
 
+class TorchRecipe(CraftingRecipe):
+    """A wooden torch"""
+    """Some blood"""
+    name = "torch"  # name to refer to this recipe as
+    crafting_time = 5
+    tool_tags = []
+    consumable_tags = ["wood", "cloth"]
+    output_prototypes = [
+        "torch"
+    ]
+    output_names = ["a wooden torch"]
+
+
 class WoodenPuppetRecipe(CraftingRecipe):
     """A puppet"""
     name = "wooden puppet"  # name to refer to this recipe as