diff --git a/Client.py b/Client.py
index cad592a..5567ce4 100644
--- a/Client.py
+++ b/Client.py
@@ -1,7 +1,8 @@
 from typing import TYPE_CHECKING, Optional, Dict, Set
 import struct
 from NetUtils import ClientStatus
-from .Locations import roomCount, nonBlock, beanstones
+from .Locations import roomCount, nonBlock, beanstones, roomException, shop, badge, pants
+from .Items import items_by_id, ItemData
 import sys
 import logging
 import math
@@ -36,110 +37,152 @@
 
 
 class MLSSClient(BizHawkClient):
-        game = "Mario & Luigi Superstar Saga"
-        system = "GBA"
-        local_checked_locations: Set[int]
-        goal_flag: int
-        rom_slot_name: Optional[str]
-        player_name: Optional[str]
-
-        def __init__(self) -> None:
-            super().__init__()
-            self.local_checked_locations = set()
-            self.local_set_events = {}
-            self.local_found_key_items = {}
-            self.rom_slot_name = None
-
-        async def validate_rom(self, ctx: BizHawkClientContext) -> bool:
-            from CommonClient import logger
-
-            try:
-                # Check ROM name/patch version
-                rom_name_bytes = ((await bizhawk.read(ctx.bizhawk_ctx, [(0xA0, 14, "ROM")]))[0])
-                rom_name = bytes([byte for byte in rom_name_bytes if byte != 0]).decode("UTF-8")
-                if not rom_name.startswith("MARIO&LUIGIU"):
-                    return False
-                if rom_name == "MARIO&LUIGIUA8":
-                    logger.info("ERROR: You appear to be running an unpatched version of Mario & Luigi Superstar Saga. "
-                                "You need to generate a patch file and use it to create a patched ROM.")
-                    return False
-                if rom_name != "MARIO&LUIGIUAP":
-                    logger.info(rom_name)
-                    logger.info("ERROR: The patch file used to create this ROM is not compatible with "
-                                "this client. Double check your client version against the version being "
-                                "used by the generator.")
-                    return False
-            except UnicodeDecodeError:
+    game = "Mario & Luigi Superstar Saga"
+    system = "GBA"
+    local_checked_locations: Set[int]
+    goal_flag: int
+    rom_slot_name: Optional[str]
+    player_name: Optional[str]
+
+    def __init__(self) -> None:
+        super().__init__()
+        self.local_checked_locations = set()
+        self.local_set_events = {}
+        self.local_found_key_items = {}
+        self.rom_slot_name = None
+
+    async def validate_rom(self, ctx: BizHawkClientContext) -> bool:
+        from CommonClient import logger
+
+        try:
+            # Check ROM name/patch version
+            rom_name_bytes = ((await bizhawk.read(ctx.bizhawk_ctx, [(0xA0, 14, "ROM")]))[0])
+            rom_name = bytes([byte for byte in rom_name_bytes if byte != 0]).decode("UTF-8")
+            if not rom_name.startswith("MARIO&LUIGIU"):
                 return False
