diff --git a/HEADS b/HEADS
index 6b6dd801..59cac96c 100644
--- a/HEADS
+++ b/HEADS
@@ -1 +1 @@
-{"engine": {"3.2": "cc3c671f3b636cbfac9fc74095d5bee753e71ed5", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "c7a98e704dd62782b9f8b4a22b74787278574657"}, "entity_spell_system": {"master": "e992462683ccf1370043282e7f6f6c73e1d1cece"}, "ui_extensions": {"master": "07c50b139fd3db4cb813db9955187f9530b754bb"}, "voxelman": {"master": "33030e485a7c8a8c3921008f915c8acb19b98dee"}, "texture_packer": {"master": "f98b7410cd3f2a743cb57456910ad9f93ef89937"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "b852ab0e525addbd11ebcdd7d16b7536171837be"}, "procedural_animations": {"master": "ec465a7a683a047cd373959bb022bde1321fb72d"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "bfb60df21570415b1860c25c2dae7722cf158ed9"}, "mesh_utils": {"master": "3365df3faf89a4c29c3b4664b53e9007e4e6267b"}, "broken_seals_module": {"master": "9f89e2a4e7b59351ac4cb4c4dc5f88e5b60a2f15"}, "thread_pool": {"master": "b1030eaf92ba595c56ae8caac90b58081303d16f"}}
\ No newline at end of file
+{"engine": {"3.2": "cc3c671f3b636cbfac9fc74095d5bee753e71ed5", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "c7a98e704dd62782b9f8b4a22b74787278574657"}, "entity_spell_system": {"master": "fe16d4573ffc5d200b2d0a155917455c2a1226a6"}, "ui_extensions": {"master": "07c50b139fd3db4cb813db9955187f9530b754bb"}, "voxelman": {"master": "a714e81db38457c80d37fe9d77956684d6c932d8"}, "texture_packer": {"master": "f98b7410cd3f2a743cb57456910ad9f93ef89937"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "b852ab0e525addbd11ebcdd7d16b7536171837be"}, "procedural_animations": {"master": "ec465a7a683a047cd373959bb022bde1321fb72d"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "bfb60df21570415b1860c25c2dae7722cf158ed9"}, "mesh_utils": {"master": "3365df3faf89a4c29c3b4664b53e9007e4e6267b"}, "broken_seals_module": {"master": "9f89e2a4e7b59351ac4cb4c4dc5f88e5b60a2f15"}, "thread_pool": {"master": "b1030eaf92ba595c56ae8caac90b58081303d16f"}}
\ No newline at end of file
diff --git a/game/modules/entity_classes/naturalist/1_naturalist_vendor.tres b/game/modules/entity_classes/naturalist/1_naturalist_vendor.tres
new file mode 100644
index 00000000..615b41b1
--- /dev/null
+++ b/game/modules/entity_classes/naturalist/1_naturalist_vendor.tres
@@ -0,0 +1,21 @@
+[gd_resource type="EntityClassData" load_steps=7 format=2]
+
+[ext_resource path="res://modules/core/item_templates/2_test.tres" type="ItemTemplate" id=1]
+[ext_resource path="res://modules/core/item_templates/3_chest_of_the_infinite_wisdom.tres" type="ItemTemplate" id=2]
+[ext_resource path="res://scripts/entities/EntityClassDataGD.gd" type="Script" id=13]
+
+[sub_resource type="VendorItemDataEntry" id=1]
+item = ExtResource( 2 )
+
+[sub_resource type="VendorItemDataEntry" id=2]
+item = ExtResource( 1 )
+
+[sub_resource type="VendorItemData" id=3]
+vendor_datas = [ SubResource( 1 ), SubResource( 2 ) ]
+
+[resource]
+resource_name = "Naturalist"
+id = 1
+text_name = "Naturalist"
+vendor_item_data = SubResource( 3 )
+script = ExtResource( 13 )
diff --git a/game/modules/entity_classes/naturalist/entities/1_naturalist.tres b/game/modules/entity_classes/naturalist/entities/1_naturalist.tres
index 57d0c95a..04bfd9ce 100644
--- a/game/modules/entity_classes/naturalist/entities/1_naturalist.tres
+++ b/game/modules/entity_classes/naturalist/entities/1_naturalist.tres
@@ -1,10 +1,8 @@
-[gd_resource type="EntityData" load_steps=8 format=2]
+[gd_resource type="EntityData" load_steps=6 format=2]
 
