diff --git a/Server/data/configs/npc_configs.json b/Server/data/configs/npc_configs.json
index 89103b050..6157f9c10 100644
--- a/Server/data/configs/npc_configs.json
+++ b/Server/data/configs/npc_configs.json
@@ -2255,25 +2255,25 @@
     "attack_level": "27"
   },
   {
-    "examine": "Big, ugly, and smelly.",
+    "examine": "A large dim looking humanoid.",
     "melee_animation": "359",
     "range_animation": "359",
     "attack_speed": "6",
-    "magic_level": "27",
+    "magic_level": "1",
     "respawn_delay": "25",
     "defence_animation": "360",
     "magic_animation": "359",
     "death_animation": "361",
     "name": "Ogre",
-    "defence_level": "27",
+    "defence_level": "43",
     "safespot": null,
     "lifepoints": "60",
-    "strength_level": "27",
+    "strength_level": "43",
     "id": "115",
     "aggressive": "true",
-    "bonuses": "15,15,10,20,40,15,50,50,50,20,50,58,0,0,0",
-    "range_level": "27",
-    "attack_level": "27"
+    "bonuses": "22,22,22,0,0,0,0,0,0,0,0,20,0,0,0",
+    "range_level": "1",
+    "attack_level": "43"
   },
   {
     "examine": "Big, ugly, and smelly.",
@@ -64634,14 +64634,14 @@
     "magic_animation": "164",
     "death_animation": "167",
     "name": "Hobgoblin",
-    "defence_level": "1",
+    "defence_level": "24",
     "safespot": null,
     "lifepoints": "29",
-    "strength_level": "10",
+    "strength_level": "24",
     "id": "2685",
     "aggressive": "true",
-    "range_level": "20",
-    "attack_level": "20"
+    "range_level": "1",
+    "attack_level": "22"
   },
   {
     "examine": "An ugly smelly creature.",
@@ -64653,14 +64653,14 @@
     "magic_animation": "164",
     "death_animation": "167",
     "name": "Hobgoblin",
-    "defence_level": "1",
+    "defence_level": "24",
     "safespot": null,
     "lifepoints": "29",
-    "strength_level": "10",
+    "strength_level": "24",
     "id": "2686",
     "aggressive": "true",
-    "range_level": "20",
-    "attack_level": "20"
+    "range_level": "1",
+    "attack_level": "22"
   },
   {
     "examine": "An ugly smelly creature.",
@@ -64672,14 +64672,14 @@
     "magic_animation": "164",
     "death_animation": "167",
     "name": "Hobgoblin",
-    "defence_level": "1",
+    "defence_level": "24",
     "safespot": null,
     "lifepoints": "29",
-    "strength_level": "10",
+    "strength_level": "24",
     "id": "2687",
     "aggressive": "true",
-    "range_level": "20",
-    "attack_level": "20"
+    "range_level": "1",
+    "attack_level": "22"
   },
   {
     "examine": "An ugly smelly creature, with a spear.",
@@ -64691,14 +64691,14 @@
     "magic_animation": "163",
     "death_animation": "167",
     "name": "Hobgoblin",
-    "defence_level": "1",
+    "defence_level": "24",
     "safespot": null,
     "lifepoints": "29",
-    "strength_level": "10",
+    "strength_level": "24",
     "id": "2688",
     "aggressive": "true",
-    "range_level": "20",
-    "attack_level": "20"
+    "range_level": "1",
+    "attack_level": "22"
   },
   {
     "examine": "Didn't the mage say this procedure was totally safe?",
@@ -73078,6 +73078,182 @@
     "name": "Druid",
     "id": "14"
   },