-            except bizhawk.RequestFailedError:
-                return False  # Should verify on the next pass
-
-            ctx.game = self.game
-            ctx.items_handling = 0b001
-            ctx.want_slot_data = True
-            ctx.watcher_timeout = 0.125
-            self.rom_slot_name = rom_name
-            name_bytes = ((await bizhawk.read(ctx.bizhawk_ctx, [(0xB0, 16, "ROM")]))[0])
-            name = bytes([byte for byte in name_bytes if byte != 0]).decode("UTF-8")
-            self.player_name = name
-
-            return True
-
-        async def set_auth(self, ctx: BizHawkClientContext) -> None:
-            ctx.auth = self.player_name
-
-        async def game_watcher(self, ctx: BizHawkClientContext) -> None:
-            from CommonClient import logger
-            try:
-                read_state = await bizhawk.read(ctx.bizhawk_ctx, [(0x4564, 59, "EWRAM")])
-                flags = read_state[0]
-
-
-                # TODO Confirm a save has been made
-
-                locs_to_send = set()
-
-                # Check for set location flags.
-                for byte_i, byte in enumerate(bytearray(flags)):
-                    for i in range(8):
-                        and_value = 1 << i
-                        if byte & and_value != 0:
-                            flag_id = byte_i * 8 + (i + 1)
-                            room, item = find_key(roomCount, flag_id)
-                            pointer_arr = await bizhawk.read(ctx.bizhawk_ctx, [(ROOM_ARRAY_POINTER + ((room - 1) * 4), 4, "ROM")])
-                            pointer = (struct.unpack('<I', pointer_arr[0])[0])
-                            pointer = pointer & 0xFFFFFF
-                            offset = await bizhawk.read(ctx.bizhawk_ctx, [(pointer, 1, "ROM")])
-                            offset = offset[0][0]
-                            if offset != 0:
-                                offset = 2
-                            pointer += (item * 8) + 1 + offset
-                            if pointer in beanstones:
-                                pointer = beanstones[pointer]
-                            if pointer in ctx.server_locations:
-                                locs_to_send.add(pointer)
-
-                for item in nonBlock:
-                    address, mask, location = item
-                    flag_byte = await bizhawk.read(ctx.bizhawk_ctx, [(address, 1, "ROM")])
-                    flag_byte = flag_byte[0][0]
-                    if flag_byte & mask != 0:
+            if rom_name == "MARIO&LUIGIUA8":
+                logger.info("ERROR: You appear to be running an unpatched version of Mario & Luigi Superstar Saga. "
+                            "You need to generate a patch file and use it to create a patched ROM.")
+                return False
+            if rom_name != "MARIO&LUIGIUAP":
+                logger.info(rom_name)
+                logger.info("ERROR: The patch file used to create this ROM is not compatible with "
+                            "this client. Double check your client version against the version being "
+                            "used by the generator.")
+                return False
+        except UnicodeDecodeError:
+            return False
+        except bizhawk.RequestFailedError:
+            return False  # Should verify on the next pass
+
+        ctx.game = self.game
+        ctx.items_handling = 0b001
+        ctx.want_slot_data = True
+        ctx.watcher_timeout = 0.125
+        self.rom_slot_name = rom_name
+        name_bytes = ((await bizhawk.read(ctx.bizhawk_ctx, [(0xB0, 16, "ROM")]))[0])
+        name = bytes([byte for byte in name_bytes if byte != 0]).decode("UTF-8")
+        self.player_name = name
+
+        return True
+
+    async def set_auth(self, ctx: BizHawkClientContext) -> None:
+        ctx.auth = self.player_name
+
+    async def game_watcher(self, ctx: BizHawkClientContext) -> None:
+        from CommonClient import logger
+        try:
+            read_state = await bizhawk.read(ctx.bizhawk_ctx, [(0x4564, 59, "EWRAM"),
+                                                              (0x2330, 2, "IWRAM"), (0x3FE0, 1, "IWRAM"), (0x3FE4, 1, "IWRAM"), (0x304B, 1, "EWRAM"), (0x304C, 4, "EWRAM"), (0x3058, 6, "EWRAM")])
+            flags = read_state[0]
+            room = (read_state[1][1] << 8) + read_state[1][0]
+            shop_init = read_state[2][0]
+            shop_scroll = read_state[3][0]
+            is_buy = (read_state[4][0] != 0)
+            shop_address = (struct.unpack('<I', read_state[5])[0]) & 0xFFFFFF
+            logo = bytes([byte for byte in read_state[6] if byte != 0]).decode("UTF-8")
+
+            if logo != "MLSSAP":
+                return
+            # TODO Confirm a save has been made
+
+            locs_to_send = set()
+            location = 0
+
+            for item in ctx.items_received:
+                item_data = items_by_id[item.item]
+                b = await bizhawk.read(ctx.bizhawk_ctx, [(0x3057, 1, "EWRAM")])
+                if b[0][0] == 0:
+                    await bizhawk.write(ctx.bizhawk_ctx, [(0x3057, [item_data.itemID], "EWRAM")])
+                else:
+                    break
+
+
+            if is_buy:
+                is_buy = False
+                if shop_address != 0x3c0618 and shop_address != 0x3c0684:
+                    location = shop[shop_address][shop_scroll]
+                else:
+                    if shop_init & 0x1 != 0:
+                        location = badge[shop_address][shop_scroll & 0x1F]
+                    else:
+                        location = pants[shop_address][shop_scroll & 0x1F]
+                await bizhawk.write(ctx.bizhawk_ctx, [(0x304B, [0x0], "EWRAM")])
+
+            if location in ctx.server_locations:
+                locs_to_send.add(location)
+
+            # Check for set location flags.
+            for byte_i, byte in enumerate(bytearray(flags)):
+                for i in range(8):
+                    and_value = 1 << i
+                    if byte & and_value != 0:
+                        flag_id = byte_i * 8 + (i + 1)
+                        room, item = find_key(roomCount, flag_id)
+                        pointer_arr = await bizhawk.read(ctx.bizhawk_ctx,
+                                                         [(ROOM_ARRAY_POINTER + ((room - 1) * 4), 4, "ROM")])
+                        pointer = (struct.unpack('<I', pointer_arr[0])[0])
+                        pointer = pointer & 0xFFFFFF
+                        offset = await bizhawk.read(ctx.bizhawk_ctx, [(pointer, 1, "ROM")])
+                        offset = offset[0][0]
+                        if offset != 0:
+                            offset = 2
+                        pointer += (item * 8) + 1 + offset
+                        for key, value in beanstones.items():
+                            if pointer == value:
+                                pointer = key
+                                break
+                        if pointer in ctx.server_locations:
+                            locs_to_send.add(pointer)
+
+            for item in nonBlock:
+                address, mask, location = item
+                flag_bytes = await bizhawk.read(ctx.bizhawk_ctx, [(address, 1, "EWRAM")])
+                flag_byte = flag_bytes[0][0]
+                if flag_byte & mask != 0:
+                    if location in roomException:
+                        if roomException[location] == room:
+                            exception = True
+                        else:
+                            exception = False
+                    else:
+                        exception = True
+                    if location in ctx.server_locations and exception:
                         locs_to_send.add(location)
 