-[ext_resource path="res://modules/core/crafting/2_chest_of_the_infinite_wisdom.tres" type="CraftRecipe" id=1]
 [ext_resource path="res://modules/entity_classes/naturalist/1_naturalist.tres" type="EntityClassData" id=2]
 [ext_resource path="res://modules/species/species_human.tres" type="EntitySpeciesData" id=3]
 [ext_resource path="res://scripts/entities/EntityDataGD.gd" type="Script" id=4]
-[ext_resource path="res://modules/core/crafting/1_test_craft.tres" type="CraftRecipe" id=5]
 
 [sub_resource type="SimpleLevelStatData" id=1]
 agility = 4
@@ -35,5 +33,4 @@ bag_size = 24
 stat_data = SubResource( 2 )
 entity_species_data = ExtResource( 3 )
 entity_class_data = ExtResource( 2 )
-craft_recipes = [ ExtResource( 5 ), ExtResource( 1 ) ]
 script = ExtResource( 4 )
diff --git a/game/modules/entity_classes/naturalist/entities/4_naturalist_vendor.tres b/game/modules/entity_classes/naturalist/entities/4_naturalist_vendor.tres
index db1996c8..9360eea9 100644
--- a/game/modules/entity_classes/naturalist/entities/4_naturalist_vendor.tres
+++ b/game/modules/entity_classes/naturalist/entities/4_naturalist_vendor.tres
@@ -1,10 +1,8 @@
-[gd_resource type="EntityData" load_steps=11 format=2]
+[gd_resource type="EntityData" load_steps=6 format=2]
 
 [ext_resource path="res://scripts/entities/EntityDataGD.gd" type="Script" id=1]
 [ext_resource path="res://modules/species/species_human.tres" type="EntitySpeciesData" id=2]
-[ext_resource path="res://modules/entity_classes/naturalist/1_naturalist.tres" type="EntityClassData" id=3]
-[ext_resource path="res://modules/core/item_templates/3_chest_of_the_infinite_wisdom.tres" type="ItemTemplate" id=4]
-[ext_resource path="res://modules/core/item_templates/2_test.tres" type="ItemTemplate" id=5]
+[ext_resource path="res://modules/entity_classes/naturalist/1_naturalist_vendor.tres" type="EntityClassData" id=3]
 
 [sub_resource type="SimpleLevelStatData" id=1]
 agility = 3
@@ -24,17 +22,6 @@ stat/health = 20.0
 stat/mana = 20.0
 stat/global_cooldown = 1.5
 
-[sub_resource type="VendorItemDataEntry" id=3]
-item = ExtResource( 5 )
-count = 1
-
-[sub_resource type="VendorItemDataEntry" id=4]
-item = ExtResource( 4 )
-count = 1
-
-[sub_resource type="VendorItemData" id=5]
-vendor_datas = [ SubResource( 3 ), SubResource( 4 ) ]
-
 [resource]
 resource_name = "Naturalist Vendor"
 id = 3
@@ -44,5 +31,4 @@ text_name = "Naturalist Vendor"
 stat_data = SubResource( 2 )
 entity_species_data = ExtResource( 2 )
 entity_class_data = ExtResource( 3 )
-vendor_item_data = SubResource( 5 )
 script = ExtResource( 1 )
diff --git a/game/modules/entity_classes/naturalist/game_module.tres b/game/modules/entity_classes/naturalist/game_module.tres
index c7088ca6..5923e921 100644
--- a/game/modules/entity_classes/naturalist/game_module.tres
+++ b/game/modules/entity_classes/naturalist/game_module.tres
@@ -5,4 +5,5 @@
 
 [resource]
 script = ExtResource( 1 )
+enabled = true
 resource_db = ExtResource( 2 )
diff --git a/game/ui/vendor_window/VendorWindow.gd b/game/ui/vendor_window/VendorWindow.gd
index 82dae887..0fec5cad 100644
--- a/game/ui/vendor_window/VendorWindow.gd
+++ b/game/ui/vendor_window/VendorWindow.gd
@@ -134,7 +134,7 @@ func _visibility_changed() -> void:
 		if !t:
 			return
 			
-		_vendor_item_data = t.getc_entity_data().get_vendor_item_data()
+		_vendor_item_data = t.getc_entity_data().entity_class_data.get_vendor_item_data()
 
 		_page = 0
 		refresh_all()