+  {
+    "examine": "She looks very worried about something.",
+    "melee_animation": "0",
+    "range_animation": "0",
+    "defence_animation": "0",
+    "magic_animation": "0",
+    "death_animation": "0",
+    "name": "Caroline",
+    "defence_level": "1",
+    "safespot": null,
+    "lifepoints": "10",
+    "strength_level": "1",
+    "id": "696",
+    "range_level": "1",
+    "attack_level": "1"
+  },  
+  {
+    "examine": "A very good sailor.",
+    "melee_animation": "0",
+    "range_animation": "0",
+    "defence_animation": "0",
+    "magic_animation": "0",
+    "death_animation": "0",
+    "name": "Holgart",
+    "defence_level": "1",
+    "safespot": null,
+    "lifepoints": "10",
+    "strength_level": "1",
+    "id": "698",
+    "range_level": "1",
+    "attack_level": "1"
+  },  
+  {
+    "examine": "Smells a bit fishy.",
+    "melee_animation": "0",
+    "range_animation": "0",
+    "defence_animation": "0",
+    "magic_animation": "0",
+    "death_animation": "0",
+    "name": "Ezekial Lovecraft",
+    "defence_level": "1",
+    "safespot": null,
+    "lifepoints": "10",
+    "strength_level": "1",
+    "id": "4856",
+    "range_level": "1",
+    "attack_level": "1"
+  },  
+  {
+    "examine": "A (semi) retired member of the Temple Knights.",
+    "melee_animation": "0",
+    "range_animation": "0",
+    "defence_animation": "0",
+    "magic_animation": "0",
+    "death_animation": "0",
+    "name": "Col. O'Niall",
+    "defence_level": "1",
+    "safespot": null,
+    "lifepoints": "10",
+    "strength_level": "1",
+    "id": "4872",
+    "range_level": "1",
+    "attack_level": "1"
+  },  
+  {
+    "examine": "There's something fishy about him.",
+    "melee_animation": "0",
+    "range_animation": "0",
+    "defence_animation": "0",
+    "magic_animation": "0",
+    "death_animation": "0",
+    "name": "Mayor Hobb",
+    "defence_level": "1",
+    "safespot": null,
+    "lifepoints": "10",
+    "strength_level": "1",
+    "id": "4874",
+    "range_level": "1",
+    "attack_level": "1"
+  },
+  {
+    "examine": "A fresh-faced and innocent priest.",
+    "melee_animation": "0",
+    "range_animation": "0",
+    "defence_animation": "0",
+    "magic_animation": "0",
+    "death_animation": "0",
+    "name": "Brother Maledict",
+    "defence_level": "1",
+    "safespot": null,
+    "lifepoints": "10",
+    "strength_level": "1",
+    "id": "4878",
+    "range_level": "1",
+    "attack_level": "1"
+  },
+  {
+    "examine": "A down on his luck fisherman.",
+    "melee_animation": "0",
+    "range_animation": "0",
+    "defence_animation": "0",
+    "magic_animation": "0",
+    "death_animation": "0",
+    "name": "Witchaven villager",
+    "defence_level": "1",
+    "safespot": null,
+    "lifepoints": "10",
+    "strength_level": "1",
+    "id": "4883",
+    "range_level": "1",
+    "attack_level": "1"
+  },
+  {
+    "examine": "A down on her luck fisherman.",
+    "melee_animation": "0",
+    "range_animation": "0",
+    "defence_animation": "0",
+    "magic_animation": "0",
+    "death_animation": "0",
+    "name": "Witchaven villager",
+    "defence_level": "1",
+    "safespot": null,
+    "lifepoints": "10",
+    "strength_level": "1",
+    "id": "4885",
+    "range_level": "1",
+    "attack_level": "1"
+  },
+  {
+    "examine": "A down on his luck fisherman.",
+    "melee_animation": "0",
+    "range_animation": "0",
+    "defence_animation": "0",
+    "magic_animation": "0",
+    "death_animation": "0",
+    "name": "Witchaven villager",
+    "defence_level": "1",
+    "safespot": null,
+    "lifepoints": "10",
+    "strength_level": "1",
+    "id": "4887",
+    "range_level": "1",
+    "attack_level": "1"
+  },  
+  {
+    "examine": "A villager named Jeb.",
+    "melee_animation": "0",
+    "range_animation": "0",
+    "defence_animation": "0",
+    "magic_animation": "0",
+    "death_animation": "0",
+    "name": "Jeb",
+    "defence_level": "1",
+    "safespot": null,
+    "lifepoints": "10",
+    "strength_level": "1",
+    "id": "4895",
+    "range_level": "1",
+    "attack_level": "1"
+  },
+  {
+    "examine": "A little girl. She looks terrified.",
+    "melee_animation": "0",
+    "range_animation": "0",
+    "defence_animation": "0",
+    "magic_animation": "0",
+    "death_animation": "0",
+    "name": "Kimberly",
+    "defence_level": "1",
+    "safespot": null,
+    "lifepoints": "10",
+    "strength_level": "1",
+    "id": "7168",
+    "range_level": "1",
+    "attack_level": "1"
+  },  
   {
     "examine": "Stinky! Poor guy.",
     "name": "Yeti",
diff --git a/Server/data/configs/npc_spawns.json b/Server/data/configs/npc_spawns.json
index 3de29bbcd..d2eb8b520 100644
--- a/Server/data/configs/npc_spawns.json
+++ b/Server/data/configs/npc_spawns.json
@@ -125,7 +125,7 @@
   },
   {
     "npc_id": "41",
-    "loc_data": "{3197,3356,0,1,4}-{3234,3297,0,1,3}-{3230,3296,0,1,5}-{3236,3288,0,1,6}-{3236,3300,0,1,2}-{3231,3308,0,1,3}-{2965,3336,0,1,4}-{3110,9573,0,1,6}-{2655,3441,0,1,6}-{2649,3438,0,1,7}-{2649,3446,0,1,6}-{2653,3444,0,1,6}-{2647,3441,0,1,1}-{2784,3062,0,1,4}-{2789,3063,0,1,4}-{3160,3082,0,1,3}-{3140,3096,0,1,3}-{3140,3093,0,1,0}-{3138,3094,0,1,1}-{3140,3093,0,1,3}-{3138,3093,0,1,1}-{3138,3094,0,1,0}-{3189,3278,0,1,3}-{3187,3276,0,1,5}-{3188,3278,0,1,4}-{2851,3370,0,1,3}-{2846,3374,0,1,3}-{2853,3372,0,1,3}-{2847,3373,0,1,3}-{2850,3371,0,1,1}-{2851,3373,0,1,4}-{2852,3370,0,1,4}-{3234,3293,0,1,4}-{3229,3298,0,1,1}-{3228,3296,0,1,4}-{2815,3560,0,1,7}-{2819,3561,0,1,4}-{2818,3559,0,1,6}-{3140,3093,0,1,1}-{2674,3652,0,1,3}-{2672,3655,0,1,6}-{2677,3655,0,1,6}"
+    "loc_data": "{3197,3356,0,1,4}-{3234,3297,0,1,3}-{3230,3296,0,1,5}-{3236,3288,0,1,6}-{3236,3300,0,1,2}-{3231,3308,0,1,3}-{2965,3336,0,1,4}-{3110,9573,0,1,6}-{2655,3441,0,1,6}-{2649,3438,0,1,7}-{2649,3446,0,1,6}-{2653,3444,0,1,6}-{2647,3441,0,1,1}-{2784,3062,0,1,4}-{2789,3063,0,1,4}-{3160,3082,0,1,3}-{3140,3096,0,1,3}-{3140,3093,0,1,0}-{3138,3094,0,1,1}-{3140,3093,0,1,3}-{3138,3093,0,1,1}-{3138,3094,0,1,0}-{3189,3278,0,1,3}-{3187,3276,0,1,5}-{3188,3278,0,1,4}-{2851,3370,0,1,3}-{2846,3374,0,1,3}-{2853,3372,0,1,3}-{2847,3373,0,1,3}-{2850,3371,0,1,1}-{2851,3373,0,1,4}-{2852,3370,0,1,4}-{3234,3293,0,1,4}-{3229,3298,0,1,1}-{3228,3296,0,1,4}-{2815,3560,0,1,7}-{2819,3561,0,1,4}-{2818,3559,0,1,6}-{3140,3093,0,1,1}-{2674,3652,0,1,3}-{2672,3655,0,1,6}-{2677,3655,0,1,6}-{2694,3274,0,1,6}-{2695,3275,0,1,3}"
   },
   {
     "npc_id": "42",
@@ -157,7 +157,7 @@
   },
   {
     "npc_id": "49",
-    "loc_data": "{2861,9838,0,1,3}-{2858,9842,0,1,4}-{2854,9847,0,1,5}-{2857,9850,0,1,7}-{2865,9849,0,1,6}-{2869,9838,0,1,6}-{3104,3680,0,1,3}-{3114,3688,0,1,1}-{3121,3675,0,1,1}-{3127,3695,0,1,3}-{3129,3678,0,1,2}-{3130,3689,0,1,2}-{3128,3665,0,1,3}-{3135,3701,0,1,6}-{3085,10134,0,1,0}-{3090,10123,0,1,0}-{3094,10133,0,1,0}-{3095,10120,0,1,0}-{3095,10128,0,1,0}-{3098,10122,0,1,0}-{3104,10127,0,1,0}-{3105,10125,0,1,0}-{3177,3905,0,1,4}-{3180,3908,0,1,2}-{3189,3914,0,1,6}-{3193,3906,0,1,2}-{2402,9785,0,1,1}-{2403,9782,0,1,1}-{2408,9782,0,1,1}-{2408,9785,0,1,1}-{2413,9776,0,1,1}-{2417,9777,0,1,1}-{2412,9773,0,1,1}-{2416,9773,0,1,1}"
+    "loc_data": "{2861,9838,0,1,3}-{2858,9842,0,1,4}-{2854,9847,0,1,5}-{2857,9850,0,1,7}-{2865,9849,0,1,6}-{2869,9838,0,1,6}-{3104,3680,0,1,3}-{3114,3688,0,1,1}-{3121,3675,0,1,1}-{3127,3695,0,1,3}-{3129,3678,0,1,2}-{3130,3689,0,1,2}-{3128,3665,0,1,3}-{3135,3701,0,1,6}-{3085,10134,0,1,0}-{3090,10123,0,1,0}-{3094,10133,0,1,0}-{3095,10120,0,1,0}-{3095,10128,0,1,0}-{3098,10122,0,1,0}-{3104,10127,0,1,0}-{3105,10125,0,1,0}-{3177,3905,0,1,4}-{3180,3908,0,1,2}-{3189,3914,0,1,6}-{3193,3906,0,1,2}-{2402,9785,0,1,1}-{2403,9782,0,1,1}-{2408,9782,0,1,1}-{2408,9785,0,1,1}-{2413,9776,0,1,1}-{2417,9777,0,1,1}-{2412,9773,0,1,1}-{2416,9773,0,1,1}-{2735,9692,0,1,1}-{2732,9687,0,1,1}-{2733,9688,0,1,1}-{2734,9690,0,1,1}-{2733,9686,0,1,1}-{2732,9692,0,1,1}-{2736,9685,0,1,1}-{2730,9691,0,1,1}"
   },
   {
     "npc_id": "50",
@@ -373,7 +373,7 @@
   },
   {
     "npc_id": "115",
-    "loc_data": "{2572,3028,0,1,2}-{2550,3046,0,1,4}-{2572,3034,0,1,3}-{2576,3026,0,1,4}-{2534,2975,0,1,1}-{2518,2974,0,1,1}-{2573,2987,0,1,1}-{2592,2967,0,1,3}-{2589,2961,0,0,2}-{2575,2989,0,1,0}-{2574,2992,0,1,4}-{2521,2974,0,1,4}-{2500,3092,0,1,6}-{2524,3375,0,1,3}-{2524,3374,0,1,3}-{2529,3374,0,1,3}-{2532,3375,0,1,1}-{2532,3373,0,1,1}-{2527,3376,0,1,6}-{2525,3373,0,1,7}-{2525,3373,0,1,5}-{2511,3086,0,1,1}-{2511,3084,0,1,3}-{2503,3114,0,1,6}-{2509,3120,0,1,4}-{2506,3107,0,1,4}-{2500,3112,0,1,4}-{2521,3045,0,1,6}-{2517,3043,0,1,5}-{2500,3095,0,1,3}-{2497,3090,0,1,4}-{2502,3099,0,1,4}-{2504,3097,0,1,4}-{2503,3134,0,1,3}-{2554,3196,0,1,7}-{2519,3039,0,1,4}"
+    "loc_data": "{2572,3028,0,1,2}-{2550,3046,0,1,4}-{2572,3034,0,1,3}-{2576,3026,0,1,4}-{2534,2975,0,1,1}-{2518,2974,0,1,1}-{2573,2987,0,1,1}-{2592,2967,0,1,3}-{2589,2961,0,0,2}-{2575,2989,0,1,0}-{2574,2992,0,1,4}-{2521,2974,0,1,4}-{2500,3092,0,1,6}-{2524,3375,0,1,3}-{2524,3374,0,1,3}-{2529,3374,0,1,3}-{2532,3375,0,1,1}-{2532,3373,0,1,1}-{2527,3376,0,1,6}-{2525,3373,0,1,7}-{2525,3373,0,1,5}-{2511,3086,0,1,1}-{2511,3084,0,1,3}-{2503,3114,0,1,6}-{2509,3120,0,1,4}-{2506,3107,0,1,4}-{2500,3112,0,1,4}-{2521,3045,0,1,6}-{2517,3043,0,1,5}-{2500,3095,0,1,3}-{2497,3090,0,1,4}-{2502,3099,0,1,4}-{2504,3097,0,1,4}-{2503,3134,0,1,3}-{2554,3196,0,1,7}-{2519,3039,0,1,4}-{2722,9701,0,1,1}-{2720,9715,0,1,1}-{2721,9669,0,1,1}-{2722,9707,0,1,1}-{2723,9716,0,1,1}-{2717,9669,0,1,1}"
   },
   {
     "npc_id": "116",
@@ -2389,7 +2389,7 @@
   },
   {
     "npc_id": "1017",
-    "loc_data": "{3198,3359,0,1,0}-{3231,3296,0,1,6}-{3233,3300,0,1,4}-{3235,3293,0,1,3}-{3232,3288,0,1,0}-{3234,3298,0,1,6}-{2785,3069,0,1,4}-{2800,3072,0,1,6}-{3234,3297,0,1,3}-{3234,3292,0,1,4}-{3235,3289,0,1,1}-{2677,3656,0,1,2}-{2672,3654,0,1,2}-{2676,3652,0,1,4}-{2681,3652,0,1,4}-{2675,3652,0,1,3}"
+    "loc_data": "{3198,3359,0,1,0}-{3231,3296,0,1,6}-{3233,3300,0,1,4}-{3235,3293,0,1,3}-{3232,3288,0,1,0}-{3234,3298,0,1,6}-{2785,3069,0,1,4}-{2800,3072,0,1,6}-{3234,3297,0,1,3}-{3234,3292,0,1,4}-{3235,3289,0,1,1}-{2677,3656,0,1,2}-{2672,3654,0,1,2}-{2676,3652,0,1,4}-{2681,3652,0,1,4}-{2675,3652,0,1,3}-{2693,3271,0,1,3}-{2692,3272,0,1,3}"
   },
   {
     "npc_id": "1019",
@@ -4897,19 +4897,19 @@
   },
   {
     "npc_id": "2685",
-    "loc_data": "{3124,9873,0,1,3}-{2911,3285,0,1,1}"
+    "loc_data": "{3124,9873,0,1,3}-{2911,3285,0,1,1}-{2696,9689,0,1,1}"
   },
   {
     "npc_id": "2686",
-    "loc_data": "{2907,3293,0,1,4}"
+    "loc_data": "{2907,3293,0,1,4}-{2700,9696,0,1,1}"
   },
   {
     "npc_id": "2687",
-    "loc_data": "{2907,3293,0,1,6}-{2908,3290,0,1,3}"
+    "loc_data": "{2907,3293,0,1,6}-{2908,3290,0,1,3}-{2703,9698,0,1,1}"
   },
   {
     "npc_id": "2688",
-    "loc_data": "{3127,9874,0,1,4}-{2906,3288,0,1,1}-{2910,3293,0,1,4}"
+    "loc_data": "{3127,9874,0,1,4}-{2906,3288,0,1,1}-{2910,3293,0,1,4}-{2699,9690,0,1,1}"
   },
   {
     "npc_id": "2689",
@@ -9719,6 +9719,10 @@
     "npc_id": "7162",
     "loc_data": "{3144,4229,2,1,1}-{3143,4236,2,1,1}-{3145,4235,2,1,1}-{3148,4244,2,1,6}"
   },