+            # Send locations if there are any to send.
+            if locs_to_send != self.local_checked_locations:
+                self.local_checked_locations = locs_to_send
 
-                # Send locations if there are any to send.
-                if locs_to_send != self.local_checked_locations:
-                    self.local_checked_locations = locs_to_send
-
-                    if locs_to_send is not None:
-                        await ctx.send_msgs([{
-                            "cmd": "LocationChecks",
-                            "locations": list(locs_to_send)
-                        }])
+                if locs_to_send is not None:
+                    await ctx.send_msgs([{
+                        "cmd": "LocationChecks",
+                        "locations": list(locs_to_send)
+                    }])
 
-            except bizhawk.RequestFailedError:
-                # Exit handler and return to main loop to reconnect.
-                pass
+        except bizhawk.RequestFailedError:
+            # Exit handler and return to main loop to reconnect.
+            pass
 
 
 def find_key(dictionary, target):
diff --git a/Items.py b/Items.py
index 49387b8..5c5fc06 100644
--- a/Items.py
+++ b/Items.py
@@ -58,13 +58,13 @@ class MLSSItem(Item):
     ItemData(0x2A, "Fake Beanstar", ItemClassification.progression, 0x43),
     ItemData(0x2B, "Red Pearl Bean", ItemClassification.progression, 0x45),
     ItemData(0x2C, "Green Pearl Bean", ItemClassification.progression, 0x46),
