diff --git a/data/area/asgarnia/dwarven_mines/living_rock_caverns/living_rock_caverns.areas.toml b/data/area/asgarnia/dwarven_mines/living_rock_caverns/living_rock_caverns.areas.toml
new file mode 100644
index 0000000000..0762045c50
--- /dev/null
+++ b/data/area/asgarnia/dwarven_mines/living_rock_caverns/living_rock_caverns.areas.toml
@@ -0,0 +1,3 @@
+[living_rock_caverns_fishing_area]
+x = [3584, 3710]
+y = [5056, 5182]
diff --git a/data/area/asgarnia/dwarven_mines/living_rock_caverns/living_rock_caverns.npcs.toml b/data/area/asgarnia/dwarven_mines/living_rock_caverns/living_rock_caverns.npcs.toml
index 08ace6bd01..bca0216845 100644
--- a/data/area/asgarnia/dwarven_mines/living_rock_caverns/living_rock_caverns.npcs.toml
+++ b/data/area/asgarnia/dwarven_mines/living_rock_caverns/living_rock_caverns.npcs.toml
@@ -14,10 +14,12 @@ examine = "What are these things?"
 
 [cavefish_shoal]
 id = 8841
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_cavefish"] } }
 examine = "It looks like there are fish swimming in the water."
 
 [rocktail_shoal]
 id = 8842
+fishing_bait = { items = ["fishing_rod"], bait = { living_minerals = ["raw_rocktail"] } }
 examine = "It looks like there are fish swimming in the water."
 
 [living_rock_caverns_controller]
diff --git a/data/area/asgarnia/entrana/entrana.areas.toml b/data/area/asgarnia/entrana/entrana.areas.toml
index f9f71fa844..6df27dc742 100644
--- a/data/area/asgarnia/entrana/entrana.areas.toml
+++ b/data/area/asgarnia/entrana/entrana.areas.toml
@@ -2,4 +2,12 @@
 x = [2783,2879]
 y = [3328,3391]
 tags = ["penguin_area"]