+  {
+    "npc_id": "7168",
+    "loc_data": "{2714,3309,0,1,1}"
+  },  
   {
     "npc_id": "7228",
     "loc_data": "{2862,3101,0,0,0}-{2879,3109,0,0,0}-{2882,3104,0,0,0}-{2874,3098,0,0,0}-{2882,3098,0,0,0}"
@@ -10599,6 +10603,46 @@
     "npc_id": "2356",
     "loc_data": "{2323,3163,0,1,0}"
   },
+  {
+    "npc_id": "4874",
+    "loc_data": "{2709,3291,0,0,0}"
+  },
+  {
+    "npc_id": "4856",
+    "loc_data": "{2732,3292,0,1,1}"
+  },
+  {
+    "npc_id": "4872",
+    "loc_data": "{2740,3310,0,0,0}"
+  },  
+  {
+    "npc_id": "4878",
+    "loc_data": "{2726,3283,0,1,1}"
+  },
+  {
+    "npc_id": "4883",
+    "loc_data": "{2713,3278,0,1,1}"
+  },
+  {
+    "npc_id": "4885",
+    "loc_data": "{2705,3287,0,1,1}-{2716,3287,0,1,1}-{2732,3282,0,1,1}"
+  },  
+  {
+    "npc_id": "4887",
+    "loc_data": "{2738,3303,0,1,1}-{2723,3274,0,1,1}"
+  },  
+  {
+    "npc_id": "4895",
+    "loc_data": "{2718,3302,0,1,1}"
+  },  
+  {
+    "npc_id": "696",
+    "loc_data": "{2716,3303,0,1,1}"
+  },    
+  {
+    "npc_id": "698",
+    "loc_data": "{2716,3303,0,1,1}"
+  },   
   {
     "npc_id": "2352",
     "loc_data": "{2334,3183,0,1,0}"
diff --git a/Server/data/configs/shops.json b/Server/data/configs/shops.json
index 1db143528..7c00ee1f6 100644
--- a/Server/data/configs/shops.json
+++ b/Server/data/configs/shops.json
@@ -2086,5 +2086,14 @@
     "id": "235",
     "title": "Gnomic Supplies",
     "stock": "{1931,inf}-{1929,inf}-{1937,inf}-{2313,inf}-{1887,inf}-{590,inf}-{1735,inf}-{1951,inf}-{1969,inf}-{1949,inf}"
-  }
+  },
+  {
+    "npcs": "4856",
+    "high_alch": "1",
+    "currency": "995",
+    "general_store": "false",
+    "id": "236",
+    "title": "Lovecraft's Tackle",
+    "stock": "{303,10}-{307,10}-{309,10}-{311,1000}-{301,10}-{313,1000}-{314,1000}-{317,0}-{327,10}-{345,0}-{321,0}-{335,0}-{349,0}-{331,0}-{359,0}-{377,0}-{371,0}"
+  }  
 ]
\ No newline at end of file