-    ItemData(0x2D, "Bean Fruit 1", ItemClassification.progression, 0x47),
-    ItemData(0x2E, "Bean Fruit 2", ItemClassification.progression, 0x50),
-    ItemData(0x2F, "Bean Fruit 3", ItemClassification.progression, 0x51),
-    ItemData(0x30, "Bean Fruit 4", ItemClassification.progression, 0x52),
-    ItemData(0x31, "Bean Fruit 5", ItemClassification.progression, 0x53),
-    ItemData(0x32, "Bean Fruit 6", ItemClassification.progression, 0x54),
-    ItemData(0x33, "Bean Fruit 7", ItemClassification.progression, 0x55),
+    ItemData(0x2D, "Bean Fruit 1", ItemClassification.progression_skip_balancing, 0x47),
+    ItemData(0x2E, "Bean Fruit 2", ItemClassification.progression_skip_balancing, 0x50),
+    ItemData(0x2F, "Bean Fruit 3", ItemClassification.progression_skip_balancing, 0x51),
+    ItemData(0x30, "Bean Fruit 4", ItemClassification.progression_skip_balancing, 0x52),
+    ItemData(0x31, "Bean Fruit 5", ItemClassification.progression_skip_balancing, 0x53),
+    ItemData(0x32, "Bean Fruit 6", ItemClassification.progression_skip_balancing, 0x54),
+    ItemData(0x33, "Bean Fruit 7", ItemClassification.progression_skip_balancing, 0x55),
     ItemData(0x34, "Blue Neon Egg", ItemClassification.progression, 0x56),
     ItemData(0x35, "Red Neon Egg", ItemClassification.progression, 0x57),
     ItemData(0x36, "Green Neon Egg", ItemClassification.progression, 0x60),
diff --git a/Locations.py b/Locations.py
index 83c358a..8ebb86d 100644
--- a/Locations.py
+++ b/Locations.py
@@ -258,8 +258,8 @@ class MLSSLocation(Location):
     LocationData("Beanbean Outskirts Chateau Entrance Digspot 2", 0x39e983, 0, 0x02000000, 0x00),
     LocationData("Chateau Green Goblet", 0x24e628, 1, 0x02000000, 0x00),
     LocationData("Chateau Red Goblet", 0x1e943e, 2, 0x02000000, 0x00),
-    LocationData("Chucklehuck Woods Red Chuckola Fruit", 0x250621, 1, 0x02000000, 0x00),
-    LocationData("Chucklehuck Woods White Chuckola Fruit", 0x24ff18, 1, 0x02000000, 0x00),
+    LocationData("Chucklehuck Woods Red Chuckola Fruit", 0x250621, 2, 0x02000000, 0x00),
+    LocationData("Chucklehuck Woods White Chuckola Fruit", 0x24ff18, 2, 0x02000000, 0x00),
     LocationData("Chucklehuck Woods Purple Chuckola Fruit", 0x24ed74, 1, 0x02000000, 0x00)
 ]
 
@@ -471,8 +471,8 @@ class MLSSLocation(Location):
     LocationData("Gwarhar Lagoon First Underwater Area Room 1 Block", 0x39e438, 0, 0x02000000, 0x00),
     LocationData("Gwarhar Lagoon First Underwater Area Room 2 Block 1", 0x39e445, 0, 0x02000000, 0x00),
     LocationData("Gwarhar Lagoon First Underwater Area Room 2 Block 2", 0x39e44d, 0, 0x02000000, 0x00),