-hint = "where no weapons may go."
\ No newline at end of file
+hint = "where no weapons may go."
+
+[entrana_dock_fishing_area]
+x = [ 2875, 2879 ]
+y = [ 3331, 3342 ]
+
+[entrana_river_fishing_area]
+x = [ 2840, 2850 ]
+y = [ 3356, 3361 ]
diff --git a/data/area/asgarnia/entrana/entrana.npc-spawns.toml b/data/area/asgarnia/entrana/entrana.npc-spawns.toml
index 4cc06166b9..6b6e0d3690 100644
--- a/data/area/asgarnia/entrana/entrana.npc-spawns.toml
+++ b/data/area/asgarnia/entrana/entrana.npc-spawns.toml
@@ -19,10 +19,10 @@ spawns = [
   { id = "fishing_spot_entrana", x = 2842, y = 3359, members = true },
   { id = "fishing_spot_entrana", x = 2845, y = 3356, members = true },
   { id = "fishing_spot_entrana", x = 2849, y = 3361, members = true },
-  { id = "fishing_spot_entrana_2", x = 2875, y = 3342, members = true },
-  { id = "fishing_spot_entrana_2", x = 2876, y = 3331, members = true },
-  { id = "fishing_spot_entrana_2", x = 2877, y = 3331, members = true },
-  { id = "fishing_spot_entrana_2", x = 2877, y = 3342, members = true },
+  { id = "fishing_spot_entrana_net", x = 2875, y = 3342, members = true },
+  { id = "fishing_spot_entrana_net", x = 2876, y = 3331, members = true },
+  { id = "fishing_spot_entrana_net", x = 2877, y = 3331, members = true },
+  { id = "fishing_spot_entrana_net", x = 2877, y = 3342, members = true },
   { id = "fritz_the_glassblower", x = 2831, y = 3350, members = true },
   { id = "auguste_entrana", x = 2808, y = 3355 },
   { id = "frincos", x = 2808, y = 3342 },
diff --git a/data/area/asgarnia/entrana/entrana.npcs.toml b/data/area/asgarnia/entrana/entrana.npcs.toml
index a20e4dd23a..844bff319e 100644
--- a/data/area/asgarnia/entrana/entrana.npcs.toml
+++ b/data/area/asgarnia/entrana/entrana.npcs.toml
@@ -38,9 +38,13 @@ examine = "Mazion seems to be covered in sand."
 
 [fishing_spot_entrana]
 id = 318
+fishing_lure = { items = ["fly_fishing_rod"], bait = { feather = ["raw_trout", "raw_salmon"], stripy_feather = ["raw_rainbow_fish"] } }
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_pike"] } }
 
-[fishing_spot_entrana_2]
+[fishing_spot_entrana_net]
 id = 319
+fishing_net = { items = ["small_fishing_net"], bait = { none = ["raw_shrimps", "raw_anchovies"] } }
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_sardine", "raw_herring"] } }
 
 [fritz_the_glassblower]
 id = 4909
diff --git a/data/area/asgarnia/falador/falador.objs.toml b/data/area/asgarnia/falador/falador.objs.toml
index 0ca6dfd3d0..001ff3f0fc 100644
--- a/data/area/asgarnia/falador/falador.objs.toml
+++ b/data/area/asgarnia/falador/falador.objs.toml
@@ -21,3 +21,7 @@ examine = "A tunnel leading under the wall."
 [cooking_range_falador]
 id = 2728
 examine = "Ideal for cooking on."
+
+[spinning_wheel_falador]
+id = 2644
+examine = "Used for spinning thread."
\ No newline at end of file
diff --git a/data/area/asgarnia/mudskipper_point/mudskipper_point.npcs.toml b/data/area/asgarnia/mudskipper_point/mudskipper_point.npcs.toml
index 2035a59900..6c052304b4 100644
--- a/data/area/asgarnia/mudskipper_point/mudskipper_point.npcs.toml
+++ b/data/area/asgarnia/mudskipper_point/mudskipper_point.npcs.toml
@@ -13,6 +13,8 @@ id = 2727
 
 [fishing_spot_mudskipper_point]
 id = 325
+fishing_net = { items = ["small_fishing_net"], bait = { none = ["raw_shrimps", "raw_anchovies"] } }
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_sardine", "raw_herring"] } }
 
 [giant_rat_mudskipper_point]
 id = 446
diff --git a/data/area/asgarnia/taverley/dungeon/taverley_dungeon.areas.toml b/data/area/asgarnia/taverley/dungeon/taverley_dungeon.areas.toml
new file mode 100644
index 0000000000..a85f852c72
--- /dev/null
+++ b/data/area/asgarnia/taverley/dungeon/taverley_dungeon.areas.toml
@@ -0,0 +1,3 @@
+[taverley_dungeon_fishing_area]
+x = [2878, 2901]
+y = [9761, 9766]
diff --git a/data/area/asgarnia/taverley/dungeon/taverley_dungeon.npcs.toml b/data/area/asgarnia/taverley/dungeon/taverley_dungeon.npcs.toml
index a46caba1cb..67b972fce7 100644
--- a/data/area/asgarnia/taverley/dungeon/taverley_dungeon.npcs.toml
+++ b/data/area/asgarnia/taverley/dungeon/taverley_dungeon.npcs.toml
@@ -13,6 +13,7 @@ examine = "A dusty old suit of armour."
 
 [fishing_spot_taverley_dungeon]
 id = 800
+fishing_bait = { items = ["oily_fishing_rod"], bait = { fishing_bait = ["raw_lava_eel"] } }
 examine = "It looks like there might be eels swimming in the lava."
 
 [kharid_scorpion_taverley_dungeon]
diff --git a/data/area/fremennik_province/fremennik_isles/jatizso/jatizso.areas.toml b/data/area/fremennik_province/fremennik_isles/jatizso/jatizso.areas.toml
new file mode 100644
index 0000000000..45a9d74e1d
--- /dev/null
+++ b/data/area/fremennik_province/fremennik_isles/jatizso/jatizso.areas.toml
@@ -0,0 +1,3 @@
+[jatizso_fishing_area]
+x = [2401, 2424]
+y = [3778, 3791]
diff --git a/data/area/fremennik_province/fremennik_isles/jatizso/jatizso.npc-spawns.toml b/data/area/fremennik_province/fremennik_isles/jatizso/jatizso.npc-spawns.toml
index e4968f1161..b06b9d6048 100644
--- a/data/area/fremennik_province/fremennik_isles/jatizso/jatizso.npc-spawns.toml
+++ b/data/area/fremennik_province/fremennik_isles/jatizso/jatizso.npc-spawns.toml
@@ -4,11 +4,11 @@ spawns = [
   { id = "fishing_spot_jatizso", x = 2414, y = 3783, members = true },
   { id = "fishing_spot_jatizso", x = 2419, y = 3789, members = true },
   { id = "fishing_spot_jatizso", x = 2424, y = 3782, members = true },
-  { id = "fishing_spot_jatizso_2", x = 2403, y = 3778, members = true },
-  { id = "fishing_spot_jatizso_2", x = 2409, y = 3780, members = true },
-  { id = "fishing_spot_jatizso_2", x = 2409, y = 3783, members = true },
-  { id = "fishing_spot_jatizso_2", x = 2419, y = 3783, members = true },
-  { id = "fishing_spot_jatizso_2", x = 2422, y = 3789, members = true },
+  { id = "fishing_spot_jatizso_big_net", x = 2403, y = 3778, members = true },
+  { id = "fishing_spot_jatizso_big_net", x = 2409, y = 3780, members = true },
+  { id = "fishing_spot_jatizso_big_net", x = 2409, y = 3783, members = true },
+  { id = "fishing_spot_jatizso_big_net", x = 2419, y = 3783, members = true },
+  { id = "fishing_spot_jatizso_big_net", x = 2422, y = 3789, members = true },
   { id = "king_gjuki_sorvott_iv", x = 2407, y = 3802 },
   { id = "hrh_hrafn", x = 2408, y = 3802, members = true },
   { id = "thorkel_silkbeard", x = 2409, y = 3804, members = true },
diff --git a/data/area/fremennik_province/fremennik_isles/jatizso/jatizso.npcs.toml b/data/area/fremennik_province/fremennik_isles/jatizso/jatizso.npcs.toml
index 8ba8368d05..2000e2aec5 100644
--- a/data/area/fremennik_province/fremennik_isles/jatizso/jatizso.npcs.toml
+++ b/data/area/fremennik_province/fremennik_isles/jatizso/jatizso.npcs.toml
@@ -1,8 +1,21 @@
 [fishing_spot_jatizso]
 id = 5470
+fishing_cage = { items = ["lobster_pot"], bait = { none = ["raw_lobster"] } }
+fishing_harpoon = { items = ["harpoon", "barb_tail_harpoon"], bait = { none = ["raw_tuna", "raw_swordfish"] } }
 
-[fishing_spot_jatizso_2]
+[fishing_spot_jatizso_big_net]
 id = 5471
+fishing_net = { items = ["big_fishing_net"], bait = { none = [
+    "raw_mackerel",
+    "raw_cod",
+    "raw_bass",
+    "oyster",
+    "casket",
+    "seaweed",
+    "leather_gloves",
+    "leather_boots"
+] } }
+fishing_harpoon = { items = ["harpoon", "barb_tail_harpoon"], bait = { none = ["raw_shark"] } }
 
 [king_gjuki_sorvott_iv]
 id = 5478
diff --git a/data/area/fremennik_province/fremennik_isles/neitiznot/neitiznot.objs.toml b/data/area/fremennik_province/fremennik_isles/neitiznot/neitiznot.objs.toml
index 2e56193ddf..0926dbe927 100644
--- a/data/area/fremennik_province/fremennik_isles/neitiznot/neitiznot.objs.toml
+++ b/data/area/fremennik_province/fremennik_isles/neitiznot/neitiznot.objs.toml
@@ -5,3 +5,11 @@ examine = "An open bank chest."
 [cooking_range_neitiznot]
 id = 21302
 examine = "Cook your food here."
+
+[furnace_clay_forge_neitiznot]
+id = 21303
+examine = "For smelting metal."
+
+[spinning_wheel_neitiznot]
+id = 21304
+examine = "Used for spinning thread."
diff --git a/data/area/fremennik_province/rellekka/rellekka.areas.toml b/data/area/fremennik_province/rellekka/rellekka.areas.toml
index 79fc6837b5..a0ca7c52e5 100644
--- a/data/area/fremennik_province/rellekka/rellekka.areas.toml
+++ b/data/area/fremennik_province/rellekka/rellekka.areas.toml
@@ -14,3 +14,20 @@ hint = "between Fremennik and barbarians."
 x = [2792, 2794]
 y = [3611, 3613]
 tags = ["teleport"]
+
+[rellekka_small_net_fishing_area]
+x = [2633, 2633]
+y = [3687, 3694]
+
+[rellekka_cage_fishing_area]
+x = [2639, 2642]
+y = [3694, 3699]
+
+[rellekka_big_net_fishing_area]
+x = [2641, 2648]
+y = [3708, 3711]
+
+[rellekka_south_fishing_area]
+x = [2675, 2693]
+y = [3592, 3598]
+
diff --git a/data/area/fremennik_province/rellekka/rellekka.npc-spawns.toml b/data/area/fremennik_province/rellekka/rellekka.npc-spawns.toml
index c6e86f22b4..5b6669d0bd 100644
--- a/data/area/fremennik_province/rellekka/rellekka.npc-spawns.toml
+++ b/data/area/fremennik_province/rellekka/rellekka.npc-spawns.toml
@@ -141,14 +141,14 @@ spawns = [
   { id = "fishing_spot_rellekka", x = 2633, y = 3687, members = true },
   { id = "fishing_spot_rellekka", x = 2633, y = 3690, members = true },
   { id = "fishing_spot_rellekka", x = 2633, y = 3693, members = true },
-  { id = "fishing_spot_rellekka_2", x = 2639, y = 3695, members = true },
-  { id = "fishing_spot_rellekka_2", x = 2639, y = 3699, members = true },
-  { id = "fishing_spot_rellekka_2", x = 2642, y = 3695, members = true },
-  { id = "fishing_spot_rellekka_2", x = 2642, y = 3699, members = true },
-  { id = "fishing_spot_rellekka_3", x = 2642, y = 3708, members = true },
-  { id = "fishing_spot_rellekka_3", x = 2645, y = 3708, members = true },
-  { id = "fishing_spot_rellekka_3", x = 2648, y = 3708, members = true },
-  { id = "fishing_spot_rellekka_3", x = 2648, y = 3711, members = true },
+  { id = "fishing_spot_rellekka_cage", x = 2639, y = 3695, members = true },
+  { id = "fishing_spot_rellekka_cage", x = 2639, y = 3699, members = true },
+  { id = "fishing_spot_rellekka_cage", x = 2642, y = 3695, members = true },
+  { id = "fishing_spot_rellekka_cage", x = 2642, y = 3699, members = true },
+  { id = "fishing_spot_rellekka_big_net", x = 2642, y = 3708, members = true },
+  { id = "fishing_spot_rellekka_big_net", x = 2645, y = 3708, members = true },
+  { id = "fishing_spot_rellekka_big_net", x = 2648, y = 3708, members = true },
+  { id = "fishing_spot_rellekka_big_net", x = 2648, y = 3711, members = true },
   { id = "svidi", x = 2714, y = 3672 },
   { id = "rhonen", x = 2666, y = 3530, members = true },
   { id = "jarvald_rellekka", x = 2621, y = 3683, members = true },
diff --git a/data/area/fremennik_province/rellekka/rellekka.npcs.toml b/data/area/fremennik_province/rellekka/rellekka.npcs.toml
index 087efa3ace..5c9bba92b9 100644
--- a/data/area/fremennik_province/rellekka/rellekka.npcs.toml
+++ b/data/area/fremennik_province/rellekka/rellekka.npcs.toml
@@ -248,12 +248,27 @@ examine = "Fearsome predator found only in the Fremennik Province, renowned for
 
 [fishing_spot_rellekka]
 id = 1331
+fishing_net = { items = ["small_fishing_net"], bait = { none = ["raw_shrimps", "raw_anchovies"] } }
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_sardine", "raw_herring"] } }
 
-[fishing_spot_rellekka_2]
+[fishing_spot_rellekka_cage]
 id = 1332
+fishing_cage = { items = ["lobster_pot"], bait = { none = ["raw_lobster"] } }
+fishing_harpoon = { items = ["harpoon", "barb_tail_harpoon"], bait = { none = ["raw_tuna", "raw_swordfish"] } }
 
-[fishing_spot_rellekka_3]
+[fishing_spot_rellekka_big_net]
 id = 1333
+fishing_net = { items = ["big_fishing_net"], bait = { none = [
+    "raw_mackerel",
+    "raw_cod",
+    "raw_bass",
+    "oyster",
+    "casket",
+    "seaweed",
+    "leather_gloves",
+    "leather_boots"
+] } }
+fishing_harpoon = { items = ["harpoon", "barb_tail_harpoon"], bait = { none = ["raw_shark"] } }
 
 [rhonen]
 id = 2334
@@ -314,9 +329,11 @@ id = 7575
 
 [fishing_spot_rellekka_4]
 id = 7862
+fishing_cage = { items = ["lobster_pot"], bait = { none = ["raw_lobster"] } }
 
 [fishing_spot_rellekka_5]
 id = 7863
+fishing_cage = { items = ["lobster_pot"], bait = { none = ["raw_lobster"] } }
 
 [larry_rellekka_2]
 id = 8694
diff --git a/data/area/fremennik_province/rellekka/rellekka.objs.toml b/data/area/fremennik_province/rellekka/rellekka.objs.toml
index 87cc15c020..80e6995447 100644
--- a/data/area/fremennik_province/rellekka/rellekka.objs.toml
+++ b/data/area/fremennik_province/rellekka/rellekka.objs.toml
@@ -25,3 +25,16 @@ id = 4276
 [fire_rellekka]
 id = 4265
 examine = "Toasty."
+
+[furnace_rellekka]
+id = 4304
+examine = "A hot furnace."
+
+[spinning_wheel_rellekka]
+id = 4309
+examine = "Used for spinning thread."
+
+[potters_wheel_rellekka]
+id = 4310
+examine = "Used for fashioning clay items."
+
diff --git a/data/area/kandarin/ape_atoll/ape_atoll.areas.toml b/data/area/kandarin/ape_atoll/ape_atoll.areas.toml
index 2edb954985..2d787608ca 100644
--- a/data/area/kandarin/ape_atoll/ape_atoll.areas.toml
+++ b/data/area/kandarin/ape_atoll/ape_atoll.areas.toml
@@ -14,3 +14,11 @@ hint = "where monkeys rule."
 x = [3008, 3071]
 y = [5440, 5503]
 tags = ["multi_combat"]
+
+[ape_atoll_east_fishing_area]
+x = [2771, 2780]
+y = [2733, 2741]
+
+[ape_atoll_west_fishing_area]
+x = [2693, 2700]
+y = [2702, 2715]
diff --git a/data/area/kandarin/ape_atoll/ape_atoll.npcs.toml b/data/area/kandarin/ape_atoll/ape_atoll.npcs.toml
index 06e7066003..c0d916b6b7 100644
--- a/data/area/kandarin/ape_atoll/ape_atoll.npcs.toml
+++ b/data/area/kandarin/ape_atoll/ape_atoll.npcs.toml
@@ -46,9 +46,31 @@ id = 13240
 
 [fishing_spot_ape_atoll]
 id = 1405
+fishing_net = { items = ["big_fishing_net"], bait = { none = [
+    "raw_mackerel",
+    "raw_cod",
+    "raw_bass",
+    "oyster",
+    "casket",
+    "seaweed",
+    "leather_gloves",
+    "leather_boots"
+] } }
+fishing_harpoon = { items = ["harpoon", "barb_tail_harpoon"], bait = { none = ["raw_shark"] } }
 
 [fishing_spot_ape_atoll_2]
 id = 1406
+fishing_net = { items = ["big_fishing_net"], bait = { none = [
+    "raw_mackerel",
+    "raw_cod",
+    "raw_bass",
+    "oyster",
+    "casket",
+    "seaweed",
+    "leather_gloves",
+    "leather_boots"
+] } }
+fishing_harpoon = { items = ["harpoon", "barb_tail_harpoon"], bait = { none = ["raw_shark"] } }
 
 [garkor]
 id = 1411
diff --git a/data/area/kandarin/ardougne/ardougne.areas.toml b/data/area/kandarin/ardougne/ardougne.areas.toml
index 786758f526..3cd5fb66e5 100644
--- a/data/area/kandarin/ardougne/ardougne.areas.toml
+++ b/data/area/kandarin/ardougne/ardougne.areas.toml
@@ -26,8 +26,8 @@ tags = ["penguin_area"]
 hint = "near the coast, east of Ardougne."
 
 [north_ardougne]
-x = [2368,2368,2687,2687,2431,2431]
-y = [3328,3391,3391,3340,3340,3328]
+x = [2368, 2368, 2687, 2687, 2431, 2431]
+y = [3328, 3391, 3391, 3340, 3340, 3328]
 tags = ["penguin_area"]
 hint = "north of Ardougne."
 
@@ -38,7 +38,11 @@ tags = ["penguin_area"]
 hint = "west of Ardougne, in the hills."
 
 [south_ardougne]
-x = [2432,2432,2368,2368,2432,2432,2687,2687]
-y = [3072,3136,3136,3199,3199,3263,3263,3072]
+x = [2432, 2432, 2368, 2368, 2432, 2432, 2687, 2687]
+y = [3072, 3136, 3136, 3199, 3199, 3263, 3263, 3072]
 tags = ["penguin_area"]
 hint = "south of Ardougne."
+
+[ardounge_fishing_area]
+x = [2561, 2568]
+y = [3365, 3374]
diff --git a/data/area/kandarin/ardougne/east_ardougne.npcs.toml b/data/area/kandarin/ardougne/east_ardougne.npcs.toml
index 1e13547502..c3f8d8df9a 100644
--- a/data/area/kandarin/ardougne/east_ardougne.npcs.toml
+++ b/data/area/kandarin/ardougne/east_ardougne.npcs.toml
@@ -172,6 +172,8 @@ examine = "A holy man."
 
 [fishing_spot_ardougne]
 id = 311
+fishing_lure = { items = ["fly_fishing_rod"], bait = { feather = ["raw_trout", "raw_salmon"], stripy_feather = ["raw_rainbow_fish"] } }
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_pike"] } }
 
 [guard_ardougne]
 id = 32
diff --git a/data/area/kandarin/ardougne/east_ardougne.objs.toml b/data/area/kandarin/ardougne/east_ardougne.objs.toml
index 576a8e9aeb..c462fdaeca 100644
--- a/data/area/kandarin/ardougne/east_ardougne.objs.toml
+++ b/data/area/kandarin/ardougne/east_ardougne.objs.toml
@@ -166,3 +166,7 @@ examine = "Ideal for cooking on."
 [cooking_range_ardougne]
 id = 34565
 examine = "An appliance used for cooking."
+
+[potters_wheel_ardougne]
+id = 34801
+examine = "Used for fashioning clay items."
diff --git a/data/area/kandarin/ardougne/witchaven/witchaven.objs.toml b/data/area/kandarin/ardougne/witchaven/witchaven.objs.toml
new file mode 100644
index 0000000000..c476e9b031
--- /dev/null
+++ b/data/area/kandarin/ardougne/witchaven/witchaven.objs.toml
@@ -0,0 +1,3 @@
+[spinning_wheel_witchaven]
+id = 8748
+examine = "Used for spinning thread."
diff --git a/data/area/kandarin/barbarian_outpost/barbarian_outpost.areas.toml b/data/area/kandarin/barbarian_outpost/barbarian_outpost.areas.toml
index 1e6e660a04..9ced302bdd 100644
--- a/data/area/kandarin/barbarian_outpost/barbarian_outpost.areas.toml
+++ b/data/area/kandarin/barbarian_outpost/barbarian_outpost.areas.toml
@@ -12,4 +12,8 @@ tags = ["teleport"]
 x = [2380,2380,2496,2496,2623,2623]
 y = [3520,3550,3551,3596,3597,3520]
 tags = ["penguin_area"]
-hint = "near the Barbarian Outpost."
\ No newline at end of file
+hint = "near the Barbarian Outpost."
+
+[barbarian_outpost_fishing_area]
+x = [2498, 2516]
+y = [3547, 3575]
diff --git a/data/area/kandarin/barbarian_outpost/barbarian_outpost.npcs.toml b/data/area/kandarin/barbarian_outpost/barbarian_outpost.npcs.toml
index 7f0e330b35..c020797111 100644
--- a/data/area/kandarin/barbarian_outpost/barbarian_outpost.npcs.toml
+++ b/data/area/kandarin/barbarian_outpost/barbarian_outpost.npcs.toml
@@ -13,6 +13,8 @@ examine = "He maintains this agility course."
 
 [fishing_spot_barbarian_outpost]
 id = 2724
+fishing_net = { items = ["small_fishing_net"], bait = { none = ["raw_shrimps", "raw_anchovies"] } }
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_sardine", "raw_herring"] } }
 
 [barbarian_barbarian_outpost]
 id = 3246
diff --git a/data/area/kandarin/baxtorian_falls/baxtorian_falls.areas.toml b/data/area/kandarin/baxtorian_falls/baxtorian_falls.areas.toml
new file mode 100644
index 0000000000..5237416247
--- /dev/null
+++ b/data/area/kandarin/baxtorian_falls/baxtorian_falls.areas.toml
@@ -0,0 +1,7 @@
+[baxtorian_water_falls_fishing_area]
+x = [2502, 2508]
+y = [3420, 3422]
+
+[baxtorian_falls_fishing_area]
+x = [2527, 2537]
+y = [3403, 3412]
diff --git a/data/area/kandarin/baxtorian_falls/baxtorian_falls.npc-spawns.toml b/data/area/kandarin/baxtorian_falls/baxtorian_falls.npc-spawns.toml
index 542aec7938..3d7709b5de 100644
--- a/data/area/kandarin/baxtorian_falls/baxtorian_falls.npc-spawns.toml
+++ b/data/area/kandarin/baxtorian_falls/baxtorian_falls.npc-spawns.toml
@@ -16,12 +16,12 @@ spawns = [
   { id = "gerald_baxtorian_falls", x = 2528, y = 3414 },
   { id = "almera_baxtorian_falls", x = 2522, y = 3498 },
   { id = "hudon_baxtorian_falls", x = 2511, y = 3484 },
-  { id = "fishing_spot_baxtorian_falls_2", x = 2508, y = 3421, members = true },
-  { id = "fishing_spot_baxtorian_falls_2", x = 2527, y = 3412, members = true },
-  { id = "fishing_spot_baxtorian_falls_2", x = 2530, y = 3412, members = true },
-  { id = "fishing_spot_baxtorian_falls_2", x = 2532, y = 3411, members = true },
-  { id = "fishing_spot_baxtorian_falls_2", x = 2534, y = 3403, members = true },
-  { id = "fishing_spot_baxtorian_falls_2", x = 2537, y = 3406, members = true },
+  { id = "fishing_spot_baxtorian_falls_lure", x = 2508, y = 3421, members = true },
+  { id = "fishing_spot_baxtorian_falls_lure", x = 2527, y = 3412, members = true },
+  { id = "fishing_spot_baxtorian_falls_lure", x = 2530, y = 3412, members = true },
+  { id = "fishing_spot_baxtorian_falls_lure", x = 2532, y = 3411, members = true },
+  { id = "fishing_spot_baxtorian_falls_lure", x = 2534, y = 3403, members = true },
+  { id = "fishing_spot_baxtorian_falls_lure", x = 2537, y = 3406, members = true },
   { id = "guard_baxtorian_falls", x = 2554, y = 3472 },
   { id = "guard_baxtorian_falls_2", x = 2554, y = 3476 },
   { id = "fire_giant_spikes", x = 1233, y = 4566 },
diff --git a/data/area/kandarin/baxtorian_falls/baxtorian_falls.npcs.toml b/data/area/kandarin/baxtorian_falls/baxtorian_falls.npcs.toml
index 2856a040b9..5b886c4bed 100644
--- a/data/area/kandarin/baxtorian_falls/baxtorian_falls.npcs.toml
+++ b/data/area/kandarin/baxtorian_falls/baxtorian_falls.npcs.toml
@@ -28,8 +28,10 @@ examine = "Nice hair."
 id = 305
 examine = "Looks young."
 
-[fishing_spot_baxtorian_falls_2]
+[fishing_spot_baxtorian_falls_lure]
 id = 310
+fishing_lure = { items = ["fly_fishing_rod"], bait = { feather = ["raw_trout", "raw_salmon"], stripy_feather = ["raw_rainbow_fish"] } }
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_pike"] } }
 
 [guard_baxtorian_falls]
 id = 4259
diff --git a/data/area/kandarin/catherby/catherby.areas.toml b/data/area/kandarin/catherby/catherby.areas.toml
index af77523a82..3fc7f018f9 100644
--- a/data/area/kandarin/catherby/catherby.areas.toml
+++ b/data/area/kandarin/catherby/catherby.areas.toml
@@ -15,4 +15,12 @@ y = [3427, 3432]
 x = [2784, 2879]
 y = [3392, 3519]
 tags = ["penguin_area"]
-hint = "near a mountain of wolves."
\ No newline at end of file
+hint = "near a mountain of wolves."
+
+[catherby_fishing_area]
+x = [2836, 2846]
+y = [3429, 3431]
+
+[catherby_cage_fishing_area]
+x = [2853, 2860]
+y = [3423, 3426]
diff --git a/data/area/kandarin/catherby/catherby.npcs.toml b/data/area/kandarin/catherby/catherby.npcs.toml
index 275ce959f7..b2db430298 100644
--- a/data/area/kandarin/catherby/catherby.npcs.toml
+++ b/data/area/kandarin/catherby/catherby.npcs.toml
@@ -93,4 +93,31 @@ examine = "He looks short and grumpy."
 id = 2324
 north_patch = "farming_veg_patch_catherby_north"
 south_patch = "farming_veg_patch_catherby_south"
-examine = "Perhaps this gardener might look after your crops for you."
\ No newline at end of file
+examine = "Perhaps this gardener might look after your crops for you."
+
+[fishing_spot_big_net_harpoon_catherby]
+id = 322
+fishing_net = { items = ["big_fishing_net"], bait = { none = [
+    "raw_mackerel",
+    "raw_cod",
+    "raw_bass",
+    "oyster",
+    "casket",
+    "seaweed",
+    "leather_gloves",
+    "leather_boots"
+] } }
+fishing_harpoon = { items = ["harpoon", "barb_tail_harpoon"], bait = { none = ["raw_shark"] } }
+examine = "I can see fish swimming in the water."
+
+[fishing_spot_cage_harpoon_catherby]
+id = 321
+fishing_cage = { items = ["lobster_pot"], bait = { none = ["raw_lobster"] } }
+fishing_harpoon = { items = ["harpoon", "barb_tail_harpoon"], bait = { none = ["raw_tuna", "raw_swordfish"] } }
+examine = "It looks like there might be fish swimming in the water."
+
+[fishing_spot_small_net_bait_catherby]
+id = 320
+fishing_net = { items = ["small_fishing_net"], bait = { none = ["raw_shrimps", "raw_anchovies"] } }
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_sardine", "raw_herring"] } }
+examine = "It looks like there might be fish swimming in the water."
diff --git a/data/area/kandarin/feldip_hills/feldip_hills.areas.toml b/data/area/kandarin/feldip_hills/feldip_hills.areas.toml
index 67a5a4114a..5b90d14916 100644
--- a/data/area/kandarin/feldip_hills/feldip_hills.areas.toml
+++ b/data/area/kandarin/feldip_hills/feldip_hills.areas.toml
@@ -15,3 +15,15 @@ x = [2368, 2687]
 y = [2816, 2943]
 tags = ["penguin_area"]
 hint = "near some ogres in South Feldip Hills."
+
+[feldip_hills_north_fishing_area]
+x = [2455, 2468]
+y = [2927, 2936]
+
+[feldip_hills_fishing_area]
+x = [2442, 2450]
+y = [2915, 2922]
+
+[feldip_hills_south_fishing_area]
+x = [2435, 2436]
+y = [2890, 2895]
diff --git a/data/area/kandarin/feldip_hills/feldip_hills.npcs.toml b/data/area/kandarin/feldip_hills/feldip_hills.npcs.toml
index 24f188cde4..5e075173cd 100644
--- a/data/area/kandarin/feldip_hills/feldip_hills.npcs.toml
+++ b/data/area/kandarin/feldip_hills/feldip_hills.npcs.toml
@@ -109,3 +109,29 @@ id = 3467
 [rantz_feldip_hills_2_2]
 id = 1010
 
+[fishing_spot_big_net_harpoon_feldip_hills]
+id = 7044
+fishing_net = { items = ["big_fishing_net"], bait = { none = [
+    "raw_mackerel",
+    "raw_cod",
+    "raw_bass",
+    "oyster",
+    "casket",
+    "seaweed",
+    "leather_gloves",
+    "leather_boots"
+] } }
+fishing_harpoon = { items = ["harpoon", "barb_tail_harpoon"], bait = { none = ["raw_shark"] } }
+examine = "It looks like there might be fish swimming in the water."
+
+[fishing_spot_small_net_bait_feldip_hills]
+id = 7045
+fishing_net = { items = ["small_fishing_net"], bait = { none = ["raw_shrimps", "raw_anchovies"] } }
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_sardine", "raw_herring"] } }
+examine = "It looks like there might be fish swimming in the water."
+
+[fishing_spot_cage_harpoon_feldip_hills]
+id = 7046
+fishing_cage = { items = ["lobster_pot"], bait = { none = ["raw_lobster"] } }
+fishing_harpoon = { items = ["harpoon", "barb_tail_harpoon"], bait = { none = ["raw_tuna", "raw_swordfish"] } }
+examine = "It looks like there might be fish swimming in the water."
diff --git a/data/area/kandarin/fishing_guild/fishing_guild.areas.toml b/data/area/kandarin/fishing_guild/fishing_guild.areas.toml
index c7d573e6a9..1f725007d2 100644
--- a/data/area/kandarin/fishing_guild/fishing_guild.areas.toml
+++ b/data/area/kandarin/fishing_guild/fishing_guild.areas.toml
@@ -2,3 +2,11 @@
 x = [2611, 2613]
 y = [3380, 3382]
 tags = ["teleport"]
+
+[fishing_guild_south_fishing_area]
+x = [2602, 2612]
+y = [3410, 3417]
+
+[fishing_guild_north_fishing_area]
+x = [2598, 2605]
+y = [3419, 3426]
diff --git a/data/area/kandarin/fishing_guild/fishing_guild.npcs.toml b/data/area/kandarin/fishing_guild/fishing_guild.npcs.toml
index ab77064106..452d1fa1d5 100644
--- a/data/area/kandarin/fishing_guild/fishing_guild.npcs.toml
+++ b/data/area/kandarin/fishing_guild/fishing_guild.npcs.toml
@@ -2,9 +2,6 @@
 id = 308
 examine = "The man in charge of the fishing guild."
 
-[fishing_spot_fishing_guild]
-id = 313
-
 [goblin_fishing_guild]
 id = 4272
 categories = ["goblins"]
@@ -63,15 +60,35 @@ examine = "He loves to fish!"
 id = 230
 examine = "He looks elderly."
 
-[fishing_spot_ranging_guild]
+[fishing_spot_fishing_contest]
 id = 233
 examine = "I can fish here."
 
-[fishing_spot_ranging_guild_2]
+[fishing_spot_fishing_contest_2]
 id = 234
 
-[fishing_spot_ranging_guild_3]
+[fishing_spot_fishing_contest_3]
 id = 235
 
-[fishing_spot_ranging_guild_4]
+[fishing_spot_fishing_contest_4]
 id = 236
+
+[fishing_spot_cage_harpoon_fishing_guild]
+id = 312
+fishing_cage = { items = ["lobster_pot"], bait = { none = ["raw_lobster"] } }
+fishing_harpoon = { items = ["harpoon", "barb_tail_harpoon"], bait = { none = ["raw_tuna", "raw_swordfish"] } }
+examine = "I can see fish swimming in the water."
+
+[fishing_spot_fishing_guild]
+id = 313
+fishing_net = { items = ["big_fishing_net"], bait = { none = [
+    "raw_mackerel",
+    "raw_cod",
+    "raw_bass",
+    "oyster",
+    "casket",
+    "seaweed",
+    "leather_gloves",
+    "leather_boots"
+] } }
+fishing_harpoon = { items = ["harpoon", "barb_tail_harpoon"], bait = { none = ["raw_shark"] } }
diff --git a/data/area/kandarin/fishing_platform/fishing_platform.areas.toml b/data/area/kandarin/fishing_platform/fishing_platform.areas.toml
new file mode 100644
index 0000000000..362b384fb6
--- /dev/null
+++ b/data/area/kandarin/fishing_platform/fishing_platform.areas.toml
@@ -0,0 +1,3 @@
+[fishing_platform_fishing_area]
+x = [2790, 2795]
+y = [3273, 3283]
\ No newline at end of file
diff --git a/data/area/kandarin/fishing_platform/fishing_platform.npcs.toml b/data/area/kandarin/fishing_platform/fishing_platform.npcs.toml
index af8ae1ddca..b1550fa9a9 100644
--- a/data/area/kandarin/fishing_platform/fishing_platform.npcs.toml
+++ b/data/area/kandarin/fishing_platform/fishing_platform.npcs.toml
@@ -3,6 +3,8 @@ id = 1006
 
 [fishing_spot_fishing_platform]
 id = 316
+fishing_net = { items = ["small_fishing_net"], bait = { none = ["raw_shrimps", "raw_anchovies"] } }
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_sardine", "raw_herring"] } }
 
 [bailey_fishing_platform]
 id = 695
diff --git a/data/area/kandarin/piscatoris/piscatoris.areas.toml b/data/area/kandarin/piscatoris/piscatoris.areas.toml
index a442f84423..362f8e315f 100644
--- a/data/area/kandarin/piscatoris/piscatoris.areas.toml
+++ b/data/area/kandarin/piscatoris/piscatoris.areas.toml
@@ -14,4 +14,8 @@ tags = ["teleport", "scroll"]
 x = [2304,2304,2240,2240,2431,2431,2379,2379,2367,2367]
 y = [3392,3584,3584,3647,3647,3550,3550,3520,3520,3392]
 tags = ["penguin_area"]
-hint = "where eagles fly."
\ No newline at end of file
+hint = "where eagles fly."
+
+[ppiscatoris_fishing_area]
+x = [2340, 2349]
+y = [3702, 3702]
diff --git a/data/area/kandarin/piscatoris/piscatoris.npcs.toml b/data/area/kandarin/piscatoris/piscatoris.npcs.toml
index b648fe5293..29c97e4b82 100644
--- a/data/area/kandarin/piscatoris/piscatoris.npcs.toml
+++ b/data/area/kandarin/piscatoris/piscatoris.npcs.toml
@@ -56,3 +56,8 @@ id = 8555
 [brian_twitcher_3]
 id = 8556
 
+[fishing_spot_harpoon_small_net_piscatoris]
+id = 3848
+fishing_harpoon = { items = ["harpoon", "barb_tail_harpoon"], bait = { none = ["raw_tuna", "raw_swordfish"] } }
+fishing_net = { items = ["small_fishing_net"], bait = { none = ["raw_monkfish"] } }
+examine = "I can see fish swimming in the water."
diff --git a/data/area/kandarin/piscatoris/piscatoris.objs.toml b/data/area/kandarin/piscatoris/piscatoris.objs.toml
index 5dfcd99426..428d329317 100644
--- a/data/area/kandarin/piscatoris/piscatoris.objs.toml
+++ b/data/area/kandarin/piscatoris/piscatoris.objs.toml
@@ -5,3 +5,7 @@ examine = "Allows access to the level above."
 [cooking_range_piscatoris]
 id = 14919
 examine = "Smells of fried fish."
+
+[furnace_small_piscatoris]
+id = 14921
+examine = "A furnace; small but effective."
\ No newline at end of file
diff --git a/data/area/kandarin/ranging_guild/ranging_guild.npc-spawns.toml b/data/area/kandarin/ranging_guild/ranging_guild.npc-spawns.toml
index e99015ef89..34de959322 100644
--- a/data/area/kandarin/ranging_guild/ranging_guild.npc-spawns.toml
+++ b/data/area/kandarin/ranging_guild/ranging_guild.npc-spawns.toml
@@ -12,10 +12,10 @@ spawns = [
   { id = "big_dave", x = 2634, y = 3425 },
   { id = "joshua", x = 2629, y = 3415 },
   { id = "grandpa_jack", x = 2650, y = 3452 },
-  { id = "fishing_spot_ranging_guild", x = 2630, y = 3435 },
-  { id = "fishing_spot_ranging_guild_2", x = 2637, y = 3444, members = true },
-  { id = "fishing_spot_ranging_guild_3", x = 2632, y = 3425, members = true },
-  { id = "fishing_spot_ranging_guild_4", x = 2627, y = 3415, members = true },
+  { id = "fishing_spot_fishing_contest", x = 2630, y = 3435 },
+  { id = "fishing_spot_fishing_contest_2", x = 2637, y = 3444, members = true },
+  { id = "fishing_spot_fishing_contest_3", x = 2632, y = 3425, members = true },
+  { id = "fishing_spot_fishing_contest_4", x = 2627, y = 3415, members = true },
   { id = "goblin_fishing_guild", x = 2636, y = 3393 },
   { id = "goblin_fishing_guild_2", x = 2628, y = 3400 },
   { id = "guard_ranging_guild", x = 2655, y = 3426 },
diff --git a/data/area/kandarin/sinclair_mansion/sinclair_mansion.areas.toml b/data/area/kandarin/sinclair_mansion/sinclair_mansion.areas.toml
new file mode 100644
index 0000000000..e88e55eefa
--- /dev/null
+++ b/data/area/kandarin/sinclair_mansion/sinclair_mansion.areas.toml
@@ -0,0 +1,3 @@
+[sinclair_mansion_fishing_area]
+x = [2714, 2728]
+y = [3524, 3533]
diff --git a/data/area/kandarin/sinclair_mansion/sinclair_mansion.npcs.toml b/data/area/kandarin/sinclair_mansion/sinclair_mansion.npcs.toml
index 281026d761..14ba4fa9a5 100644
--- a/data/area/kandarin/sinclair_mansion/sinclair_mansion.npcs.toml
+++ b/data/area/kandarin/sinclair_mansion/sinclair_mansion.npcs.toml
@@ -33,6 +33,8 @@ examine = "He holds up passers by."
 
 [fishing_spot_sinclair_mansion]
 id = 315
+fishing_lure = { items = ["fly_fishing_rod"], bait = { feather = ["raw_trout", "raw_salmon"], stripy_feather = ["raw_rainbow_fish"] } }
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_pike"] } }
 
 [guard_sinclair_mansion]
 id = 6191
diff --git a/data/area/kandarin/tree_gnome_stronghold/tree_gnome_stronghold.areas.toml b/data/area/kandarin/tree_gnome_stronghold/tree_gnome_stronghold.areas.toml
index 8f97c3d657..3fd77d725a 100644
--- a/data/area/kandarin/tree_gnome_stronghold/tree_gnome_stronghold.areas.toml
+++ b/data/area/kandarin/tree_gnome_stronghold/tree_gnome_stronghold.areas.toml
@@ -2,4 +2,12 @@
 x = [2368, 2495]
 y = [3392, 3519]
 tags = ["penguin_area"]
-hint = "near a big tree surrounded by short people."
\ No newline at end of file
+hint = "near a big tree surrounded by short people."
+
+[tree_gnome_stronghold_west_fishing_spot]
+x = [2382, 2385]
+y = [3410, 3423]
+
+[tree_gnome_stronghold_east_fishing_spot]
+x = [2389, 2391]
+y = [3421, 3423]
diff --git a/data/area/kandarin/tree_gnome_stronghold/tree_gnome_stronghold.npcs.toml b/data/area/kandarin/tree_gnome_stronghold/tree_gnome_stronghold.npcs.toml
index c438251609..b871abd2d3 100644
--- a/data/area/kandarin/tree_gnome_stronghold/tree_gnome_stronghold.npcs.toml
+++ b/data/area/kandarin/tree_gnome_stronghold/tree_gnome_stronghold.npcs.toml
@@ -107,6 +107,8 @@ examine = "They just call him 'Coach'."
 
 [fishing_spot_tree_gnome_stronghold]
 id = 309
+fishing_lure = { items = ["fly_fishing_rod"], bait = { feather = ["raw_trout", "raw_salmon"], stripy_feather = ["raw_rainbow_fish"] } }
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_pike"] } }
 
 [devin_mendelberg]
 id = 3828
diff --git a/data/area/kandarin/tree_gnome_stronghold/tree_gnome_stronghold.objs.toml b/data/area/kandarin/tree_gnome_stronghold/tree_gnome_stronghold.objs.toml
new file mode 100644
index 0000000000..66a0fa4f8e
--- /dev/null
+++ b/data/area/kandarin/tree_gnome_stronghold/tree_gnome_stronghold.objs.toml
@@ -0,0 +1,3 @@
+[spinning_wheel_gnome_stronghold]
+id = 2644
+examine = "Used for spinning thread."
diff --git a/data/area/karamja/jungle_instance/karamja_jungle_instance.npc-spawns.toml b/data/area/karamja/jungle_instance/karamja_jungle_instance.npc-spawns.toml
index fa0eb6123d..7293a70bd6 100644
--- a/data/area/karamja/jungle_instance/karamja_jungle_instance.npc-spawns.toml
+++ b/data/area/karamja/jungle_instance/karamja_jungle_instance.npc-spawns.toml
@@ -4,8 +4,8 @@ spawns = [
   { id = "tamayu_karamja_jungle_instance_2", x = 2541, y = 4565, members = true },
   { id = "the_shaikahan_karamja_jungle_instance", x = 2524, y = 4567, members = true },
   { id = "the_shaikahan_karamja_jungle_instance", x = 2540, y = 4566, members = true },
-  { id = "fishing_spot_karamja_jungle_instance", x = 2515, y = 4591, members = true },
-  { id = "fishing_spot_karamja_jungle_instance_2", x = 2528, y = 4591, members = true },
+  { id = "fishing_spot_karamja_karambwan_west", x = 2515, y = 4591, members = true },
+  { id = "fishing_spot_karamja_karambwan_east", x = 2528, y = 4591, members = true },
   { id = "gull_karamja_2", x = 2553, y = 4576 },
   { id = "cormorant", x = 2547, y = 4580 },
   { id = "pelican_karamja_jungle_instance", x = 2530, y = 4578 },
diff --git a/data/area/karamja/jungle_instance/karamja_jungle_instance.npcs.toml b/data/area/karamja/jungle_instance/karamja_jungle_instance.npcs.toml
index b4c4a500f2..957821b79a 100644
--- a/data/area/karamja/jungle_instance/karamja_jungle_instance.npcs.toml
+++ b/data/area/karamja/jungle_instance/karamja_jungle_instance.npcs.toml
@@ -12,11 +12,13 @@ id = 1170
 [the_shaikahan_karamja_jungle_instance]
 id = 1173
 
-[fishing_spot_karamja_jungle_instance]
+[fishing_spot_karamja_karambwan_west]
 id = 1176
+fishing_fish = { items = ["karambwan_vessel"], bait = { raw_karambwanji = ["raw_karambwan"] } }
 
-[fishing_spot_karamja_jungle_instance_2]
+[fishing_spot_karamja_karambwan_east]
 id = 1177
+fishing_fish = { items = ["karambwan_vessel"], bait = { raw_karambwanji = ["raw_karambwan"] } }
 
 [pelican_karamja_jungle_instance]
 id = 148
diff --git a/data/area/karamja/karamja.npc-spawns.toml b/data/area/karamja/karamja.npc-spawns.toml
index 0369e385a6..4a867c9470 100644
--- a/data/area/karamja/karamja.npc-spawns.toml
+++ b/data/area/karamja/karamja.npc-spawns.toml
@@ -19,8 +19,8 @@ spawns = [
     { id = "jogre_ardougne", x = 2927, y = 3056 },
     { id = "jogre_ardougne", x = 2932, y = 3043 },
     { id = "the_shaikahan", x = 2906, y = 3095 },
-    { id = "fishing_spot_karamja_jungle_instance", x = 2899, y = 3119, members = true },
-    { id = "fishing_spot_karamja_jungle_instance_2", x = 2912, y = 3119, members = true },
+    { id = "fishing_spot_karamja_karambwan_west", x = 2899, y = 3119, members = true },
+    { id = "fishing_spot_karamja_karambwan_east", x = 2912, y = 3119, members = true },
     { id = "gull_karamja", x = 2937, y = 3104, members = true },
     { id = "cormorant_karamja", x = 2931, y = 3108, members = true },
     { id = "pelican_karamja", x = 2914, y = 3106, members = true },
diff --git a/data/area/karamja/musa_point/musa_point.areas.toml b/data/area/karamja/musa_point/musa_point.areas.toml
new file mode 100644
index 0000000000..b955143948
--- /dev/null
+++ b/data/area/karamja/musa_point/musa_point.areas.toml
@@ -0,0 +1,7 @@
+[musa_point_fishing_area]
+x = [2985, 2997]
+y = [3159, 3176]
+
+[thurgo_fishing_area]
+x = [2986, 2995]
+y = [3153, 3179]
diff --git a/data/area/karamja/musa_point/musa_point.npcs.toml b/data/area/karamja/musa_point/musa_point.npcs.toml
index 6d02ac68de..2b39dd6d65 100644
--- a/data/area/karamja/musa_point/musa_point.npcs.toml
+++ b/data/area/karamja/musa_point/musa_point.npcs.toml
@@ -46,9 +46,13 @@ examine = "One of Gielinor's many citizens, apparently trying to be an explorer.
 
 [fishing_spot_musa_point]
 id = 323
+fishing_net = { items = ["small_fishing_net"], bait = { none = ["raw_shrimps", "raw_anchovies"] } }
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_sardine", "raw_herring"] } }
 
 [fishing_spot_musa_point_2]
 id = 324
+fishing_cage = { items = ["lobster_pot"], bait = { none = ["raw_lobster"] } }
+fishing_harpoon = { items = ["harpoon", "barb_tail_harpoon"], bait = { none = ["raw_tuna", "raw_swordfish"] } }
 
 [luthas_musa_point]
 id = 379
diff --git a/data/area/karamja/shilo_village/shilo_village.areas.toml b/data/area/karamja/shilo_village/shilo_village.areas.toml
new file mode 100644
index 0000000000..5aad908987
--- /dev/null
+++ b/data/area/karamja/shilo_village/shilo_village.areas.toml
@@ -0,0 +1,3 @@
+[shilo_village_fishing_area]
+x = [2852, 2866]
+y = [2972, 2977]
diff --git a/data/area/karamja/shilo_village/shilo_village.npcs.toml b/data/area/karamja/shilo_village/shilo_village.npcs.toml
index 6a3110cdcd..ddaacfe144 100644
--- a/data/area/karamja/shilo_village/shilo_village.npcs.toml
+++ b/data/area/karamja/shilo_village/shilo_village.npcs.toml
@@ -1,5 +1,7 @@
 [fishing_spot_shilo_village]
 id = 317
+fishing_lure = { items = ["fly_fishing_rod"], bait = { feather = ["raw_trout", "raw_salmon"], stripy_feather = ["raw_rainbow_fish"] } }
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_pike"] } }
 
 [undead_one_shilo_village]
 id = 504
diff --git a/data/area/karamja/tai_bwo_wannai/tai_bwo_wannai.areas.toml b/data/area/karamja/tai_bwo_wannai/tai_bwo_wannai.areas.toml
index ec5b7ab6f1..a5cf157f3c 100644
--- a/data/area/karamja/tai_bwo_wannai/tai_bwo_wannai.areas.toml
+++ b/data/area/karamja/tai_bwo_wannai/tai_bwo_wannai.areas.toml
@@ -2,3 +2,7 @@
 x = [2803, 2807]
 y = [3084, 3088]
 tags = ["teleport", "scroll"]
+
+[tai_bwo_wannai_wanji_fishing_area]
+x = [2791, 3017]
+y = [3010, 3021]
diff --git a/data/area/karamja/tai_bwo_wannai/tai_bwo_wannai.npcs.toml b/data/area/karamja/tai_bwo_wannai/tai_bwo_wannai.npcs.toml
index 114ba48f59..26cb54a47c 100644
--- a/data/area/karamja/tai_bwo_wannai/tai_bwo_wannai.npcs.toml
+++ b/data/area/karamja/tai_bwo_wannai/tai_bwo_wannai.npcs.toml
@@ -4,6 +4,7 @@ examine = "The imposing Chief of Tai Bwo Wannai."
 
 [fishing_spot_tai_bwo_wannai]
 id = 1174
+fishing_net = { items = ["small_fishing_net"], bait = { none = ["raw_shrimps", "raw_karambwanji"] } }
 
 [tiadeche_tai_bwo_wannai]
 id = 2484
diff --git a/data/area/kharidian_desert/al_kharid/al_kharid.areas.toml b/data/area/kharidian_desert/al_kharid/al_kharid.areas.toml
index 407f7cadc0..ba4d5bd885 100644
--- a/data/area/kharidian_desert/al_kharid/al_kharid.areas.toml
+++ b/data/area/kharidian_desert/al_kharid/al_kharid.areas.toml
@@ -38,4 +38,8 @@ y = [3281, 3320]
 x = [3264,3264,3391,3391,3423,3423,3455,3455]
 y = [3136,3327,3327,3263,3263,3182,3182,3136]
 tags = ["penguin_area"]
-hint = "around the Al Kharid region, north of Shantay Pass."
\ No newline at end of file
+hint = "around the Al Kharid region, north of Shantay Pass."
+
+[al_kharid_fishing_spot]
+x = [3255, 3281]
+y = [3135, 3166]
diff --git a/data/area/kharidian_desert/al_kharid/al_kharid.npc-spawns.toml b/data/area/kharidian_desert/al_kharid/al_kharid.npc-spawns.toml
index be5603aa56..ab39bdee8a 100644
--- a/data/area/kharidian_desert/al_kharid/al_kharid.npc-spawns.toml
+++ b/data/area/kharidian_desert/al_kharid/al_kharid.npc-spawns.toml
@@ -21,6 +21,8 @@ spawns = [
     { id = "al_the_camel", x = 3274, y = 3168 },
     { id = "fremennik_warrior", x = 3275, y = 3175,  direction = "EAST"},
     { id = "man_al_kharid", x = 3277, y = 3187 },
+    { id = "fishing_spot_al_kharid", x = 3255, y = 3163, members = true },
+    { id = "fishing_spot_al_kharid", x = 3256, y = 3177, members = true },
     # 13106
     { id = "mubariz", x = 3314, y = 3240 },
     { id = "border_guard_al_kharid", x = 3266, y = 3229, direction = "SOUTH" },
diff --git a/data/area/kharidian_desert/al_kharid/al_kharid.npcs.toml b/data/area/kharidian_desert/al_kharid/al_kharid.npcs.toml
index 22d7a7c997..b7f7ab7d18 100644
--- a/data/area/kharidian_desert/al_kharid/al_kharid.npcs.toml
+++ b/data/area/kharidian_desert/al_kharid/al_kharid.npcs.toml
@@ -142,3 +142,8 @@ examine = "A camel who's come from the south."
 [father_reen_2]
 id = 2899
 examine = "Looks a bit lost."
+
+[fishing_spot_al_kharid]
+id = 330
+fishing_net = { items = ["small_fishing_net"], bait = { none = ["raw_shrimps", "raw_anchovies"] } }
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_sardine", "raw_herring"] } }
diff --git a/data/area/kharidian_desert/sophanem/sophanem.objs.toml b/data/area/kharidian_desert/sophanem/sophanem.objs.toml
index f8b4d8a01f..380d8f0d5d 100644
--- a/data/area/kharidian_desert/sophanem/sophanem.objs.toml
+++ b/data/area/kharidian_desert/sophanem/sophanem.objs.toml
@@ -1,3 +1,11 @@
 [bank_booth_sophanem]
 id = 20325
 examine = "The bank teller will serve you from here."
+
+[spinning_wheel_sophanem]
+id = 20365
+examine = "Used for spinning thread."
+
+[potters_wheel_sophanem]
+id = 20375
+examine = "Used for fashioning clay items."
diff --git a/data/area/misthalin/barbarian_village/barbarian_village.areas.toml b/data/area/misthalin/barbarian_village/barbarian_village.areas.toml
index ac9ae88a38..2cd6d464f3 100644
--- a/data/area/misthalin/barbarian_village/barbarian_village.areas.toml
+++ b/data/area/misthalin/barbarian_village/barbarian_village.areas.toml
@@ -3,3 +3,7 @@ x = [3072, 3136, 3136, 3048, 3048, 3056, 3056, 3064, 3064, 3072]
 y = [3456, 3456, 3392, 3392, 3408, 3408, 3440, 3440, 3448, 3448]
 level = 0
 tags = ["multi_combat"]
+
+[barbarian_village_fishing_spot]
+x = [3104, 3110]
+y = [3424, 3434]
diff --git a/data/area/misthalin/barbarian_village/barbarian_village.npc-spawns.toml b/data/area/misthalin/barbarian_village/barbarian_village.npc-spawns.toml
index e301b8647f..7aa91c62a8 100644
--- a/data/area/misthalin/barbarian_village/barbarian_village.npc-spawns.toml
+++ b/data/area/misthalin/barbarian_village/barbarian_village.npc-spawns.toml
@@ -33,7 +33,7 @@ spawns = [
   { id = "goblin_barbarian_village_2", x = 3118, y = 3432 },
   { id = "goblin_barbarian_village_3", x = 3119, y = 3444 },
   { id = "fishing_spot_barbarian_village", x = 3104, y = 3424, members = true },
-  { id = "fishing_spot_barbarian_village", x = 3108, y = 3433, members = true },
+  { id = "fishing_spot_barbarian_village", x = 3110, y = 3433, members = true },
   { id = "engineering_assistant_barbarian_village", x = 3013, y = 3451 },
   { id = "engineering_assistant_barbarian_village_2", x = 3019, y = 3443 },
   { id = "engineer_barbarian_village", x = 3008, y = 3442 },
diff --git a/data/area/misthalin/barbarian_village/barbarian_village.npcs.toml b/data/area/misthalin/barbarian_village/barbarian_village.npcs.toml
index af238bb3e2..ce04680ca1 100644
--- a/data/area/misthalin/barbarian_village/barbarian_village.npcs.toml
+++ b/data/area/misthalin/barbarian_village/barbarian_village.npcs.toml
@@ -195,6 +195,8 @@ examine = "An ugly green creature."
 
 [fishing_spot_barbarian_village]
 id = 328
+fishing_lure = { items = ["fly_fishing_rod"], bait = { feather = ["raw_trout", "raw_salmon"], stripy_feather = ["raw_rainbow_fish"] } }
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_pike"] } }
 
 [engineering_assistant_barbarian_village]
 id = 3280
diff --git a/data/area/misthalin/barbarian_village/barbarian_village.objs.toml b/data/area/misthalin/barbarian_village/barbarian_village.objs.toml
index 957185985c..8f820cf399 100644
--- a/data/area/misthalin/barbarian_village/barbarian_village.objs.toml
+++ b/data/area/misthalin/barbarian_village/barbarian_village.objs.toml
@@ -4,4 +4,8 @@ examine = "Hot!"
 
 [stronghold_of_security_entrance]
 id = 16154
-examine = "The entrance to the Stronghold of Security."
\ No newline at end of file
+examine = "The entrance to the Stronghold of Security."
+
+[spinning_wheel_barbarian_village]
+id = 5707
+examine = "Used for spinning thread."
diff --git a/data/area/misthalin/dorgesh_kaan/agility/dorgesh_kaan_agility_course.areas.toml b/data/area/misthalin/dorgesh_kaan/agility/dorgesh_kaan_agility_course.areas.toml
new file mode 100644
index 0000000000..2fec91ea58
--- /dev/null
+++ b/data/area/misthalin/dorgesh_kaan/agility/dorgesh_kaan_agility_course.areas.toml
@@ -0,0 +1,7 @@
+[dorgesh_kaan_agility_course_east_fishing_area]
+x = [2746, 2747]
+y = [5226, 5230]
+
+[dorgesh_kaan_agility_course_west_fishing_area]
+x = [2694, 2695]
+y = [5223, 5227]
diff --git a/data/area/misthalin/dorgesh_kaan/agility/dorgesh_kaan_agility_course.npcs.toml b/data/area/misthalin/dorgesh_kaan/agility/dorgesh_kaan_agility_course.npcs.toml
index 634bf2c731..1b2617ff58 100644
--- a/data/area/misthalin/dorgesh_kaan/agility/dorgesh_kaan_agility_course.npcs.toml
+++ b/data/area/misthalin/dorgesh_kaan/agility/dorgesh_kaan_agility_course.npcs.toml
@@ -28,9 +28,13 @@ examine = "A little, slimy beetle-thing."
 
 [fishing_spot_dorgesh_kaan_agility_course]
 id = 5748
+fishing_net = { items = ["small_fishing_net"], bait = { none = ["frog_spawn"] } }
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_slimy_eel", "raw_cave_eel"] } }
 
 [fishing_spot_dorgesh_kaan_agility_course_2]
 id = 5749
+fishing_net = { items = ["small_fishing_net"], bait = { none = ["frog_spawn"] } }
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_slimy_eel", "raw_cave_eel"] } }
 
 [turgall_dorgesh_kaan_agility_course]
 id = 5779
diff --git a/data/area/misthalin/dorgesh_kaan/dorgesh_kaan.objs.toml b/data/area/misthalin/dorgesh_kaan/dorgesh_kaan.objs.toml
index 2ad6d2d87b..a7dc35c51d 100644
--- a/data/area/misthalin/dorgesh_kaan/dorgesh_kaan.objs.toml
+++ b/data/area/misthalin/dorgesh_kaan/dorgesh_kaan.objs.toml
@@ -26,4 +26,8 @@ examine = "A metal bound stone chest."
 id = 22682
 
 [dorgesh_kaan_gem_chest_open]
-id = 22683
\ No newline at end of file
+id = 22683
+
+[furnace_dorgesh_kaan]
+id = 22721
+examine = "	A very hot furnace."
\ No newline at end of file
diff --git a/data/area/misthalin/draynor/draynor.npcs.toml b/data/area/misthalin/draynor/draynor.npcs.toml
index fe5fb56d9d..1a2ceb7174 100644
--- a/data/area/misthalin/draynor/draynor.npcs.toml
+++ b/data/area/misthalin/draynor/draynor.npcs.toml
@@ -242,3 +242,9 @@ hitpoints = 250
 def = 5
 style = "melee"
 max_hit_melee = 10
+
+[fishing_spot_small_net_bait_draynor]
+id = 327
+fishing_net = { items = ["small_fishing_net"], bait = { none = ["raw_shrimps", "raw_anchovies"] } }
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_sardine", "raw_herring"] } }
+examine = "It looks like there might be fish swimming in the water."
diff --git a/data/area/misthalin/lumbridge/lumbridge.npcs.toml b/data/area/misthalin/lumbridge/lumbridge.npcs.toml
index 1562299d78..9bfb7ff42e 100644
--- a/data/area/misthalin/lumbridge/lumbridge.npcs.toml
+++ b/data/area/misthalin/lumbridge/lumbridge.npcs.toml
@@ -325,4 +325,21 @@ categories = ["human"]
 hunt_mode = "aggressive_npcs"
 respawn_delay = 35
 drop_table = "lumbridge_guard"
-examine = "He tries to keep order around Lumbridge by killing rats."
\ No newline at end of file
+examine = "He tries to keep order around Lumbridge by killing rats."
+
+[fishing_spot_lure_bait_lumbridge]
+id = 329
+fishing_lure = { items = ["fly_fishing_rod"], bait = { feather = ["raw_trout", "raw_salmon"], stripy_feather = ["raw_rainbow_fish"] } }
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_pike"] } }
+examine = "It looks like there might be fish swimming in the water."
+
+[fishing_spot_small_net_bait_lumbridge]
+id = 4908
+fishing_net = { items = ["small_fishing_net"], bait = { none = ["raw_shrimps", "raw_anchovies"] } }
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_sardine", "raw_herring"] } }
+examine = "It looks like there might be fish swimming in the water."
+
+[fishing_spot_crayfish_lumbridge]
+id = 6267
+fishing_cage = { items = ["crayfish_cage"], bait = { none = ["raw_crayfish"] } }
+examine = "It looks like there might be fish swimming in the water."
diff --git a/data/area/misthalin/lumbridge/swamp/caves/lumbridge_swamp_caves.areas.toml b/data/area/misthalin/lumbridge/swamp/caves/lumbridge_swamp_caves.areas.toml
new file mode 100644
index 0000000000..fdddbb52d3
--- /dev/null
+++ b/data/area/misthalin/lumbridge/swamp/caves/lumbridge_swamp_caves.areas.toml
@@ -0,0 +1,7 @@
+[lumbridge_swamp_south_fishing_area]
+x = [3154, 3157]
+y = [9542, 9544]
+
+[lumbridge_swamp_east_fishing_area]
+x = [3245, 3249]
+y = [9568, 9572]
diff --git a/data/area/misthalin/lumbridge/swamp/caves/lumbridge_swamp_caves.npc-spawns.toml b/data/area/misthalin/lumbridge/swamp/caves/lumbridge_swamp_caves.npc-spawns.toml
index 9edba1ab52..d9e866a496 100644
--- a/data/area/misthalin/lumbridge/swamp/caves/lumbridge_swamp_caves.npc-spawns.toml
+++ b/data/area/misthalin/lumbridge/swamp/caves/lumbridge_swamp_caves.npc-spawns.toml
@@ -66,7 +66,7 @@ spawns = [
   { id = "hole_in_the_wall_lumbridge_swamp_caves", x = 3215, y = 9560 },
   { id = "hole_in_the_wall_lumbridge_swamp_caves", x = 3216, y = 9588 },
   { id = "fishing_spot_lumbridge_swamp_caves", x = 3154, y = 9544 },
-  { id = "fishing_spot_lumbridge_swamp_caves_2", x = 3243, y = 9570, members = true },
+  { id = "fishing_spot_lumbridge_swamp_caves_2", x = 3245, y = 9570, members = true },
   { id = "sergeant_mossfists_lumbridge_swamp_caves", x = 3168, y = 9572, members = true },
   { id = "sergeant_slimetoes_lumbridge_swamp_caves", x = 3170, y = 9572, members = true },
 ]
diff --git a/data/area/misthalin/lumbridge/swamp/caves/lumbridge_swamp_caves.npcs.toml b/data/area/misthalin/lumbridge/swamp/caves/lumbridge_swamp_caves.npcs.toml
index 26bc9cc4be..8edcf50268 100644
--- a/data/area/misthalin/lumbridge/swamp/caves/lumbridge_swamp_caves.npcs.toml
+++ b/data/area/misthalin/lumbridge/swamp/caves/lumbridge_swamp_caves.npcs.toml
@@ -48,10 +48,14 @@ examine = "A big, scary hand!"
 
 [fishing_spot_lumbridge_swamp_caves]
 id = 2067
+fishing_net = { items = ["small_fishing_net"], bait = { none = ["frog_spawn"] } }
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_slimy_eel", "raw_cave_eel"] } }
 examine = "I can see fish swimming in the water."
 
 [fishing_spot_lumbridge_swamp_caves_2]
 id = 2068
+fishing_net = { items = ["small_fishing_net"], bait = { none = ["frog_spawn"] } }
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_slimy_eel", "raw_cave_eel"] } }
 
 [sergeant_mossfists_lumbridge_swamp_caves]
 id = 5891
diff --git a/data/area/misthalin/lumbridge/swamp/lumbridge_swamp.npc-spawns.toml b/data/area/misthalin/lumbridge/swamp/lumbridge_swamp.npc-spawns.toml
index dbf185d1e6..2ac3e386e6 100644
--- a/data/area/misthalin/lumbridge/swamp/lumbridge_swamp.npc-spawns.toml
+++ b/data/area/misthalin/lumbridge/swamp/lumbridge_swamp.npc-spawns.toml
@@ -33,8 +33,6 @@ spawns = [
   { id = "giant_rat_lumbridge_swamp", x = 3235, y = 3172, members = true },
   { id = "giant_spider_lumbridge", x = 3186, y = 3190, members = true },
   { id = "giant_spider_lumbridge", x = 3190, y = 3189, members = true },
-  { id = "fishing_spot_lumbridge_swamp", x = 3255, y = 3163, members = true },
-  { id = "fishing_spot_lumbridge_swamp", x = 3256, y = 3177, members = true },
   { id = "sergeant_mossfists", x = 3183, y = 3161, members = true },
   { id = "sergeant_slimetoes", x = 3181, y = 3161, members = true },
   { id = "giant_spider", x = 3184, y = 3190 },
diff --git a/data/area/misthalin/lumbridge/swamp/lumbridge_swamp.npcs.toml b/data/area/misthalin/lumbridge/swamp/lumbridge_swamp.npcs.toml
index 0fed82f724..346bc68b66 100644
--- a/data/area/misthalin/lumbridge/swamp/lumbridge_swamp.npcs.toml
+++ b/data/area/misthalin/lumbridge/swamp/lumbridge_swamp.npcs.toml
@@ -1,9 +1,6 @@
 [giant_rat_lumbridge_swamp]
 id = 12348
 
-[fishing_spot_lumbridge_swamp]
-id = 330
-
 [fremennik_shipmaster_lumbridge_swamp]
 id = 9708
 
diff --git a/data/area/misthalin/tutorial_island/tutorial_island.npcs.toml b/data/area/misthalin/tutorial_island/tutorial_island.npcs.toml
index 73f7dbddc4..39735b436a 100644
--- a/data/area/misthalin/tutorial_island/tutorial_island.npcs.toml
+++ b/data/area/misthalin/tutorial_island/tutorial_island.npcs.toml
@@ -69,6 +69,7 @@ examine = "Yep. Definitely a chicken."
 
 [fishing_spot_tutorial_island]
 id = 952
+fishing_net = { items = ["small_fishing_net"] }
 examine = "I can see fish swimming in the water."
 
 [brother_brace]
diff --git a/data/area/misthalin/zanaris/zanaris.objs.toml b/data/area/misthalin/zanaris/zanaris.objs.toml
index b3b1fa3e5f..f901a8e6bd 100644
--- a/data/area/misthalin/zanaris/zanaris.objs.toml
+++ b/data/area/misthalin/zanaris/zanaris.objs.toml
@@ -4,4 +4,8 @@ examine = "The bank teller will serve you from here."
 
 [cooking_range_zanaris]
 id = 52576
-examine = "I could cook up a storm on this."
\ No newline at end of file
+examine = "I could cook up a storm on this."
+
+[furnace_zanaris]
+id = 52574
+examine = "Very hot!"
diff --git a/data/area/morytania/braindeath_island/braindeath_island.npcs.toml b/data/area/morytania/braindeath_island/braindeath_island.npcs.toml
index be970e1974..dd2012ba00 100644
--- a/data/area/morytania/braindeath_island/braindeath_island.npcs.toml
+++ b/data/area/morytania/braindeath_island/braindeath_island.npcs.toml
@@ -148,4 +148,4 @@ examine = "A worker in the brewery."
 
 [fishing_spot_braindeath_island]
 id = 2859
-
+fishing_fish = { items = ["fishbowl_and_net"], bait = { none = ["sluglings", "karamthulhu"] } }
diff --git a/data/area/morytania/burgh_de_rott/burgh_de_rott.areas.toml b/data/area/morytania/burgh_de_rott/burgh_de_rott.areas.toml
index fd15feaa7e..0c02e59df8 100644
--- a/data/area/morytania/burgh_de_rott/burgh_de_rott.areas.toml
+++ b/data/area/morytania/burgh_de_rott/burgh_de_rott.areas.toml
@@ -2,3 +2,11 @@
 x = [3485, 3489]
 y = [3235, 3239]
 tags = ["teleport"]
+
+[burgh_de_rott_west_fishing_area]
+x = [3471, 3501]
+y = [3175, 3199]
+
+[burgh_de_rott_east_fishing_area]
+x = [3512, 3562]
+y = [3165, 3181]
diff --git a/data/area/morytania/burgh_de_rott/burgh_de_rott.npcs.toml b/data/area/morytania/burgh_de_rott/burgh_de_rott.npcs.toml
index b798764417..a1304cca03 100644
--- a/data/area/morytania/burgh_de_rott/burgh_de_rott.npcs.toml
+++ b/data/area/morytania/burgh_de_rott/burgh_de_rott.npcs.toml
@@ -107,9 +107,31 @@ id = 3567
 
 [fishing_spot_burgh_de_rott]
 id = 3574
+fishing_net = { items = ["big_fishing_net"], bait = { none = [
+    "raw_mackerel",
+    "raw_cod",
+    "raw_bass",
+    "oyster",
+    "casket",
+    "seaweed",
+    "leather_gloves",
+    "leather_boots"
+] } }
+fishing_harpoon = { items = ["harpoon", "barb_tail_harpoon"], bait = { none = ["raw_shark"] } }
 
 [fishing_spot_burgh_de_rott_2]
 id = 3575
+fishing_net = { items = ["big_fishing_net"], bait = { none = [
+    "raw_mackerel",
+    "raw_cod",
+    "raw_bass",
+    "oyster",
+    "casket",
+    "seaweed",
+    "leather_gloves",
+    "leather_boots"
+] } }
+fishing_harpoon = { items = ["harpoon", "barb_tail_harpoon"], bait = { none = ["raw_shark"] } }
 
 [vyrewatch]
 id = 7691
diff --git a/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.areas.toml b/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.areas.toml
new file mode 100644
index 0000000000..541d8d050b
--- /dev/null
+++ b/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.areas.toml
@@ -0,0 +1,3 @@
+[meiyerditch_tunnels_fishing_area]
+x = [3617, 3626]
+y = [9731, 9744]
diff --git a/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.npcs.toml b/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.npcs.toml
index 89a5e3da74..6c1a19444d 100644
--- a/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.npcs.toml
+++ b/data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.npcs.toml
@@ -16,6 +16,7 @@ examine = "A member of the Myreque and an aspiring young priest."
 
 [fishing_spot_meiyerditch_tunnels]
 id = 7636
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_slimy_eel", "raw_cave_eel"] } }
 
 [skeletal_hand_meiyerditch_tunnels]
 id = 7640
diff --git a/data/area/morytania/mort_myre_swamp/mort_myre_swamp.areas.toml b/data/area/morytania/mort_myre_swamp/mort_myre_swamp.areas.toml
new file mode 100644
index 0000000000..bc83b52010
--- /dev/null
+++ b/data/area/morytania/mort_myre_swamp/mort_myre_swamp.areas.toml
@@ -0,0 +1,11 @@
+[mort_myre_swamp_east_fishing_spot]
+x = [3478, 3490]
+y = [3430, 3449]
+
+[mort_myre_swamp_fishing_spot]
+x = [3424, 3440]
+y = [3407, 3417]
+
+[mort_myre_swamp_south_fishing_spot]
+x = [3437, 3445]
+y = [3270, 3280]
diff --git a/data/area/morytania/mort_myre_swamp/mort_myre_swamp.npc-spawns.toml b/data/area/morytania/mort_myre_swamp/mort_myre_swamp.npc-spawns.toml
index b58b967f9d..d3acc51d08 100644
--- a/data/area/morytania/mort_myre_swamp/mort_myre_swamp.npc-spawns.toml
+++ b/data/area/morytania/mort_myre_swamp/mort_myre_swamp.npc-spawns.toml
@@ -311,18 +311,18 @@ spawns = [
   { id = "fishing_spot_mort_myre_swamp", x = 3482, y = 3430, members = true },
   { id = "fishing_spot_mort_myre_swamp", x = 3483, y = 3449, members = true },
   { id = "fishing_spot_mort_myre_swamp", x = 3490, y = 3444, members = true },
-  { id = "fishing_spot_mort_myre_swamp_2", x = 3424, y = 3409, members = true },
-  { id = "fishing_spot_mort_myre_swamp_2", x = 3425, y = 3407, members = true },
-  { id = "fishing_spot_mort_myre_swamp_2", x = 3425, y = 3410, members = true },
-  { id = "fishing_spot_mort_myre_swamp_2", x = 3431, y = 3415, members = true },
-  { id = "fishing_spot_mort_myre_swamp_2", x = 3434, y = 3417, members = true },
-  { id = "fishing_spot_mort_myre_swamp_2", x = 3440, y = 3410, members = true },
-  { id = "fishing_spot_mort_myre_swamp_3", x = 3437, y = 3272, members = true },
-  { id = "fishing_spot_mort_myre_swamp_3", x = 3439, y = 3276, members = true },
-  { id = "fishing_spot_mort_myre_swamp_3", x = 3440, y = 3271, members = true },
-  { id = "fishing_spot_mort_myre_swamp_3", x = 3440, y = 3280, members = true },
-  { id = "fishing_spot_mort_myre_swamp_3", x = 3443, y = 3272, members = true },
-  { id = "fishing_spot_mort_myre_swamp_3", x = 3445, y = 3274, members = true },
+  { id = "fishing_spot_mort_myre_swamp_centre", x = 3424, y = 3409, members = true },
+  { id = "fishing_spot_mort_myre_swamp_centre", x = 3425, y = 3407, members = true },
+  { id = "fishing_spot_mort_myre_swamp_centre", x = 3425, y = 3410, members = true },
+  { id = "fishing_spot_mort_myre_swamp_centre", x = 3431, y = 3415, members = true },
+  { id = "fishing_spot_mort_myre_swamp_centre", x = 3434, y = 3417, members = true },
+  { id = "fishing_spot_mort_myre_swamp_centre", x = 3440, y = 3410, members = true },
+  { id = "fishing_spot_mort_myre_swamp_south", x = 3437, y = 3272, members = true },
+  { id = "fishing_spot_mort_myre_swamp_south", x = 3439, y = 3276, members = true },
+  { id = "fishing_spot_mort_myre_swamp_south", x = 3440, y = 3271, members = true },
+  { id = "fishing_spot_mort_myre_swamp_south", x = 3440, y = 3280, members = true },
+  { id = "fishing_spot_mort_myre_swamp_south", x = 3443, y = 3272, members = true },
+  { id = "fishing_spot_mort_myre_swamp_south", x = 3445, y = 3274, members = true },
   { id = "curpile_fyod_mort_myre_swamp", x = 3508, y = 3440, members = true },
   { id = "ghast_mort_myre_swamp", x = 3523, y = 3436, members = true },
   { id = "ghast_mort_myre_swamp", x = 3526, y = 3398, members = true },
diff --git a/data/area/morytania/mort_myre_swamp/mort_myre_swamp.npcs.toml b/data/area/morytania/mort_myre_swamp/mort_myre_swamp.npcs.toml
index 38fc0cf9e6..4f284591de 100644
--- a/data/area/morytania/mort_myre_swamp/mort_myre_swamp.npcs.toml
+++ b/data/area/morytania/mort_myre_swamp/mort_myre_swamp.npcs.toml
@@ -153,12 +153,15 @@ examine = "A bruise blue coloured blamish snail, these types are said to spit ac
 
 [fishing_spot_mort_myre_swamp]
 id = 1236
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_slimy_eel"] } }
 
-[fishing_spot_mort_myre_swamp_2]
+[fishing_spot_mort_myre_swamp_centre]
 id = 1237
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_slimy_eel"] } }
 
-[fishing_spot_mort_myre_swamp_3]
+[fishing_spot_mort_myre_swamp_south]
 id = 1238
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_slimy_eel"] } }
 
 [curpile_fyod_mort_myre_swamp]
 id = 1568
diff --git a/data/area/realm/fisher_realm/fisher_realm.areas.toml b/data/area/realm/fisher_realm/fisher_realm.areas.toml
new file mode 100644
index 0000000000..78713d2055
--- /dev/null
+++ b/data/area/realm/fisher_realm/fisher_realm.areas.toml
@@ -0,0 +1,3 @@
+[fisher_realm_fishing_area]
+x = [2668, 2679]
+y = [4700, 4710]
diff --git a/data/area/realm/fisher_realm/fisher_realm.npcs.toml b/data/area/realm/fisher_realm/fisher_realm.npcs.toml
index 62147630d4..a82bd05e59 100644
--- a/data/area/realm/fisher_realm/fisher_realm.npcs.toml
+++ b/data/area/realm/fisher_realm/fisher_realm.npcs.toml
@@ -23,6 +23,8 @@ id = 215
 
 [fishing_spot_fisher_realm]
 id = 314
+fishing_lure = { items = ["fly_fishing_rod"], bait = { feather = ["raw_trout", "raw_salmon"], stripy_feather = ["raw_rainbow_fish"] } }
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_pike"] } }
 
 [ram_fisher_realm]
 id = 5168
diff --git a/data/area/tirannwn/iorwerth_camp/iorwerth_camp.npcs.toml b/data/area/tirannwn/iorwerth_camp/iorwerth_camp.npcs.toml
index f11af892f4..3585a4d993 100644
--- a/data/area/tirannwn/iorwerth_camp/iorwerth_camp.npcs.toml
+++ b/data/area/tirannwn/iorwerth_camp/iorwerth_camp.npcs.toml
@@ -35,4 +35,5 @@ examine = "I don't want to get on the wrong side of him."
 
 [fishing_spot_iorwerth_camp]
 id = 1189
-
+fishing_lure = { items = ["fly_fishing_rod"], bait = { feather = ["raw_trout", "raw_salmon"], stripy_feather = ["raw_rainbow_fish"] } }
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_pike"] } }
diff --git a/data/area/tirannwn/isafdar/isafdar.areas.toml b/data/area/tirannwn/isafdar/isafdar.areas.toml
new file mode 100644
index 0000000000..3e934dd2d1
--- /dev/null
+++ b/data/area/tirannwn/isafdar/isafdar.areas.toml
@@ -0,0 +1,11 @@
+[isafdar_west_fishing_area]
+x = [2162, 2164]
+y = [3274, 3283]
+
+[iorwerth_camp_fishing_area]
+x = [2209, 2225]
+y = [3243, 3249]
+
+[isafdar_hunter_fishing_area]
+x = [2264, 2274]
+y = [3248, 3258]
diff --git a/data/area/tirannwn/isafdar/isafdar.npc-spawns.toml b/data/area/tirannwn/isafdar/isafdar.npc-spawns.toml
index eb850fb0a1..4c893b6d49 100644
--- a/data/area/tirannwn/isafdar/isafdar.npc-spawns.toml
+++ b/data/area/tirannwn/isafdar/isafdar.npc-spawns.toml
@@ -148,4 +148,7 @@ spawns = [
   { id = "pawya", x = 2269, y = 3245 },
   { id = "pawya", x = 2269, y = 3249 },
   { id = "pawya", x = 2270, y = 3239 },
+  # 8499
+  { id = "fishing_spot_iorwerth_camp", x = 2162, y = 3274, members = true },
+  { id = "fishing_spot_iorwerth_camp", x = 2164, y = 3280, members = true },
 ]
\ No newline at end of file
diff --git a/data/area/tirannwn/isafdar/isafdar.npcs.toml b/data/area/tirannwn/isafdar/isafdar.npcs.toml
index 6ec360dd24..168e4090a7 100644
--- a/data/area/tirannwn/isafdar/isafdar.npcs.toml
+++ b/data/area/tirannwn/isafdar/isafdar.npcs.toml
@@ -1,5 +1,7 @@
 [fishing_spot_isafdar]
 id = 1190
+fishing_lure = { items = ["fly_fishing_rod"], bait = { feather = ["raw_trout", "raw_salmon"], stripy_feather = ["raw_rainbow_fish"] } }
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_pike"] } }
 
 [elf_tracker]
 id = 1199
diff --git a/data/area/tirannwn/tyras_camp/tyras_camp.objs.toml b/data/area/tirannwn/tyras_camp/tyras_camp.objs.toml
new file mode 100644
index 0000000000..8fbfb7dad4
--- /dev/null
+++ b/data/area/tirannwn/tyras_camp/tyras_camp.objs.toml
@@ -0,0 +1,3 @@
+[furnace_small_tyras_camp]
+id = 3994
+examine = "A small furnace."
diff --git a/data/area/wilderness/bandit_camp/wilderness_bandit_camp.npcs.toml b/data/area/wilderness/bandit_camp/wilderness_bandit_camp.npcs.toml
index b6b013fc5c..dc18ec12c3 100644
--- a/data/area/wilderness/bandit_camp/wilderness_bandit_camp.npcs.toml
+++ b/data/area/wilderness/bandit_camp/wilderness_bandit_camp.npcs.toml
@@ -92,6 +92,8 @@ id = 2383
 
 [fishing_spot_wilderness_bandit_camp]
 id = 326
+fishing_net = { items = ["small_fishing_net"], bait = { none = ["raw_shrimps", "raw_anchovies"] } }
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_sardine", "raw_herring"] } }
 
 [fat_tony]
 id = 596
diff --git a/data/area/wilderness/wilderness.areas.toml b/data/area/wilderness/wilderness.areas.toml
index 36431c88f9..f7cecc58a0 100644
--- a/data/area/wilderness/wilderness.areas.toml
+++ b/data/area/wilderness/wilderness.areas.toml
@@ -84,4 +84,8 @@ tags = ["teleport", "obelisk"]
 [wilderness_obelisk_rogues_castle]
 x = [3306, 3308]
 y = [3915, 3917]
-tags = ["teleport", "obelisk"]
\ No newline at end of file
+tags = ["teleport", "obelisk"]
+
+[wilderness_fishing_area]
+x = [3347, 3368]
+y = [3793, 3817]
diff --git a/data/area/wilderness/wilderness.npcs.toml b/data/area/wilderness/wilderness.npcs.toml
index 04d8c96b63..43fab0a649 100644
--- a/data/area/wilderness/wilderness.npcs.toml
+++ b/data/area/wilderness/wilderness.npcs.toml
@@ -80,6 +80,8 @@ id = 2394
 
 [fishing_spot_wilderness]
 id = 3804
+fishing_cage = { items = ["lobster_pot"], bait = { none = ["raw_lobster"] } }
+fishing_harpoon = { items = ["harpoon", "barb_tail_harpoon"], bait = { none = ["raw_tuna", "raw_swordfish"] } }
 
 [giant_rat_wilderness]
 id = 4927
diff --git a/data/entity/obj/all.objs.toml b/data/entity/obj/all.objs.toml
index 44f07434f1..33c57dff2f 100644
--- a/data/entity/obj/all.objs.toml
+++ b/data/entity/obj/all.objs.toml
@@ -338,10 +338,6 @@ examine = "Now he's just too thin."
 id = 3974
 examine = "He hasn't eaten in a long time."
 
-[potters_wheel_2]
-id = 4310
-examine = "Used for fashioning clay items."  
-
 [corpse_16]
 id = 4518
 examine = "How do you make a skeleton laugh?"
@@ -813,10 +809,6 @@ examine = "Now he's just too thin."
 id = 20300
 examine = "He hasn't eaten in a long time."
 
-[potters_wheel_3]
-id = 20375
-examine = "Used for fashioning clay items."  
-
 [pillar_33]
 id = 20872
 examine = "A pillar I could stand on."
@@ -1287,10 +1279,6 @@ examine = "A pretty water feature."
 id = 34615
 examine = "Lit to remember the souls of the departed."
 
-[potters_wheel_4]
-id = 34801
-examine = "Used for fashioning clay items."
-
 [pillar_69]
 id = 35140
 examine = "A tall pillar."
diff --git a/data/minigame/tzhaar_fight_cave/tzhaar_fight_cave.areas.toml b/data/minigame/tzhaar_fight_cave/tzhaar_fight_cave.areas.toml
index dafa841152..3ae2a39ed5 100644
--- a/data/minigame/tzhaar_fight_cave/tzhaar_fight_cave.areas.toml
+++ b/data/minigame/tzhaar_fight_cave/tzhaar_fight_cave.areas.toml
@@ -5,21 +5,21 @@ tags = ["multi_combat"]
 
 [tzhaar_fight_cave_north_west]
 x = [2378, 2385]
-y = [5109, 5102]
+y = [5102, 5109]
 
 [tzhaar_fight_cave_south_west]
 x = [2379, 2385]
-y = [5076, 5070]
+y = [5070, 5076]
 
 [tzhaar_fight_cave_south]
 x = [2402, 2408]
-y = [5076, 5070]
+y = [5070, 5076]
 
 [tzhaar_fight_cave_south_east]
 x = [2416, 2422]
-y = [5086, 5080]
+y = [5080, 5086]
 
 [tzhaar_fight_cave_none]
 x = [2397, 2403]
-y = [5091, 5085]
+y = [5085, 5091]
 
diff --git a/data/quest/members/observatory_quest/observatory.areas.toml b/data/quest/members/observatory_quest/observatory.areas.toml
new file mode 100644
index 0000000000..7b08cfbbaa
--- /dev/null
+++ b/data/quest/members/observatory_quest/observatory.areas.toml
@@ -0,0 +1,3 @@
+[observatory_fishing_area]
+x = [2459, 2474]
+y = [3144, 3157]
diff --git a/data/quest/members/observatory_quest/observatory.npcs.toml b/data/quest/members/observatory_quest/observatory.npcs.toml
index 1ce15d9e6f..f69397c2b9 100644
--- a/data/quest/members/observatory_quest/observatory.npcs.toml
+++ b/data/quest/members/observatory_quest/observatory.npcs.toml
@@ -31,6 +31,8 @@ examine = "He looks to be in a world of his own."
 
 [fishing_spot_observatory]
 id = 927
+fishing_lure = { items = ["fly_fishing_rod"], bait = { feather = ["raw_trout", "raw_salmon"], stripy_feather = ["raw_rainbow_fish"] } }
+fishing_bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_pike"] } }
 
 [observatory_professor_observatory_3]
 id = 488
diff --git a/data/skill/fishing/fishing_spots.npcs.toml b/data/skill/fishing/fishing_spots.npcs.toml
deleted file mode 100644
index 946fda9caa..0000000000
--- a/data/skill/fishing/fishing_spots.npcs.toml
+++ /dev/null
@@ -1,77 +0,0 @@
-[fishing_spot_cage_harpoon_fishing_guild]
-id = 312
-fishing = { Cage = { items = ["lobster_pot"], bait = { none = ["raw_lobster"] } }, Harpoon = { items = ["harpoon", "barb_tail_harpoon"], bait = { none = ["raw_tuna", "raw_swordfish"] } } }
-examine = "I can see fish swimming in the water."
-
-[fishing_spot_big_net_harpoon_catherby]
-id = 322
-fishing = { Net = { items = ["big_fishing_net"], bait = { none = [
-  "raw_mackerel",
-  "raw_cod",
-  "raw_bass",
-  "oyster",
-  "casket",
-  "seaweed",
-  "leather_gloves",
-  "leather_boots"
-] } }, Harpoon = { items = ["harpoon", "barb_tail_harpoon"], bait = { none = ["raw_shark"] } } }
-examine = "I can see fish swimming in the water."
-
-[fishing_spot_cage_harpoon_catherby]
-id = 321
-fishing = { Cage = { items = ["lobster_pot"], bait = { none = ["raw_lobster"] } }, Harpoon = { items = ["harpoon", "barb_tail_harpoon"], bait = { none = ["raw_tuna", "raw_swordfish"] } } }
-examine = "It looks like there might be fish swimming in the water."
-
-[fishing_spot_small_net_bait_catherby]
-id = 320
-fishing = { Net = { items = ["small_fishing_net"], bait = { none = ["raw_shrimps", "raw_anchovies"] } }, Bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_sardine", "raw_herring"] } } }
-examine = "It looks like there might be fish swimming in the water."
-
-[fishing_spot_small_net_bait_draynor]
-id = 327
-fishing = { Net = { items = ["small_fishing_net"], bait = { none = ["raw_shrimps", "raw_anchovies"] } }, Bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_sardine", "raw_herring"] } } }
-examine = "It looks like there might be fish swimming in the water."
-
-[fishing_spot_lure_bait_lumbridge]
-id = 329
-fishing = { Lure = { items = ["fly_fishing_rod"], bait = { feather = ["raw_trout", "raw_salmon"], stripy_feather = ["raw_rainbow_fish"] } }, Bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_pike"] } } }
-examine = "It looks like there might be fish swimming in the water."
-
-[fishing_spot_harpoon_small_net_piscatoris]
-id = 3848
-fishing = { Harpoon = { items = ["harpoon", "barb_tail_harpoon"], bait = { none = ["raw_tuna", "raw_swordfish"] } }, Net = { items = ["small_fishing_net"], bait = { none = ["raw_monkfish"] } } }
-examine = "I can see fish swimming in the water."
-
-[fishing_spot_small_net_bait_lumbridge]
-id = 4908
-fishing = { Net = { items = ["small_fishing_net"], bait = { none = ["raw_shrimps", "raw_anchovies"] } }, Bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_sardine", "raw_herring"] } } }
-examine = "It looks like there might be fish swimming in the water."
-
-[fishing_spot_crayfish_lumbridge]
-id = 6267
-fishing = { Cage = { items = ["crayfish_cage"], bait = { none = ["raw_crayfish"] } } }
-examine = "It looks like there might be fish swimming in the water."
-
-[fishing_spot_big_net_harpoon_feldip_hills]
-id = 7044
-fishing = { Net = { items = ["big_fishing_net"], bait = { none = [
-  "raw_mackerel",
-  "raw_cod",
-  "raw_bass",
-  "oyster",
-  "casket",
-  "seaweed",
-  "leather_gloves",
-  "leather_boots"
-] } }, Harpoon = { items = ["harpoon", "barb_tail_harpoon"], bait = { none = ["raw_shark"] } } }
-examine = "It looks like there might be fish swimming in the water."
-
-[fishing_spot_small_net_bait_feldip_hills]
-id = 7045
-fishing = { Net = { items = ["small_fishing_net"], bait = { none = ["raw_shrimps", "raw_anchovies"] } }, Bait = { items = ["fishing_rod"], bait = { fishing_bait = ["raw_sardine", "raw_herring"] } } }
-examine = "It looks like there might be fish swimming in the water."
-
-[fishing_spot_cage_harpoon_feldip_hills]
-id = 7046
-fishing = { Cage = { items = ["lobster_pot"], bait = { none = ["raw_lobster"] } }, Harpoon = { items = ["harpoon", "barb_tail_harpoon"], bait = { none = ["raw_tuna", "raw_swordfish"] } } }
-examine = "It looks like there might be fish swimming in the water."
\ No newline at end of file
diff --git a/engine/src/main/kotlin/world/gregs/voidps/engine/data/definition/NPCDefinitions.kt b/engine/src/main/kotlin/world/gregs/voidps/engine/data/definition/NPCDefinitions.kt
index 4fec113429..402e063f18 100644
--- a/engine/src/main/kotlin/world/gregs/voidps/engine/data/definition/NPCDefinitions.kt
+++ b/engine/src/main/kotlin/world/gregs/voidps/engine/data/definition/NPCDefinitions.kt
@@ -57,14 +57,8 @@ object NPCDefinitions : DefinitionsDecoder<NPCDefinition> {
                                 }
                                 "id" -> id = int()
                                 "pickpocket" -> extras[key] = Pocket(this)
-                                "fishing" -> {
-                                    val spots = Object2ObjectOpenHashMap<String, Any>(2, Hash.VERY_FAST_LOAD_FACTOR)
-                                    while (nextEntry()) {
-                                        val type = key()
-                                        val spot = Spot(this)
-                                        spots[type] = spot
-                                    }
-                                    extras[key] = spots
+                                "fishing_cage", "fishing_net", "fishing_harpoon", "fishing_bait", "fishing_lure" -> {
+                                    extras[key] = Spot(this)
                                 }
                                 "categories" -> {
                                     val categories = ObjectLinkedOpenHashSet<String>(2, Hash.VERY_FAST_LOAD_FACTOR)
diff --git a/game/src/main/kotlin/content/bot/skill/fishing/FishingBot.kt b/game/src/main/kotlin/content/bot/skill/fishing/FishingBot.kt
index 812792cac3..941a79ae53 100644
--- a/game/src/main/kotlin/content/bot/skill/fishing/FishingBot.kt
+++ b/game/src/main/kotlin/content/bot/skill/fishing/FishingBot.kt
@@ -97,8 +97,8 @@ class FishingBot(
         if (!npc.def.options.contains(option)) {
             return false
         }
-        val spot: Map<String, Spot> = npc.def["fishing", emptyMap()]
-        val level = spot[option]?.bait?.get(bait)
+        val spot: Spot = npc.def.getOrNull("fishing_${option.lowercase()}") ?: return false
+        val level = spot.bait[bait]
             ?.minOf { ItemDefinitions.get(it)["fishing", Catch.EMPTY].level }
             ?: return false
         return player.has(Skill.Fishing, level, false)
diff --git a/game/src/main/kotlin/content/skill/fishing/Fishing.kt b/game/src/main/kotlin/content/skill/fishing/Fishing.kt
index cba9b87bab..b800ecc697 100644
--- a/game/src/main/kotlin/content/skill/fishing/Fishing.kt
+++ b/game/src/main/kotlin/content/skill/fishing/Fishing.kt
@@ -32,9 +32,6 @@ class Fishing : Script {
 
     val logger = InlineLogger()
 
-    val NPC.spot: Map<String, Spot>
-        get() = def["fishing", emptyMap()]
-
     val Spot.minimumLevel: Int
         get() = bait.keys.minOf { minimumLevel(it) ?: Int.MAX_VALUE }
 
@@ -58,7 +55,7 @@ class Fishing : Script {
 
     suspend fun fish(player: Player, target: NPC, option: String) {
         player.arriveDelay()
-        if (!target.def.contains("fishing")) {
+        if (!target.def.contains("fishing_${option.lowercase()}")) {
             return
         }
         target.getOrPut("fishers") { mutableSetOf<String>() }.add(player.name)
@@ -76,7 +73,7 @@ class Fishing : Script {
                 break
             }
 
-            val data = target.spot[option] ?: return
+            val data: Spot = target.def.getOrNull("fishing_${option.lowercase()}") ?: return
             if (!player.has(Skill.Fishing, data.minimumLevel, true)) {
                 break
             }