-    LocationData("Gwarhar Lagoon Red Pearl Bean", 0x235c1c, 2, 0x02000000, 0x00),
-    LocationData("Gwarhar Lagoon Green Pearl Bean", 0x235a5b, 2, 0x02000000, 0x00)
+    LocationData("Gwarhar Lagoon Red Pearl Bean", 0x235c1c, 1, 0x02000000, 0x00),
+    LocationData("Gwarhar Lagoon Green Pearl Bean", 0x235a5b, 1, 0x02000000, 0x00)
 ]
 
 gwarharMain: typing.List[LocationData] = [
@@ -565,7 +565,7 @@ class MLSSLocation(Location):
     LocationData("Bowser's Castle Lemmy Room 1 Block", 0x39ea9c, 0, 0x02000000, 0x00),
     LocationData("Bowser's Castle Lemmy Room 1 Digspot", 0x39eaa4, 0, 0x02000000, 0x00),
     LocationData("Bowser's Castle Ludwig Room 1 Block", 0x39eaba, 0, 0x02000000, 0x00),
-    LocationData("Bowser's Castle Lemmy Room Mole", 0x277b1f, 2, 0x02000000, 0x00)
+    LocationData("Bowser's Castle Lemmy Room Mole", 0x277b1f, 1, 0x02000000, 0x00)
 ]
 
 bowsersMini: typing.List[LocationData] = [
@@ -596,8 +596,8 @@ class MLSSLocation(Location):
     LocationData("Jokes End Second Floor West Room Block 2", 0x39e769, 0, 0x02000000, 0x00),
     LocationData("Jokes End Second Floor West Room Block 3", 0x39e779, 0, 0x02000000, 0x00),
     LocationData("Jokes End Second Floor West Room Block 4", 0x39e781, 0, 0x02000000, 0x00),
-    LocationData("Jokes End Mole Reward 1", 0x27788e, 0, 0x02000000, 0x00),
-    LocationData("Jokes End Mole Reward 2", 0x2778d2, 0, 0x02000000, 0x00)
+    LocationData("Jokes End Mole Reward 1", 0x27788e, 1, 0x02000000, 0x00),
+    LocationData("Jokes End Mole Reward 2", 0x2778d2, 1, 0x02000000, 0x00)
 ]
 
 jokesMain: typing.List[LocationData] = [
@@ -640,13 +640,13 @@ class MLSSLocation(Location):
 ]
 
 theater: typing.List[LocationData] = [
-    LocationData("Yoshi Theater Blue Yoshi", 0x241155, 2, 0x02000000, 0x00),
-    LocationData("Yoshi Theater Red Yoshi", 0x240ebe, 2, 0x02000000, 0x00),
-    LocationData("Yoshi Theater Green Yoshi", 0x241afa, 2, 0x02000000, 0x00),
-    LocationData("Yoshi Theater Yellow Yoshi", 0x241c3c, 2, 0x02000000, 0x00),
-    LocationData("Yoshi Theater Purple Yoshi", 0x241297, 2, 0x02000000, 0x00),
-    LocationData("Yoshi Theater Orange Yoshi", 0x241000, 2, 0x02000000, 0x00),
-    LocationData("Yoshi Theater Azure Yoshi", 0x241d7e, 2, 0x02000000, 0x00),
+    LocationData("Yoshi Theater Blue Yoshi", 0x241155, 1, 0x02000000, 0x00),
+    LocationData("Yoshi Theater Red Yoshi", 0x240ebe, 1, 0x02000000, 0x00),
+    LocationData("Yoshi Theater Green Yoshi", 0x241afa, 1, 0x02000000, 0x00),
+    LocationData("Yoshi Theater Yellow Yoshi", 0x241c3c, 1, 0x02000000, 0x00),
+    LocationData("Yoshi Theater Purple Yoshi", 0x241297, 1, 0x02000000, 0x00),
+    LocationData("Yoshi Theater Orange Yoshi", 0x241000, 1, 0x02000000, 0x00),
+    LocationData("Yoshi Theater Azure Yoshi", 0x241d7e, 1, 0x02000000, 0x00),
     LocationData("Beanstar Piece Yoshi Theater", 0x1e9442, 2, 0x02000000, 0x00)
 ]
 
@@ -662,31 +662,95 @@ class MLSSLocation(Location):
 ]
 
 nonBlock: list[(int, int, int)] = [
-    (0x434B, 0x1, 0x243844),
-    (0x434B, 0x1, 0x24387d),
-    (0x4373, 0x8, 0x2779C8),
-    (0x42F9, 0x4, 0x1E9403),
-    (0x434B, 0x10, 0x1E9435),
-    (0x434B, 0x20, 0x1E9436),
-    (0x433E, 0x20, 0x1E9404),
-    (0x433E, 0x40, 0x1E9405),
-    (0x42F9, 0x2, 0x1E9430),
-    (0x434B, 0x4, 0x242888),
-    (0x4373, 0x20, 0x277ab2),
-    (0x432D, 0x20, 0x1e9431),
-    (0x434E, 0x2, 0x1e9411),
-    (0x434E, 0x4, 0x1e9412),
-    (0x4375, 0x8, 0x243844),
+    (0x434B, 0x1, 0x243844),  # Farm Mole 1
+    (0x434B, 0x1, 0x24387d),  # Farm Mole 2
+    (0x4373, 0x8, 0x2779C8),  # Simulblock Mole
+    (0x42F9, 0x4, 0x1E9403),  # Hammers
+    (0x434B, 0x10, 0x1E9435),  # Solo Mario Mole 1
+    (0x434B, 0x20, 0x1E9436),  # Solo Mario Mole 2
+    (0x433E, 0x20, 0x1E9404),  # Super Hammers
+    (0x433E, 0x40, 0x1E9405),  # Ultra Hammers
+    (0x42F9, 0x2, 0x1E9430),  # Rose
+    (0x434B, 0x4, 0x242888),  # Solo Luigi Cave Mole
+    (0x4373, 0x20, 0x277ab2),  # Hoohoo Village Turtle Mole
+    (0x432D, 0x20, 0x1e9431),  # Piranha Bean
+    (0x434E, 0x2, 0x1e9411),  # Secret Scroll 1
+    (0x434E, 0x4, 0x1e9412),  # Secret Scroll 2
+    (0x4375, 0x8, 0x243844),  # Membership Card
+    (0x4373, 0x10, 0x277a45),  # Teehee Valley Mole
+    (0x434D, 0x8, 0x1E9444),  # Harhall's Pants
+    (0x432E, 0x10, 0x1e9441),  # Harhall Beanstar Piece
+    (0x434B, 0x8, 0x1e9434),  # Outskirts Boo Statue Mole
+    (0x42FE, 0x2, 0x1e943E),  # Red Goblet
+    (0x42FE, 0x4, 0x24e628),  # Green Goblet
+    (0x4301, 0x10, 0x250621),  # Red Chuckola Fruit
+    (0x42FE, 0x80, 0x24ed74),  # Purple Chuckola Fruit
+    (0x4302, 0x4, 0x24ff18),  # White Chuckola Fruit
+    (0x42FF, 0x8, 0x251347),  # Beanlet 1
+    (0x42FF, 0x20, 0x2513fb),  # Beanlet 2
+    (0x42FF, 0x10, 0x2513a1),  # Beanlet 3
+    (0x42FF, 0x4, 0x251988),  # Beanlet 4
+    (0x42FF, 0x2, 0x25192e),  # Beanlet 5
+    (0x42FF, 0x1, 0x2515eb),  # Beanlet Reward
+    (0x4371, 0x40, 0x253515),  # Espresso 1
+    (0x4371, 0x80, 0x253776),  # Espresso 2
+    (0x4372, 0x1, 0x253c70),  # Espresso 3
+    (0x4372, 0x2, 0x254324),  # Espresso 4
+    (0x4372, 0x4, 0x254718),  # Espresso 5
+    (0x4372, 0x8, 0x254a34),  # Espresso 6
+    (0x4372, 0x10, 0x254e24),  # Espresso 7
+    (0x472F, 0x1, 0x252d07),  # Woohoo Blend
+    (0x472F, 0x2, 0x252d28),  # Hoohoo Blend
+    (0x472F, 0x4, 0x252d49),  # Chuckle Blend
+    (0x472F, 0x8, 0x252d6a),  # Teehee Blend
+    (0x472F, 0x10, 0x252d8b),  # Hoolumbian
+    (0x472F, 0x20, 0x252dac),  # Chuckoccino
+    (0x472F, 0x40, 0x252dcd),  # Teeheespresso
+    (0x430B, 0x10, 0x1e9433),  # Extra Dress
+    (0x430B, 0x10, 0x1e9432),  # Fake Beanstar
+    (0x430F, 0x1, 0x1e9440),  # Popple Beanstar Piece
+    (0x430C, 0x80, 0x261658),  # Winkle Card
+    (0x4741, 0x1, 0x2578e7),  # Brooch
+    (0x4375, 0x2, 0x2753ea),  # Surf Minigame
+    (0x4373, 0x1, 0x277956),  # North Whirlpool Mole
+    (0x4346, 0x40, 0x235a5b),  # Green Pearl Bean
+    (0x4346, 0x80, 0x235c1c),  # Red Pearl Bean
+    (0x4340, 0x20, 0x1e9443),  # Hermie Beanstar Piece
+    (0x434A, 0x40, 0x1e9437),  # Spangle
+    (0x434A, 0x80, 0x236e73),  # Spangle Reward
+    (0x4373, 0x40, 0x277b1f),  # Bowser's Castle Mole
+    (0x4372, 0x80, 0x27788e),  # Jokes end Mole 1
+    (0x4372, 0x80, 0x2778d2),  # Jokes end Mole 2
+    (0x434C, 0x80, 0x241000),  # Orange Neon Egg
+    (0x434D, 0x1, 0x240ebe),  # Red Neon Egg
+    (0x434C, 0x40, 0x241155),  # Blue Neon Egg
+    (0x434D, 0x2, 0x241297),  # Purple Neon Egg
+    (0x434C, 0x8, 0x241afa),  # Green Neon Egg
+    (0x434C, 0x10, 0x241d7e),  # Azure Neon Egg
+    (0x434C, 0x20, 0x241c3c),  # Yellow Neon Egg
+    (0x434D, 0x40, 0x1e9442),  # Yellow Neon Egg
+    (0x4345, 0x8, 0x1e9408),  # Firebrand
+    (0x4345, 0x4, 0x1e9409),  # Thunder Hand
 ]
 
+roomException: dict[int, int] = {
+    0x1e9437: 0x10A,
+    0x24ed74: 0x8C,
+    0x250621: 0x9B,
+    0x24ff18: 0x98,
+    0x261658: 0x181,
+    0x260637: 0x137,
+    0x1E9403: 0x27
+}
+
 beanstones: dict[int, int] = {
-    0x229345: 0x39dc72,
+    0x229345: 0x39dc72,  # Bean fruit 1 - 6
     0x22954D: 0x39dcb4,
     0x228A17: 0x39dbd1,
     0x22913A: 0x39dc10,
     0x22890E: 0x39dba4,
     0x228775: 0x39db7f,
-    0x25117D: 0x39d73e,
+    0x25117D: 0x39d73e,  # Beanstone 1 - 10
     0x2511D6: 0x39d746,
     0x25122F: 0x39d74e,
     0x251288: 0x39d756,
@@ -840,6 +904,7 @@ class MLSSLocation(Location):
     0x122: 6,
     0x123: 1,
     0x126: 2,
+    0x128: 1,
     0x12A: 1,
     0x12B: 1,
     0x12E: 4,
@@ -887,19 +952,34 @@ class MLSSLocation(Location):
     0x19C: 1,
     0x19E: 2,
     0x1A0: 2,
-    0x1A4: 1,
-    0x1A7: 2,
-    0x1AB: 1,
+    0x1A3: 1,
+    0x1A6: 2,
+    0x1AA: 1,
+    0x1B0: 2,
     0x1B1: 2,
-    0x1B2: 2,
-    0x1B9: 2,
-    0x1CB: 2,
-    0x1D2: 2,
-    0x1D3: 3,
-    0x1D5: 1,
-    0x1EC: 3,
+    0x1B8: 2,
+    0x1CA: 2,
+    0x1D1: 2,
+    0x1D2: 3,
+    0x1D4: 1,
+    0x1EB: 3,
+    0x1F6: 1,
     0x1F7: 1,
-    0x1F8: 1,
+}
+
+shop: dict[int, []] = {
+    0x3c05f0: [0x3c05f0, 0x3c05f2, 0x3c05f4, 0x3c05f8, 0x3c05fc, 0x3c05fe, 0x3c0600, 0x3c0602, 0x3c0606, 0x3c0608, 0x3c060c, 0x3c060e, 0x3c0610, 0x3c0614],
+    0x3c066a: [0x3c066a, 0x3c066c, 0x3c066e, 0x3c0670, 0x3c0672, 0x3c0674, 0x3c0676, 0x3c0678, 0x3c067c, 0x3c0680]
+}
+
+badge: dict[int, []] = {
+    0x3c0618: [0x3c0618, 0x3c061a, 0x3c0624, 0x3c0626, 0x3c0628, 0x3c0632, 0x3c0634, 0x3c0636, 0x3c0640, 0x3c0642, 0x3c0644, 0x3c064e, 0x3c0650, 0x3c0652, 0x3c065c, 0x3c065e, 0x3c0660],
+    0x3c0684: [0x3c0684, 0x3c0686, 0x3c0688, 0x3c0692, 0x3c0694, 0x3c069c, 0x3c069e]
+}
+
+pants: dict[int, []] = {
+    0x3c0618: [0x3c061C, 0x3c061E, 0x3c0620, 0x3c0626, 0x3c062a, 0x3c062c, 0x3c062e, 0x3c0638, 0x3c063a, 0x3c063c, 0x3c0646, 0x3c0648, 0x3c064a, 0x3c0654, 0x3c0656, 0x3c0658, 0x3c0662, 0x3c0664, 0x3c0666],
+    0x3c0684: [0x3c068a, 0x3c068c, 0x3c068e, 0x3c0696, 0x3c0698, 0x3c06a0, 0x3c06a2]
 }
 
 all_locations: typing.List[LocationData] = mainArea + booStatue + chucklehuck + castleTown + startingFlag + \
diff --git a/Names/LocationName.py b/Names/LocationName.py
index 1b64712..300899e 100644
--- a/Names/LocationName.py
+++ b/Names/LocationName.py
@@ -59,6 +59,7 @@ class LocationName():
     HoohooMountainBaseBoostatueRoomDigspot1 = "Hoohoo Mountain Base Boostatue Room Digspot 1"
     HoohooMountainBaseBoostatueRoomDigspot2 = "Hoohoo Mountain Base Boostatue Room Digspot 2"
     HoohooMountainBaseBoostatueRoomDigspot3 = "Hoohoo Mountain Base Boostatue Room Digspot 3"
+    BeanbeanOutskirtsBooStatueMole = "Beanbean Outskirts Boo Statue Mole"
     HoohooMountainBaseGrassyAreaBlock1 = "Hoohoo Mountain Base Grassy Area Block 1"
     HoohooMountainBaseGrassyAreaBlock2 = "Hoohoo Mountain Base Grassy Area Block 2"
     HoohooMountainBaseGuffawhaRuinsEntranceDigspot = "Hoohoo Mountain Base Guffawha Ruins Entrance Digspot"
diff --git a/Rules.py b/Rules.py
index 235433e..5a391a7 100644
--- a/Rules.py
+++ b/Rules.py
@@ -16,6 +16,8 @@ def set_rules(world: MultiWorld, player: int):
              lambda state: StateLogic.hammers(state, player))
     add_rule(world.get_location(LocationName.HoohooMountainBaseBoostatueRoomBlock2, player),
              lambda state: StateLogic.canCrash(state, player) or StateLogic.super(state, player))
+    add_rule(world.get_location(LocationName.BeanbeanOutskirtsBooStatueMole, player),
+             lambda state: StateLogic.canMini(state, player) and StateLogic.canDig(state, player))
     add_rule(world.get_location(LocationName.HoohooMountainBaseBoostatueRoomDigspot2, player),
              lambda state: StateLogic.canCrash(state, player) or StateLogic.super(state, player))
     add_rule(world.get_location(LocationName.HoohooVillageSuperHammerCaveBlock, player),
diff --git a/StateLogic.py b/StateLogic.py
index c869465..8d8f3cc 100644
--- a/StateLogic.py
+++ b/StateLogic.py
@@ -77,10 +77,7 @@ def winkle(state, player):
 
 
 def beanFruit(state, player):
-    return state.has("Beanfruit 1", player) or state.has("Beanfruit 2", player) or state.has("Beanfruit 3",
-                                                                                             player) or state.has(
-        "Beanfruit 4", player) or state.has("Beanfruit 5", player) or state.has("Beanfruit 6", player) or state.has(
-        "Beanfruit 7", player)
+    return state.has("Beanfruit 1", player) and state.has("Beanfruit 2", player) and state.has("Beanfruit 3", player) and state.has("Beanfruit 4", player) and state.has("Beanfruit 5", player) and state.has("Beanfruit 6", player) and state.has("Beanfruit 7", player)
 
 
 def surfable(state, player):
diff --git a/data/basepatch.bsdiff b/data/basepatch.bsdiff
index dd90e87..640aa25 100644
Binary files a/data/basepatch.bsdiff and b/data/basepatch.bsdiff differ