diff --git a/CommonClient.py b/CommonClient.py
index a5e9b4553ab4..7bf11ffea691 100644
--- a/CommonClient.py
+++ b/CommonClient.py
@@ -1,15 +1,16 @@
 from __future__ import annotations
 
+import asyncio
 import copy
+import functools
 import logging
-import asyncio
-import urllib.parse
 import sys
-import typing
 import time
-import functools
+import urllib.parse
+from typing import Any, Dict, List, Optional, Set, TYPE_CHECKING, Type, Union
 
 import ModuleUpdate
+
 ModuleUpdate.update()
 
 import websockets
@@ -23,11 +24,11 @@
 from NetUtils import Endpoint, decode, NetworkItem, encode, JSONtoTextParser, \
     ClientStatus, Permission, NetworkSlot, RawJSONtoTextParser
 from Utils import Version, stream_input, async_start
-from worlds import network_data_package, AutoWorldRegister
+from worlds import DataPackage, GamePackage, network_data_package, AutoWorldRegister
 import os
 import ssl
 
-if typing.TYPE_CHECKING:
+if TYPE_CHECKING:
     import kvui
 
 logger = logging.getLogger("Client")
@@ -143,67 +144,69 @@ def default(self, raw: str):
 
 class CommonContext:
     # Should be adjusted as needed in subclasses
-    tags: typing.Set[str] = {"AP"}
-    game: typing.Optional[str] = None
-    items_handling: typing.Optional[int] = None
+    tags: Set[str] = {"AP"}
+    game: Optional[str] = None
+    items_handling: Optional[int] = None
     want_slot_data: bool = True  # should slot_data be retrieved via Connect
 
     # data package
     # Contents in flux until connection to server is made, to download correct data for this multiworld.
-    item_names: typing.Dict[int, str] = Utils.KeyedDefaultDict(lambda code: f'Unknown item (ID:{code})')
-    location_names: typing.Dict[int, str] = Utils.KeyedDefaultDict(lambda code: f'Unknown location (ID:{code})')
+    item_names: Dict[str, Dict[int, str]] = {}
+    """Dictionary of games to item id/name lookup dictionary for each game."""
+    location_names: Dict[str, Dict[int, str]] = {}
+    """Dictionary of games to location id/name lookup dictionary for each game."""
 
     # defaults
     starting_reconnect_delay: int = 5
     current_reconnect_delay: int = starting_reconnect_delay
-    command_processor: typing.Type[CommandProcessor] = ClientCommandProcessor
+    command_processor: Type[CommandProcessor] = ClientCommandProcessor
     ui = None
-    ui_task: typing.Optional["asyncio.Task[None]"] = None
-    input_task: typing.Optional["asyncio.Task[None]"] = None
-    keep_alive_task: typing.Optional["asyncio.Task[None]"] = None
-    server_task: typing.Optional["asyncio.Task[None]"] = None
-    autoreconnect_task: typing.Optional["asyncio.Task[None]"] = None
+    ui_task: Optional["asyncio.Task[None]"] = None
+    input_task: Optional["asyncio.Task[None]"] = None
+    keep_alive_task: Optional["asyncio.Task[None]"] = None
+    server_task: Optional["asyncio.Task[None]"] = None
+    autoreconnect_task: Optional["asyncio.Task[None]"] = None
     disconnected_intentionally: bool = False
-    server: typing.Optional[Endpoint] = None
+    server: Optional[Endpoint] = None
     server_version: Version = Version(0, 0, 0)
     generator_version: Version = Version(0, 0, 0)
-    current_energy_link_value: typing.Optional[int] = None  # to display in UI, gets set by server
+    current_energy_link_value: Optional[int] = None  # to display in UI, gets set by server
 
     last_death_link: float = time.time()  # last send/received death link on AP layer
 
     # remaining type info
-    slot_info: typing.Dict[int, NetworkSlot]
-    server_address: typing.Optional[str]
-    password: typing.Optional[str]
-    hint_cost: typing.Optional[int]
-    hint_points: typing.Optional[int]
-    player_names: typing.Dict[int, str]
+    slot_info: Dict[int, NetworkSlot]
+    server_address: Optional[str]
+    password: Optional[str]
+    hint_cost: Optional[int]
+    hint_points: Optional[int]
+    player_names: Dict[int, str]
 
     finished_game: bool
     ready: bool
-    auth: typing.Optional[str]
-    seed_name: typing.Optional[str]
+    auth: Optional[str]
+    seed_name: Optional[str]
 
     # locations
-    locations_checked: typing.Set[int]  # local state
-    locations_scouted: typing.Set[int]
-    items_received: typing.List[NetworkItem]
-    missing_locations: typing.Set[int]  # server state
-    checked_locations: typing.Set[int]  # server state
-    server_locations: typing.Set[int]  # all locations the server knows of, missing_location | checked_locations
-    locations_info: typing.Dict[int, NetworkItem]
+    locations_checked: Set[int]  # local state
+    locations_scouted: Set[int]
+    items_received: List[NetworkItem]
+    missing_locations: Set[int]  # server state
+    checked_locations: Set[int]  # server state
+    server_locations: Set[int]  # all locations the server knows of, missing_location | checked_locations
+    locations_info: Dict[int, NetworkItem]
 
     # data storage
-    stored_data: typing.Dict[str, typing.Any]
-    stored_data_notification_keys: typing.Set[str]
+    stored_data: Dict[str, Any]
+    stored_data_notification_keys: Set[str]
 
     # internals
     # current message box through kvui
-    _messagebox: typing.Optional["kvui.MessageBox"] = None
+    _messagebox: Optional["kvui.MessageBox"] = None
     # message box reporting a loss of connection
-    _messagebox_connection_loss: typing.Optional["kvui.MessageBox"] = None
+    _messagebox_connection_loss: Optional["kvui.MessageBox"] = None
 
-    def __init__(self, server_address: typing.Optional[str], password: typing.Optional[str]) -> None:
+    def __init__(self, server_address: Optional[str], password: Optional[str]) -> None:
         # server state
         self.server_address = server_address
         self.username = None
@@ -261,7 +264,7 @@ def raw_text_parser(self) -> RawJSONtoTextParser:
         return RawJSONtoTextParser(self)
 
     @property
-    def total_locations(self) -> typing.Optional[int]:
+    def total_locations(self) -> Optional[int]:
         """Will return None until connected."""
         if self.checked_locations or self.missing_locations:
             return len(self.checked_locations | self.missing_locations)
@@ -298,13 +301,13 @@ async def disconnect(self, allow_autoreconnect: bool = False):
         if self.server_task is not None:
             await self.server_task
 
-    async def send_msgs(self, msgs: typing.List[typing.Any]) -> None:
+    async def send_msgs(self, msgs: List[Any]) -> None:
         """ `msgs` JSON serializable """
         if not self.server or not self.server.socket.open or self.server.socket.closed:
             return
         await self.server.socket.send(encode(msgs))
 
-    def consume_players_package(self, package: typing.List[tuple]):
+    def consume_players_package(self, package: List[tuple]):
         self.player_names = {slot: name for team, slot, name, orig_name in package if self.team == team}
         self.player_names[0] = "Archipelago"
 
@@ -327,7 +330,7 @@ async def get_username(self):
                 logger.info('Enter slot name:')
                 self.auth = await self.console_input()
 
-    async def send_connect(self, **kwargs: typing.Any) -> None:
+    async def send_connect(self, **kwargs: Any) -> None:
         """ send `Connect` packet to log in to server """
         payload = {
             'cmd': 'Connect',
@@ -345,7 +348,7 @@ async def console_input(self) -> str:
         self.input_requests += 1
         return await self.input_queue.get()
 
-    async def connect(self, address: typing.Optional[str] = None) -> None:
+    async def connect(self, address: Optional[str] = None) -> None:
         """ disconnect any previous connection, and open new connection to the server """
         await self.disconnect()
         self.server_task = asyncio.create_task(server_loop(self, address), name="server loop")
@@ -392,12 +395,12 @@ def on_package(self, cmd: str, args: dict):
         """For custom package handling in subclasses."""
         pass
 
-    def on_user_say(self, text: str) -> typing.Optional[str]:
+    def on_user_say(self, text: str) -> Optional[str]:
         """Gets called before sending a Say to the server from the user.
         Returned text is sent, or sending is aborted if None is returned."""
         return text
 
-    def update_permissions(self, permissions: typing.Dict[str, int]):
+    def update_permissions(self, permissions: Dict[str, int]):
         for permission_name, permission_flag in permissions.items():
             try:
                 flag = Permission(permission_flag)
@@ -425,54 +428,48 @@ async def shutdown(self):
             self.input_task.cancel()
 
     # DataPackage
-    async def prepare_data_package(self, relevant_games: typing.Set[str],
-                                   remote_date_package_versions: typing.Dict[str, int],
-                                   remote_data_package_checksums: typing.Dict[str, str]):
-        """Validate that all data is present for the current multiworld.
-        Download, assimilate and cache missing data from the server."""
-        # by documentation any game can use Archipelago locations/items -> always relevant
+    async def prepare_data_package(self, relevant_games: Set[str], remote_data_package_checksums: Dict[str, str]):
+        """
+        Validate that all data is present for the current multiworld.
+        Download, assimilate and cache missing data from the server.
+        """
+
+        # Per documentation, any game can use the "Archipelago" world locations/items, so it's always relevant.
         relevant_games.add("Archipelago")
 
-        needed_updates: typing.Set[str] = set()
+        needed_updates: Set[str] = set()
         for game in relevant_games:
-            if game not in remote_date_package_versions and game not in remote_data_package_checksums:
+            if game not in remote_data_package_checksums:
                 continue
 
-            remote_version: int = remote_date_package_versions.get(game, 0)
-            remote_checksum: typing.Optional[str] = remote_data_package_checksums.get(game)
-
-            if remote_version == 0 and not remote_checksum:  # custom data package and no checksum for this game
-                needed_updates.add(game)
-                continue
+            remote_checksum: Optional[str] = remote_data_package_checksums.get(game)
+            local_checksum: Optional[str] = network_data_package["games"].get(game, {}).get("checksum")
 
-            local_version: int = network_data_package["games"].get(game, {}).get("version", 0)
-            local_checksum: typing.Optional[str] = network_data_package["games"].get(game, {}).get("checksum")
-            # no action required if local version is new enough
-            if (not remote_checksum and (remote_version > local_version or remote_version == 0)) \
-                    or remote_checksum != local_checksum:
+            # No action is required if our local version is the same.
+            if not remote_checksum or remote_checksum != local_checksum:
                 cached_game = Utils.load_data_package_for_checksum(game, remote_checksum)
-                cache_version: int = cached_game.get("version", 0)
-                cache_checksum: typing.Optional[str] = cached_game.get("checksum")
-                # download remote version if cache is not new enough
-                if (not remote_checksum and (remote_version > cache_version or remote_version == 0)) \
-                        or remote_checksum != cache_checksum:
+                cache_checksum: Optional[str] = cached_game.get("checksum")
+
+                # Download the remote version, if our cache doesn't contain the same data package.
+                if not remote_checksum or remote_checksum != cache_checksum:
                     needed_updates.add(game)
                 else:
-                    self.update_game(cached_game)
+                    self.update_game_package(game, cached_game)
+
         if needed_updates:
             await self.send_msgs([{"cmd": "GetDataPackage", "games": list(needed_updates)}])
 
-    def update_game(self, game_package: dict):
-        for item_name, item_id in game_package["item_name_to_id"].items():
-            self.item_names[item_id] = item_name
-        for location_name, location_id in game_package["location_name_to_id"].items():
-            self.location_names[location_id] = location_name
+    def update_game_package(self, game: str, game_package: GamePackage):
+        self.item_names[game] = {name: id for name, id in game_package["item_name_to_id"].items()}
+        self.location_names[game] = {name: id for name, id in game_package["location_name_to_id"].items()}
 
-    def update_data_package(self, data_package: dict):
-        for game, game_data in data_package["games"].items():
-            self.update_game(game_data)
+    def update_data_package(self, data_package: DataPackage):
+        for game, game_package in data_package["games"].items():
+            self.item_names.setdefault(game, {})
+            self.location_names.setdefault(game, {})
+            self.update_game_package(game, game_package)
 
-    def consume_network_data_package(self, data_package: dict):
+    def consume_network_data_package(self, data_package: DataPackage):
         self.update_data_package(data_package)
         current_cache = Utils.persistent_load().get("datapackage", {}).get("games", {})
         current_cache.update(data_package["games"])
@@ -497,7 +494,7 @@ def set_notify(self, *keys: str) -> None:
 
     # DeathLink hooks
 
-    def on_deathlink(self, data: typing.Dict[str, typing.Any]) -> None:
+    def on_deathlink(self, data: Dict[str, Any]) -> None:
         """Gets dispatched when a new DeathLink is triggered by another linked player."""
         self.last_death_link = max(data["time"], self.last_death_link)
         text = data.get("cause", "")
@@ -528,7 +525,7 @@ async def update_death_link(self, death_link: bool):
         if old_tags != self.tags and self.server and not self.server.socket.closed:
             await self.send_msgs([{"cmd": "ConnectUpdate", "tags": self.tags}])
 
-    def gui_error(self, title: str, text: typing.Union[Exception, str]) -> typing.Optional["kvui.MessageBox"]:
+    def gui_error(self, title: str, text: Union[Exception, str]) -> Optional["kvui.MessageBox"]:
         """Displays an error messagebox"""
         if not self.ui:
             return None
@@ -591,7 +588,7 @@ async def keep_alive(ctx: CommonContext, seconds_between_checks=100):
                 seconds_elapsed = 0
 
 
-async def server_loop(ctx: CommonContext, address: typing.Optional[str] = None) -> None:
+async def server_loop(ctx: CommonContext, address: Optional[str] = None) -> None:
     if ctx.server and ctx.server.socket:
         logger.error('Already connected')
         return
@@ -869,7 +866,7 @@ async def console_loop(ctx: CommonContext):
             logger.exception(e)
 
 
-def get_base_parser(description: typing.Optional[str] = None):
+def get_base_parser(description: Optional[str] = None):
     import argparse
     parser = argparse.ArgumentParser(description=description)
     parser.add_argument('--connect', default=None, help='Address of the multiworld host.')
diff --git a/MultiServer.py b/MultiServer.py
index 8be8d641324a..ebbe552e5be8 100644
--- a/MultiServer.py
+++ b/MultiServer.py
@@ -2,8 +2,8 @@
 
 import argparse
 import asyncio
-import copy
 import collections
+import copy
 import datetime
 import functools
 import hashlib
@@ -40,7 +40,7 @@
 from NetUtils import Endpoint, ClientStatus, NetworkItem, decode, encode, NetworkPlayer, Permission, NetworkSlot, \
     SlotType, LocationStore
 
-min_client_version = Version(0, 1, 6)
+min_client_version = Version(0, 4, 4)
 colorama.init()
 
 
@@ -747,30 +747,25 @@ async def on_client_connected(ctx: Context, client: Client):
         for slot, connected_clients in clients.items():
             if connected_clients:
                 name = ctx.player_names[team, slot]
-                players.append(
-                    NetworkPlayer(team, slot,
-                                  ctx.name_aliases.get((team, slot), name), name)
-                )
+                players.append(NetworkPlayer(team, slot, ctx.name_aliases.get((team, slot), name), name))
     games = {ctx.games[x] for x in range(1, len(ctx.games) + 1)}
     games.add("Archipelago")
     await ctx.send_msgs(client, [{
-        'cmd': 'RoomInfo',
-        'password': bool(ctx.password),
-        'games': games,
+        "cmd": "RoomInfo",
+        "password": bool(ctx.password),
+        "games": games,
         # tags are for additional features in the communication.
         # Name them by feature or fork, as you feel is appropriate.
-        'tags': ctx.tags,
-        'version': version_tuple,
-        'generator_version': ctx.generator_version,
-        'permissions': get_permissions(ctx),
-        'hint_cost': ctx.hint_cost,
-        'location_check_points': ctx.location_check_points,
-        'datapackage_versions': {game: game_data["version"] for game, game_data
-                                 in ctx.gamespackage.items() if game in games},
+        "tags": ctx.tags,
+        "version": version_tuple,
+        "generator_version": ctx.generator_version,
+        "permissions": get_permissions(ctx),
+        "hint_cost": ctx.hint_cost,
+        "location_check_points": ctx.location_check_points,
         'datapackage_checksums': {game: game_data["checksum"] for game, game_data
                                   in ctx.gamespackage.items() if game in games and "checksum" in game_data},
-        'seed_name': ctx.seed_name,
-        'time': time.time(),
+        "seed_name": ctx.seed_name,
+        "time": time.time(),
     }])
 
 
diff --git a/Utils.py b/Utils.py
index 114c2e81035a..500621d8d6fb 100644
--- a/Utils.py
+++ b/Utils.py
@@ -47,7 +47,7 @@ def as_simple_string(self) -> str:
         return ".".join(str(item) for item in self)
 
 
-__version__ = "0.4.3"
+__version__ = "0.4.4"
 version_tuple = tuplize_version(__version__)
 
 is_linux = sys.platform.startswith("linux")
diff --git a/WebHostLib/api/__init__.py b/WebHostLib/api/__init__.py
index 102c3a49f6aa..fd748f582278 100644
--- a/WebHostLib/api/__init__.py
+++ b/WebHostLib/api/__init__.py
@@ -37,15 +37,6 @@ def get_datapackage():
     return network_data_package
 
 
-@api_endpoints.route('/datapackage_version')
-@cache.cached()
-def get_datapackage_versions():
-    from worlds import AutoWorldRegister
-
-    version_package = {game: world.data_version for game, world in AutoWorldRegister.world_types.items()}
-    return version_package
-
-
 @api_endpoints.route('/datapackage_checksum')
 @cache.cached()
 def get_datapackage_checksums():
diff --git a/WebHostLib/templates/generic-tracker.html b/WebHostLib/templates/generic-tracker.html
new file mode 100644
index 000000000000..008433dca3f3
--- /dev/null
+++ b/WebHostLib/templates/generic-tracker.html
@@ -0,0 +1,67 @@
+{% extends "tablepage.html" %}
+{% block head %}
+    {{ super() }}
+    <title>{{ player_name }}&apos;s Tracker</title>
+    <link rel="stylesheet" type="text/css" href="{{ url_for("static", filename="styles/tracker.css") }}"/>
+    <script type="application/ecmascript" src="{{ url_for("static", filename="assets/jquery.scrollsync.js") }}"></script>
+    <script type="application/ecmascript" src="{{ url_for("static", filename="assets/trackerCommon.js") }}"></script>
+{% endblock %}
+
+{% block body %}
+    {% include "header/dirtHeader.html" %}
+    <div id="tracker-wrapper" data-tracker="{{ room.tracker | suuid }}/{{ team }}/{{ player }}" data-second="{{ saving_second }}">
+        <div id="tracker-header-bar">
+            <input placeholder="Search" id="search" />
+            <span class="info">This tracker will automatically update itself periodically.</span>
+        </div>
+        <div class="table-wrapper">
+            <table id="received-table" class="table non-unique-item-table">
+                <thead>
+                    <tr>
+                        <th>Item</th>
+                        <th>Amount</th>
+                        <th>Order Received</th>
+                    </tr>
+                </thead>
+                <tbody>
+
+                {% for id, count in inventory.items() %}
+                    <tr>
+                        <td>{{ item_name[id] }}</td>
+                        <td>{{ count }}</td>
+                        <td>{{ received_items[id] }}</td>
+                    </tr>
+                {%- endfor -%}
+
+                </tbody>
+            </table>
+        </div>
+        <div class="table-wrapper">
+            <table id="locations-table" class="table non-unique-item-table">
+                <thead>
+                    <tr>
+                        <th>Location</th>
+                        <th>Checked</th>
+                    </tr>
+                </thead>
+                <tbody>
+
+                {% for id in checked_locations %}
+                    <tr>
+                        <td>{{ location_name[id] }}</td>
+                        <td>✔</td>
+                    </tr>
+                {%- endfor -%}
+
+                {% for id in not_checked_locations %}
+                    <tr>
+                        <td>{{ location_name[id] }}</td>
+                        <td></td>
+                    </tr>
+                {%- endfor -%}
+
+                </tbody>
+            </table>
+        </div>
+    </div>
+{% endblock %}
diff --git a/WebHostLib/templates/genericTracker.html b/WebHostLib/templates/genericTracker.html
deleted file mode 100644
index 1c2fcd44c0dd..000000000000
--- a/WebHostLib/templates/genericTracker.html
+++ /dev/null
@@ -1,65 +0,0 @@
-{% extends 'tablepage.html' %}
-{% block head %}
-    {{ super() }}
-    <title>{{ player_name }}&apos;s Tracker</title>
-    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename="styles/tracker.css") }}"/>
-    <script type="application/ecmascript" src="{{ url_for('static', filename="assets/jquery.scrollsync.js") }}"></script>
-    <script type="application/ecmascript" src="{{ url_for('static', filename="assets/trackerCommon.js") }}"></script>
-{% endblock %}
-
-{% block body %}
-    {% include 'header/dirtHeader.html' %}
-    <div id="tracker-wrapper" data-tracker="{{ room.tracker|suuid }}/{{ team }}/{{ player }}" data-second="{{ saving_second }}">
-        <div id="tracker-header-bar">
-            <input placeholder="Search" id="search"/>
-            <span class="info">This tracker will automatically update itself periodically.</span>
-        </div>
-            <div class="table-wrapper">
-                <table id="received-table" class="table non-unique-item-table">
-                    <thead>
-                        <tr>
-                            <th>Item</th>
-                            <th>Amount</th>
-                            <th>Order Received</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-
-                    {% for id, count in inventory.items() %}
-                    <tr>
-                        <td>{{ id | item_name }}</td>
-                        <td>{{ count }}</td>
-                        <td>{{received_items[id]}}</td>
-                    </tr>
-                    {%- endfor -%}
-
-                    </tbody>
-                </table>
-            </div>
-            <div class="table-wrapper">
-                <table id="locations-table" class="table non-unique-item-table">
-                    <thead>
-                    <tr>
-                        <th>Location</th>
-                        <th>Checked</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                        {% for name in checked_locations %}
-                        <tr>
-                            <td>{{ name | location_name}}</td>
-                            <td>✔</td>
-                        </tr>
-                        {%- endfor -%}
-                        {% for name in not_checked_locations %}
-                        <tr>
-                            <td>{{ name | location_name}}</td>
-                            <td></td>
-                        </tr>
-                        {%- endfor -%}
-                    </tbody>
-                </table>
-            </div>
-        </div>
-    </div>
-{% endblock %}
diff --git a/WebHostLib/templates/hintTable.html b/WebHostLib/templates/hintTable.html
deleted file mode 100644
index 00b74111ea51..000000000000
--- a/WebHostLib/templates/hintTable.html
+++ /dev/null
@@ -1,28 +0,0 @@
-{% for team, hints in hints.items() %}
-    <div class="table-wrapper">
-        <table id="hints-table" class="table non-unique-item-table" data-order='[[5, "asc"], [0, "asc"]]'>
-            <thead>
-            <tr>
-                <th>Finder</th>
-                <th>Receiver</th>
-                <th>Item</th>
-                <th>Location</th>
-                <th>Entrance</th>
-                <th>Found</th>
-            </tr>
-            </thead>
-            <tbody>
-            {%- for hint in hints -%}
-                <tr>
-                    <td>{{ long_player_names[team, hint.finding_player] }}</td>
-                    <td>{{ long_player_names[team, hint.receiving_player] }}</td>
-                    <td>{{ hint.item|item_name }}</td>
-                    <td>{{ hint.location|location_name }}</td>
-                    <td>{% if hint.entrance %}{{ hint.entrance }}{% else %}Vanilla{% endif %}</td>
-                    <td>{% if hint.found %}✔{% endif %}</td>
-                </tr>
-            {%- endfor -%}
-            </tbody>
-        </table>
-    </div>
-{% endfor %}
\ No newline at end of file
diff --git a/WebHostLib/templates/hostRoom.html b/WebHostLib/templates/hostRoom.html
index ba15d64acac1..3b674c14f913 100644
--- a/WebHostLib/templates/hostRoom.html
+++ b/WebHostLib/templates/hostRoom.html
@@ -14,7 +14,7 @@
             <br />
         {% endif %}
         {% if room.tracker %}
-            This room has a <a href="{{ url_for("get_multiworld_tracker", tracker=room.tracker) }}">Multiworld Tracker</a> enabled.
+            This room has a <a href="{{ url_for("render_generic_multiworld_tracker", tracker=room.tracker) }}">Multiworld Tracker</a> enabled.
             <br />
         {% endif %}
         The server for this room will be paused after {{ room.timeout//60//60 }} hours of inactivity.
diff --git a/WebHostLib/templates/lttpMultiTracker.html b/WebHostLib/templates/lttpMultiTracker.html
deleted file mode 100644
index 8eb471be390d..000000000000
--- a/WebHostLib/templates/lttpMultiTracker.html
+++ /dev/null
@@ -1,171 +0,0 @@
-{% extends 'tablepage.html' %}
-{% block head %}
-    {{ super() }}
-    <title>ALttP Multiworld Tracker</title>
-    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename="styles/tracker.css") }}"/>
-    <script type="application/ecmascript" src="{{ url_for('static', filename="assets/jquery.scrollsync.js") }}"></script>
-    <script type="application/ecmascript" src="{{ url_for('static', filename="assets/lttpMultiTracker.js") }}"></script>
-    <script type="application/ecmascript" src="{{ url_for('static', filename="assets/trackerCommon.js") }}"></script>
-{% endblock %}
-
-{% block body %}
-    {% include 'header/dirtHeader.html' %}
-    {% include 'multiTrackerNavigation.html' %}
-    <div id="tracker-wrapper" data-tracker="{{ room.tracker|suuid }}">
-        <div id="tracker-header-bar">
-            <input placeholder="Search" id="search"/>
-            <span{% if not video %} hidden{% endif %} id="multi-stream-link">
-                <a target="_blank" href="https://multistream.me/
-                    {%- for platform, link in video.values()|unique(False, 1)-%}
-                        {%- if platform == "Twitch" -%}t{%- else -%}yt{%- endif -%}:{{- link -}}/
-                    {%- endfor -%}">
-                    Multistream
-                </a>
-            </span>
-            <span class="info">Clicking on a slot's number will bring up a slot-specific auto-tracker. This tracker will automatically update itself periodically.</span>
-        </div>
-        <div id="tables-container">
-            {% for team, players in inventory.items() %}
-                <div class="table-wrapper">
-                    <table id="inventory-table" class="table unique-item-table">
-                        <thead>
-                        <tr>
-                            <th>#</th>
-                            <th>Name</th>
-                            {%- for name in tracking_names -%}
-                                {%- if name in icons -%}
-                                    <th class="center-column">
-                                            <img class="alttp-sprite" src="{{ icons[name] }}" alt="{{ name|e }}">
-                                        </th>
-                                {%- else -%}
-                                    <th class="center-column">{{ name|e }}</th>
-                                {%- endif -%}
-                            {%- endfor -%}
-                            </tr>
-                        </thead>
-                        <tbody>
-                            {%- for player, items in players.items() -%}
-                                <tr>
-                                    <td><a href="{{ url_for("get_player_tracker", tracker=room.tracker,
-                                    tracked_team=team, tracked_player=player)}}">{{ loop.index }}</a></td>
-                                    {%- if (team, loop.index) in video -%}
-                                        {%- if video[(team, loop.index)][0] == "Twitch" -%}
-                                        <td>
-                                            <a target="_blank" href="https://www.twitch.tv/{{ video[(team, loop.index)][1] }}">
-                                                {{ player_names[(team, loop.index)] }}
-                                                ▶️</a></td>
-                                        {%- elif video[(team, loop.index)][0] == "Youtube" -%}
-                                        <td>
-                                            <a target="_blank" href="youtube.com/c/{{ video[(team, loop.index)][1] }}/live">
-                                                {{ player_names[(team, loop.index)] }}
-                                                ▶️</a></td>
-                                        {%- endif -%}
-                                    {%- else -%}
-                                        <td>{{ player_names[(team, loop.index)] }}</td>
-                                    {%- endif -%}
-                                    {%- for id in tracking_ids -%}
-                                        {%- if items[id] -%}
-                                            <td class="center-column item-acquired">
-                                                {% if id in multi_items %}{{ items[id] }}{% else %}✔️{% endif %}</td>
-                                        {%- else -%}
-                                            <td></td>
-                                        {%- endif -%}
-                                    {% endfor %}
-                                </tr>
-                            {%- endfor -%}
-                        </tbody>
-                    </table>
-                </div>
-            {% endfor %}
-
-            {% for team, players in checks_done.items() %}
-                <div class="table-wrapper">
-                    <table id="checks-table" class="table non-unique-item-table">
-                        <thead>
-                            <tr>
-                                <th rowspan="2">#</th>
-                                <th rowspan="2">Name</th>
-                                {% for area in ordered_areas %}
-                                    {% set colspan = 1 %}
-                                    {% if area in key_locations %}
-                                    {% set colspan = colspan + 1 %}
-                                    {% endif %}
-                                    {% if area in big_key_locations %}
-                                    {% set colspan = colspan + 1 %}
-                                    {% endif %}
-                                    {% if area in icons %}
-                                        <th colspan="{{ colspan }}" class="center-column upper-row">
-                                            <img class="alttp-sprite" src="{{ icons[area] }}" alt="{{ area }}"></th>
-                                    {%- else -%}
-                                        <th colspan="{{ colspan }}" class="center-column">{{ area }}</th>
-                                    {%- endif -%}
-                                {%- endfor -%}
-                                <th rowspan="2" class="center-column">&percnt;</th>
-                                <th rowspan="2" class="center-column hours">Last<br>Activity</th>
-                            </tr>
-                            <tr>
-                                {% for area in ordered_areas %}
-                                    <th class="center-column lower-row fraction">
-                                        <img class="alttp-sprite" src="{{ icons["Chest"] }}" alt="Checks">
-                                    </th>
-                                    {% if area in key_locations %}
-                                        <th class="center-column lower-row number">
-                                            <img class="alttp-sprite" src="{{ icons["Small Key"] }}" alt="Small Key">
-                                        </th>
-                                    {% endif %}
-                                    {% if area in big_key_locations %}
-                                        <th class="center-column lower-row number">
-                                            <img class="alttp-sprite" src="{{ icons["Big Key"] }}" alt="Big Key">
-                                        </th>
-                                    {%- endif -%}
-                                {%- endfor -%}
-                            </tr>
-                        </thead>
-                        <tbody>
-                            {%- for player, checks in players.items() -%}
-                                <tr>
-                                    <td><a href="{{ url_for("get_player_tracker", tracker=room.tracker,
-                                    tracked_team=team, tracked_player=player)}}">{{ loop.index }}</a></td>
-                                    <td>{{ player_names[(team, loop.index)]|e }}</td>
-                                    {%- for area in ordered_areas -%}
-                                        {% if player in checks_in_area and area in checks_in_area[player] %}
-                                            {%- set checks_done = checks[area] -%}
-                                            {%- set checks_total = checks_in_area[player][area] -%}
-                                            {%- if checks_done == checks_total -%}
-                                                <td class="item-acquired center-column">
-                                                    {{ checks_done }}/{{ checks_total }}</td>
-                                            {%- else -%}
-                                                <td class="center-column">{{ checks_done }}/{{ checks_total }}</td>
-                                            {%- endif -%}
-                                            {%- if area in key_locations -%}
-                                                <td class="center-column">{{ inventory[team][player][small_key_ids[area]] }}</td>
-                                            {%- endif -%}
-                                            {%- if area in big_key_locations -%}
-                                                <td class="center-column">{% if inventory[team][player][big_key_ids[area]] %}✔️{% endif %}</td>
-                                            {%- endif -%}
-                                        {% else %}
-                                            <td class="center-column"></td>
-                                            {%- if area in key_locations -%}
-                                                <td class="center-column"></td>
-                                            {%- endif -%}
-                                            {%- if area in big_key_locations -%}
-                                                <td class="center-column"></td>
-                                            {%- endif -%}
-                                        {% endif %}
-                                    {%- endfor -%}
-                                    <td class="center-column">{{ "{0:.2f}".format(percent_total_checks_done[team][player]) }}</td>
-                                    {%- if activity_timers[(team, player)] -%}
-                                        <td class="center-column">{{ activity_timers[(team, player)].total_seconds() }}</td>
-                                    {%- else -%}
-                                        <td class="center-column">None</td>
-                                    {%- endif -%}
-                                </tr>
-                            {%- endfor -%}
-                        </tbody>
-                    </table>
-                </div>
-            {% endfor %}
-            {% include "hintTable.html" with context %}
-        </div>
-    </div>
-{% endblock %}
diff --git a/WebHostLib/templates/multiTracker.html b/WebHostLib/templates/multiTracker.html
deleted file mode 100644
index 1a3d353de11a..000000000000
--- a/WebHostLib/templates/multiTracker.html
+++ /dev/null
@@ -1,92 +0,0 @@
-{% extends 'tablepage.html' %}
-{% block head %}
-    {{ super() }}
-    <title>Multiworld Tracker</title>
-    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename="styles/tracker.css") }}"/>
-    <script type="application/ecmascript" src="{{ url_for('static', filename="assets/trackerCommon.js") }}"></script>
-{% endblock %}
-
-{% block body %}
-    {% include 'header/dirtHeader.html' %}
-    {% include 'multiTrackerNavigation.html' %}
-    <div id="tracker-wrapper" data-tracker="{{ room.tracker|suuid }}">
-        <div id="tracker-header-bar">
-            <input placeholder="Search" id="search"/>
-            <span{% if not video %} hidden{% endif %} id="multi-stream-link">
-                <a target="_blank" href="https://multistream.me/
-                    {%- for platform, link in video.values()|unique(False, 1)-%}
-                        {%- if platform == "Twitch" -%}t{%- else -%}yt{%- endif -%}:{{- link -}}/
-                    {%- endfor -%}">
-                    Multistream
-                </a>
-            </span>
-            <span class="info">Clicking on a slot's number will bring up a slot-specific auto-tracker. This tracker will automatically update itself periodically.</span>
-        </div>
-        <div id="tables-container">
-            {% for team, players in checks_done.items() %}
-                <div class="table-wrapper">
-                    <table id="checks-table" class="table non-unique-item-table">
-                        <thead>
-                            <tr>
-                                <th>#</th>
-                                <th>Name</th>
-                                <th>Game</th>
-                                <th>Status</th>
-                                {% block custom_table_headers %}
-                                {# implement this block in game-specific multi trackers #}
-                                {% endblock %}
-                                <th class="center-column">Checks</th>
-                                <th class="center-column">&percnt;</th>
-                                <th class="center-column hours last-activity">Last<br>Activity</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            {%- for player, checks in players.items() -%}
-                                <tr>
-                                    <td><a href="{{ url_for("get_player_tracker", tracker=room.tracker,
-                                    tracked_team=team, tracked_player=player)}}">{{ loop.index }}</a></td>
-                                    <td>{{ player_names[(team, loop.index)]|e }}</td>
-                                    <td>{{ games[player] }}</td>
-                                    <td>{{ {0: "Disconnected", 5: "Connected", 10: "Ready", 20: "Playing",
-                                            30: "Goal Completed"}.get(states[team, player], "Unknown State") }}</td>
-                                    {% block custom_table_row scoped %}
-                                    {# implement this block in game-specific multi trackers #}
-                                    {% endblock %}
-                                    <td class="center-column" data-sort="{{ checks["Total"] }}">
-                                      {{ checks["Total"] }}/{{ locations[player] | length }}
-                                    </td>
-                                    <td class="center-column">{{ "{0:.2f}".format(percent_total_checks_done[team][player]) }}</td>
-                                    {%- if activity_timers[team, player] -%}
-                                        <td class="center-column">{{ activity_timers[team, player].total_seconds() }}</td>
-                                    {%- else -%}
-                                        <td class="center-column">None</td>
-                                    {%- endif -%}
-                                </tr>
-                            {%- endfor -%}
-                        </tbody>
-                        {% if not self.custom_table_headers() | trim %}
-                            <tfoot>
-                                <tr>
-                                    <td></td>
-                                    <td>Total</td>
-                                    <td>All Games</td>
-                                    <td>{{ completed_worlds }}/{{ players|length }} Complete</td>
-                                    <td class="center-column">{{ players.values()|sum(attribute='Total') }}/{{ total_locations[team] }}</td>
-                                    <td class="center-column">
-                                        {% if total_locations[team] == 0 %}
-                                            100
-                                        {% else %}
-                                            {{ "{0:.2f}".format(players.values()|sum(attribute='Total') / total_locations[team] * 100) }}
-                                        {% endif %}
-                                    </td>
-                                    <td class="center-column last-activity"></td>
-                                </tr>
-                            </tfoot>
-                        {% endif %}
-                    </table>
-                </div>
-            {% endfor %}
-            {% include "hintTable.html" with context %}
-        </div>
-    </div>
-{% endblock %}
diff --git a/WebHostLib/templates/multitracker-hint-table.html b/WebHostLib/templates/multitracker-hint-table.html
new file mode 100644
index 000000000000..99fcbe442163
--- /dev/null
+++ b/WebHostLib/templates/multitracker-hint-table.html
@@ -0,0 +1,35 @@
+{% for team, hints in hints.items() %}
+    <div class="table-wrapper">
+        <table id="hints-table" class="table non-unique-item-table" data-order='[[5, "asc"], [0, "asc"]]'>
+            <thead>
+            <tr>
+                <th>Finder</th>
+                <th>Receiver</th>
+                <th>Item</th>
+                <th>Location</th>
+                <th>Entrance</th>
+                <th>Found</th>
+            </tr>
+            </thead>
+            <tbody>
+            {%- for hint in hints -%}
+                {%-
+                    if current_tracker == "Generic" or (
+                        room_data.games[hint.finding_player] == current_tracker or
+                        room_data.games[hint.receiving_player] == current_tracker
+                    )
+                -%}
+                    <tr>
+                        <td>{{ player_names_with_alias[(team, hint.finding_player)] }}</td>
+                        <td>{{ player_names_with_alias[(team, hint.receiving_player)] }}</td>
+                        <td>{{ room_data.item_id_to_name[room_data.games[hint.receiving_player]][hint.item] }}</td>
+                        <td>{{ room_data.location_id_to_name[room_data.games[hint.finding_player]][hint.location] }}</td>
+                        <td>{% if hint.entrance %}{{ hint.entrance }}{% else %}Vanilla{% endif %}</td>
+                        <td>{% if hint.found %}✔{% endif %}</td>
+                    </tr>
+                {% endif %}
+            {%- endfor -%}
+            </tbody>
+        </table>
+    </div>
+{% endfor %}
diff --git a/WebHostLib/templates/multiTrackerNavigation.html b/WebHostLib/templates/multitracker-navigation.html
similarity index 80%
rename from WebHostLib/templates/multiTrackerNavigation.html
rename to WebHostLib/templates/multitracker-navigation.html
index 7fc405b6fbd2..14b41a4b23e3 100644
--- a/WebHostLib/templates/multiTrackerNavigation.html
+++ b/WebHostLib/templates/multitracker-navigation.html
@@ -1,7 +1,7 @@
-{%- if enabled_multiworld_trackers|length > 1 -%}
+{%- if enabled_multiworld_trackers | length > 1 -%}
     <div id="tracker-navigation">
         {% for enabled_tracker in enabled_multiworld_trackers %}
-            {% set tracker_url = url_for(enabled_tracker.endpoint, tracker=room.tracker) %}
+            {% set tracker_url = url_for(enabled_tracker.endpoint, tracker=room_data.room.tracker) %}
             <a class="tracker-navigation-button{% if enabled_tracker.current %} selected{% endif %}"
                href="{{ tracker_url }}">{{ enabled_tracker.name }}</a>
         {% endfor %}
diff --git a/WebHostLib/templates/multitracker.html b/WebHostLib/templates/multitracker.html
new file mode 100644
index 000000000000..4e99e9b1d52f
--- /dev/null
+++ b/WebHostLib/templates/multitracker.html
@@ -0,0 +1,112 @@
+{% extends "tablepage.html" %}
+{% block head %}
+    {{ super() }}
+    <title>Multiworld Tracker</title>
+    <link rel="stylesheet" type="text/css" href="{{ url_for("static", filename="styles/tracker.css") }}" />
+    <script type="application/ecmascript" src="{{ url_for("static", filename="assets/trackerCommon.js") }}"></script>
+{% endblock %}
+
+{% block body %}
+    {% include "header/dirtHeader.html" %}
+    {% include "multitracker-navigation.html" %}
+
+    <div id="tracker-wrapper" data-tracker="{{ room_data.room.tracker | suuid }}">
+        <div id="tracker-header-bar">
+            <input placeholder="Search" id="search" />
+            <span {% if not videos %}hidden{% endif %} id="multi-stream-link">
+                <a target="_blank" href="https://multistream.me/
+                    {%- for platform, link in videos.values() | unique(False, 1) -%}
+                        {%- if platform == "Twitch" -%}t{%- else -%}yt{%- endif -%}:{{- link -}}/
+                    {%- endfor -%}">
+                    Multistream
+                </a>
+            </span>
+            <span class="info">Clicking on a slot&apos;s number will bring up the slot-specific tracker. This tracker will automatically update itself periodically.</span>
+        </div>
+        <div id="tables-container">
+            {% for team, players in locations_complete.items() %}
+                <div class="table-wrapper">
+                    <table id="checks-table" class="table non-unique-item-table">
+                        <thead>
+                            <tr>
+                                <th>#</th>
+                                <th>Name</th>
+                                {% if current_tracker == "Generic" %}<th>Game</th>{% endif %}
+                                <th>Status</th>
+                                {% block custom_table_headers %}
+                                {# Implement this block in game-specific multi-trackers. #}
+                                {% endblock %}
+                                <th class="center-column">Checks</th>
+                                <th class="center-column">&percnt;</th>
+                                <th class="center-column hours last-activity">Last<br>Activity</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            {%- for player, checks in players.items() -%}
+                                {%- if current_tracker == "Generic" or room_data.games[player] == current_tracker -%}
+                                    <tr>
+                                        <td>
+                                            <a href="{{ url_for("get_player_tracker", tracker=room_data.room.tracker, tracked_team=team, tracked_player=player) }}">
+                                                {{ loop.index }}
+                                            </a>
+                                        </td>
+                                        <td>{{ player_names_with_alias[(team, loop.index)] | e }}</td>
+                                        {%- if current_tracker == "Generic" -%}
+                                        <td>{{ room_data.games[player] }}</td>
+                                        {%- endif -%}
+                                        <td>
+                                            {{ {
+                                                0: "Disconnected",
+                                                5: "Connected",
+                                                10: "Ready",
+                                                20: "Playing",
+                                                30: "Goal Completed"
+                                            }.get(states[(team, player)], "Unknown State") }}
+                                        </td>
+                                        {% block custom_table_row scoped %}
+                                        {# Implement this block in game-specific multi-trackers. #}
+                                        {% endblock %}
+                                        <td class="center-column" data-sort="{{ checks }}">
+                                          {{ checks }}/{{ room_data.locations[player] | length }}
+                                        </td>
+                                        <td class="center-column">{{ "{0:.2f}".format(percentage_of_locations_complete[team][player]) }}</td>
+                                        {%- if activity_timers[(team, player)] -%}
+                                            <td class="center-column">{{ activity_timers[(team, player)].total_seconds() }}</td>
+                                        {%- else -%}
+                                            <td class="center-column">None</td>
+                                        {%- endif -%}
+                                    </tr>
+                                {%- endif -%}
+                            {%- endfor -%}
+                        </tbody>
+                        {% if not self.custom_table_headers() | trim %}
+                            <tfoot>
+                                <tr>
+                                    <td></td>
+                                    <td>Total</td>
+                                    <td>All Games</td>
+                                    <td>{{ completed_worlds }}/{{ players | length }} Complete</td>
+                                    <td class="center-column">{{ players.values() | sum }}/{{ total_team_locations[team] }}</td>
+                                    <td class="center-column">
+                                        {% if total_team_locations[team] == 0 %}
+                                            100
+                                        {% else %}
+                                            {{ "{0:.2f}".format(players.values() | sum / total_team_locations[team] * 100) }}
+                                        {% endif %}
+                                    </td>
+                                    <td class="center-column last-activity"></td>
+                                </tr>
+                            </tfoot>
+                        {% endif %}
+                    </table>
+                </div>
+            {% endfor %}
+
+            {% block custom_tables %}
+            {# Implement this block to create custom tables in game-specific multi-trackers. #}
+            {% endblock %}
+
+            {% include "multitracker-hint-table.html" with context %}
+        </div>
+    </div>
+{% endblock %}
diff --git a/WebHostLib/templates/multitracker__ALinkToThePast.html b/WebHostLib/templates/multitracker__ALinkToThePast.html
new file mode 100644
index 000000000000..48a6eb419865
--- /dev/null
+++ b/WebHostLib/templates/multitracker__ALinkToThePast.html
@@ -0,0 +1,195 @@
+{% extends "multitracker.html" %}
+{% block head %}
+    {{ super() }}
+    <script type="application/ecmascript" src="{{ url_for("static", filename="assets/jquery.scrollsync.js") }}"></script>
+    <script type="application/ecmascript" src="{{ url_for("static", filename="assets/lttpMultiTracker.js") }}"></script>
+{% endblock %}
+
+{# List all tracker-relevant icons. Format: (Name, Image URL) #}
+{%- set icons = {
+    "Blue Shield": "https://www.zeldadungeon.net/wiki/images/8/85/Fighters-Shield.png",
+    "Red Shield": "https://www.zeldadungeon.net/wiki/images/5/55/Fire-Shield.png",
+    "Mirror Shield": "https://www.zeldadungeon.net/wiki/images/8/84/Mirror-Shield.png",
+    "Fighter Sword": "https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/4/40/SFighterSword.png?width=1920",
+    "Master Sword": "https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/6/65/SMasterSword.png?width=1920",
+    "Tempered Sword": "https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/9/92/STemperedSword.png?width=1920",
+    "Golden Sword": "https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/2/28/SGoldenSword.png?width=1920",
+    "Bow": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/b/bc/ALttP_Bow_%26_Arrows_Sprite.png?version=5f85a70e6366bf473544ef93b274f74c",
+    "Silver Bow": "https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/6/65/Bow.png?width=1920",
+    "Green Mail": "https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/c/c9/SGreenTunic.png?width=1920",
+    "Blue Mail": "https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/9/98/SBlueTunic.png?width=1920",
+    "Red Mail": "https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/7/74/SRedTunic.png?width=1920",
+    "Power Glove": "https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/f/f5/SPowerGlove.png?width=1920",
+    "Titan Mitts": "https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/c/c1/STitanMitt.png?width=1920",
+    "Progressive Sword": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/c/cc/ALttP_Master_Sword_Sprite.png?version=55869db2a20e157cd3b5c8f556097725",
+    "Pegasus Boots": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/e/ed/ALttP_Pegasus_Shoes_Sprite.png?version=405f42f97240c9dcd2b71ffc4bebc7f9",
+    "Progressive Glove": "https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/c/c1/STitanMitt.png?width=1920",
+    "Flippers": "https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/4/4c/ZoraFlippers.png?width=1920",
+    "Moon Pearl": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/6/63/ALttP_Moon_Pearl_Sprite.png?version=d601542d5abcc3e006ee163254bea77e",
+    "Progressive Bow": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/b/bc/ALttP_Bow_%26_Arrows_Sprite.png?version=cfb7648b3714cccc80e2b17b2adf00ed",
+    "Blue Boomerang": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/c/c3/ALttP_Boomerang_Sprite.png?version=96127d163759395eb510b81a556d500e",
+    "Red Boomerang": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/b/b9/ALttP_Magical_Boomerang_Sprite.png?version=47cddce7a07bc3e4c2c10727b491f400",
+    "Hookshot": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/2/24/Hookshot.png?version=c90bc8e07a52e8090377bd6ef854c18b",
+    "Mushroom": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/3/35/ALttP_Mushroom_Sprite.png?version=1f1acb30d71bd96b60a3491e54bbfe59",
+    "Magic Powder": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/e/e5/ALttP_Magic_Powder_Sprite.png?version=c24e38effbd4f80496d35830ce8ff4ec",
+    "Fire Rod": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/d/d6/FireRod.png?version=6eabc9f24d25697e2c4cd43ddc8207c0",
+    "Ice Rod": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/d/d7/ALttP_Ice_Rod_Sprite.png?version=1f944148223d91cfc6a615c92286c3bc",
+    "Bombos": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/8/8c/ALttP_Bombos_Medallion_Sprite.png?version=f4d6aba47fb69375e090178f0fc33b26",
+    "Ether": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/3/3c/Ether.png?version=34027651a5565fcc5a83189178ab17b5",
+    "Quake": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/5/56/ALttP_Quake_Medallion_Sprite.png?version=efd64d451b1831bd59f7b7d6b61b5879",
+    "Lamp": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/6/63/ALttP_Lantern_Sprite.png?version=e76eaa1ec509c9a5efb2916698d5a4ce",
+    "Hammer": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/d/d1/ALttP_Hammer_Sprite.png?version=e0adec227193818dcaedf587eba34500",
+    "Shovel": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/c/c4/ALttP_Shovel_Sprite.png?version=e73d1ce0115c2c70eaca15b014bd6f05",
+    "Flute": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/d/db/Flute.png?version=ec4982b31c56da2c0c010905c5c60390",
+    "Bug Catching Net": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/5/54/Bug-CatchingNet.png?version=4d40e0ee015b687ff75b333b968d8be6",
+    "Book of Mudora": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/2/22/ALttP_Book_of_Mudora_Sprite.png?version=11e4632bba54f6b9bf921df06ac93744",
+    "Bottle": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/e/ef/ALttP_Magic_Bottle_Sprite.png?version=fd98ab04db775270cbe79fce0235777b",
+    "Cane of Somaria": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/e/e1/ALttP_Cane_of_Somaria_Sprite.png?version=8cc1900dfd887890badffc903bb87943",
+    "Cane of Byrna": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/b/bc/ALttP_Cane_of_Byrna_Sprite.png?version=758b607c8cbe2cf1900d42a0b3d0fb54",
+    "Cape": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/1/1c/ALttP_Magic_Cape_Sprite.png?version=6b77f0d609aab0c751307fc124736832",
+    "Magic Mirror": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/e/e5/ALttP_Magic_Mirror_Sprite.png?version=e035dbc9cbe2a3bd44aa6d047762b0cc",
+    "Triforce": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/4/4e/TriforceALttPTitle.png?version=dc398e1293177581c16303e4f9d12a48",
+    "Triforce Piece": "https://www.zeldadungeon.net/wiki/images/thumb/5/54/Triforce_Fragment_-_BS_Zelda.png/62px-Triforce_Fragment_-_BS_Zelda.png",
+    "Small Key": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/f/f1/ALttP_Small_Key_Sprite.png?version=4f35d92842f0de39d969181eea03774e",
+    "Big Key": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/3/33/ALttP_Big_Key_Sprite.png?version=136dfa418ba76c8b4e270f466fc12f4d",
+    "Chest": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/7/73/ALttP_Treasure_Chest_Sprite.png?version=5f530ecd98dcb22251e146e8049c0dda",
+    "Light World": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/e/e7/ALttP_Soldier_Green_Sprite.png?version=d650d417934cd707a47e496489c268a6",
+    "Dark World": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/9/94/ALttP_Moblin_Sprite.png?version=ebf50e33f4657c377d1606bcc0886ddc",
+    "Hyrule Castle": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/d/d3/ALttP_Ball_and_Chain_Trooper_Sprite.png?version=1768a87c06d29cc8e7ddd80b9fa516be",
+    "Agahnims Tower": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/1/1e/ALttP_Agahnim_Sprite.png?version=365956e61b0c2191eae4eddbe591dab5",
+    "Desert Palace": "https://www.zeldadungeon.net/wiki/images/2/25/Lanmola-ALTTP-Sprite.png",
+    "Eastern Palace": "https://www.zeldadungeon.net/wiki/images/d/dc/RedArmosKnight.png",
+    "Tower of Hera": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/3/3c/ALttP_Moldorm_Sprite.png?version=c588257bdc2543468e008a6b30f262a7",
+    "Palace of Darkness": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/e/ed/ALttP_Helmasaur_King_Sprite.png?version=ab8a4a1cfd91d4fc43466c56cba30022",
+    "Swamp Palace": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/7/73/ALttP_Arrghus_Sprite.png?version=b098be3122e53f751b74f4a5ef9184b5",
+    "Skull Woods": "https://alttp-wiki.net/images/6/6a/Mothula.png",
+    "Thieves Town": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/8/86/ALttP_Blind_the_Thief_Sprite.png?version=3833021bfcd112be54e7390679047222",
+    "Ice Palace": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/3/33/ALttP_Kholdstare_Sprite.png?version=e5a1b0e8b2298e550d85f90bf97045c0",
+    "Misery Mire": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/8/85/ALttP_Vitreous_Sprite.png?version=92b2e9cb0aa63f831760f08041d8d8d8",
+    "Turtle Rock": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/9/91/ALttP_Trinexx_Sprite.png?version=0cc867d513952aa03edd155597a0c0be",
+    "Ganons Tower": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/b/b9/ALttP_Ganon_Sprite.png?version=956f51f054954dfff53c1a9d4f929c74",
+} -%}
+
+{%- block custom_table_headers %}
+{#- macro that creates a table header with display name and image -#}
+{%- macro make_header(name, img_src) %}
+    <th class="center-column">
+        <img height="24" src="{{ img_src }}" title="{{ name }}" alt="{{ name }}" />
+    </th>
+{% endmacro -%}
+
+{#- call the macro to build the table header -#}
+{%- for name in tracking_names %}
+    {%- if name in icons -%}
+        <th class="center-column">
+            <img class="alttp-sprite" src="{{ icons[name] }}" alt="{{ name | e }}" title="{{ name | e }}" />
+        </th>
+    {%- endif %}
+{% endfor -%}
+{% endblock %}
+
+{# build each row of custom entries #}
+{% block custom_table_row scoped %}
+    {%- for id in tracking_ids -%}
+{#        {{ checks }}#}
+        {%- if inventory[team][player][id] -%}
+            <td class="center-column item-acquired">
+                {% if id in multi_items %}{{ inventory[team][player][id] }}{% else %}✔️{% endif %}
+            </td>
+        {%- else -%}
+            <td></td>
+        {%- endif -%}
+    {% endfor %}
+{% endblock %}
+
+{% block custom_tables %}
+
+{% for team, players in checks_done.items() %}
+<div class="table-wrapper">
+    <table id="checks-table" class="table non-unique-item-table">
+        <thead>
+            <tr>
+                <th rowspan="2">#</th>
+                <th rowspan="2">Name</th>
+                {% for area in ordered_areas %}
+                    {% set colspan = 1 %}
+                    {% if area in key_locations %}
+                    {% set colspan = colspan + 1 %}
+                    {% endif %}
+                    {% if area in big_key_locations %}
+                    {% set colspan = colspan + 1 %}
+                    {% endif %}
+                    {% if area in icons %}
+                        <th colspan="{{ colspan }}" class="center-column upper-row">
+                            <img class="alttp-sprite" src="{{ icons[area] }}" alt="{{ area }}" title="{{ area }}"></th>
+                    {%- else -%}
+                        <th colspan="{{ colspan }}" class="center-column">{{ area }}</th>
+                    {%- endif -%}
+                {%- endfor -%}
+                <th rowspan="2" class="center-column">&percnt;</th>
+                <th rowspan="2" class="center-column hours">Last<br>Activity</th>
+            </tr>
+            <tr>
+                {% for area in ordered_areas %}
+                    <th class="center-column lower-row fraction">
+                        <img class="alttp-sprite" src="{{ icons["Chest"] }}" alt="Checks" title="Checks Complete">
+                    </th>
+                    {% if area in key_locations %}
+                        <th class="center-column lower-row number">
+                            <img class="alttp-sprite" src="{{ icons["Small Key"] }}" alt="Small Key" title="Small Keys">
+                        </th>
+                    {% endif %}
+                    {% if area in big_key_locations %}
+                        <th class="center-column lower-row number">
+                            <img class="alttp-sprite" src="{{ icons["Big Key"] }}" alt="Big Key" title="Big Keys">
+                        </th>
+                    {%- endif -%}
+                {%- endfor -%}
+            </tr>
+        </thead>
+        <tbody>
+            {%- for player, checks in players.items() if room_data.games[player] == current_tracker -%}
+                <tr>
+                    <td><a href="{{ url_for("get_player_tracker", tracker=room_data.room.tracker,
+                    tracked_team=team, tracked_player=player)}}">{{ loop.index }}</a></td>
+                    <td>{{ player_names[(team, loop.index)]|e }}</td>
+                    {%- for area in ordered_areas -%}
+                        {% if player in checks_in_area and area in checks_in_area[player] %}
+                            {%- set checks_done = checks[area] -%}
+                            {%- set checks_total = checks_in_area[player][area] -%}
+                            {%- if checks_done == checks_total -%}
+                                <td class="item-acquired center-column">
+                                    {{ checks_done }}/{{ checks_total }}</td>
+                            {%- else -%}
+                                <td class="center-column">{{ checks_done }}/{{ checks_total }}</td>
+                            {%- endif -%}
+                            {%- if area in key_locations -%}
+                                <td class="center-column">{{ inventory[team][player][small_key_ids[area]] }}</td>
+                            {%- endif -%}
+                            {%- if area in big_key_locations -%}
+                                <td class="center-column">{% if inventory[team][player][big_key_ids[area]] %}✔️{% endif %}</td>
+                            {%- endif -%}
+                        {% else %}
+                            <td class="center-column"></td>
+                            {%- if area in key_locations -%}
+                                <td class="center-column"></td>
+                            {%- endif -%}
+                            {%- if area in big_key_locations -%}
+                                <td class="center-column"></td>
+                            {%- endif -%}
+                        {% endif %}
+                    {%- endfor -%}
+                    <td class="center-column">{{ "{0:.2f}".format(percentage_of_locations_complete[team][player]) }}</td>
+                    {%- if activity_timers[(team, player)] -%}
+                        <td class="center-column">{{ activity_timers[(team, player)].total_seconds() }}</td>
+                    {%- else -%}
+                        <td class="center-column">None</td>
+                    {%- endif -%}
+                </tr>
+            {%- endfor -%}
+        </tbody>
+    </table>
+</div>
+{% endfor %}
+
+{% endblock %}
diff --git a/WebHostLib/templates/multiFactorioTracker.html b/WebHostLib/templates/multitracker__Factorio.html
similarity index 82%
rename from WebHostLib/templates/multiFactorioTracker.html
rename to WebHostLib/templates/multitracker__Factorio.html
index 389a79d411b5..fa1e9e20c71d 100644
--- a/WebHostLib/templates/multiFactorioTracker.html
+++ b/WebHostLib/templates/multitracker__Factorio.html
@@ -1,4 +1,4 @@
-{% extends "multiTracker.html" %}
+{% extends "multitracker.html" %}
 {# establish the to be tracked data. Display Name, factorio/AP internal name, display image #}
 {%- set science_packs = [
     ("Logistic Science Pack", "logistic-science-pack",
@@ -14,12 +14,12 @@
     ("Space Science Pack", "space-science-pack",
     "https://wiki.factorio.com/images/thumb/Space_science_pack.png/32px-Space_science_pack.png"),
 ] -%}
+
 {%- block custom_table_headers %}
 {#- macro that creates a table header with display name and image -#}
 {%- macro make_header(name, img_src) %}
 <th class="center-column">
-    <img src="{{ img_src}}"
-         alt="{{ name }}">
+    <img src="{{ img_src }}" alt="{{ name }}" />
 </th>
 {% endmacro -%}
 {#- call the macro to build the table header -#}
@@ -27,16 +27,15 @@
     {{ make_header(name, img_src) }}
 {% endfor -%}
 {% endblock %}
+
 {% block custom_table_row scoped  %}
-{% if games[player] == "Factorio" %}
     {%- set player_inventory = named_inventory[team][player] -%}
     {%- set prog_science = player_inventory["progressive-science-pack"] -%}
     {%- for name, internal_name, img_src in science_packs %}
-        <td class="center-column">{% if player_inventory[internal_name] or prog_science > loop.index0 %}✔{% endif %}</td>
+        {% if player_inventory[internal_name] or prog_science > loop.index0 %}
+            <td class="center-column item-acquired">✔️</td>
+        {% else %}
+            <td class="center-column"></td>
+        {% endif %}
     {% endfor -%}
-{% else %}
-    {%- for _ in science_packs %}
-        <td class="center-column">❌</td>
-    {% endfor -%}
-{% endif %}
 {% endblock%}
diff --git a/WebHostLib/tracker.py b/WebHostLib/tracker.py
index 55b98df59e42..e3522af3f1b4 100644
--- a/WebHostLib/tracker.py
+++ b/WebHostLib/tracker.py
@@ -1,328 +1,123 @@
 import collections
 import datetime
-import typing
-from typing import Counter, Optional, Dict, Any, Tuple, List
+from typing import Any, Callable, Counter, Dict, List, NamedTuple, Optional, Set, Tuple, Union
 from uuid import UUID
 
 from flask import render_template
-from jinja2 import pass_context, runtime
 from werkzeug.exceptions import abort
 
 from MultiServer import Context, get_saving_second
-from NetUtils import ClientStatus, SlotType, NetworkSlot
+from NetUtils import ClientStatus, Hint, SlotType
 from Utils import restricted_loads
-from worlds import lookup_any_item_id_to_name, lookup_any_location_id_to_name, network_data_package, games
-from worlds.alttp import Items
+from worlds import network_data_package
 from . import app, cache
 from .models import GameDataPackage, Room
 
-alttp_icons = {
-    "Blue Shield": r"https://www.zeldadungeon.net/wiki/images/8/85/Fighters-Shield.png",
-    "Red Shield": r"https://www.zeldadungeon.net/wiki/images/5/55/Fire-Shield.png",
-    "Mirror Shield": r"https://www.zeldadungeon.net/wiki/images/8/84/Mirror-Shield.png",
-    "Fighter Sword": r"https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/4/40/SFighterSword.png?width=1920",
-    "Master Sword": r"https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/6/65/SMasterSword.png?width=1920",
-    "Tempered Sword": r"https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/9/92/STemperedSword.png?width=1920",
-    "Golden Sword": r"https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/2/28/SGoldenSword.png?width=1920",
-    "Bow": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/b/bc/ALttP_Bow_%26_Arrows_Sprite.png?version=5f85a70e6366bf473544ef93b274f74c",
-    "Silver Bow": r"https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/6/65/Bow.png?width=1920",
-    "Green Mail": r"https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/c/c9/SGreenTunic.png?width=1920",
-    "Blue Mail": r"https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/9/98/SBlueTunic.png?width=1920",
-    "Red Mail": r"https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/7/74/SRedTunic.png?width=1920",
-    "Power Glove": r"https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/f/f5/SPowerGlove.png?width=1920",
-    "Titan Mitts": r"https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/c/c1/STitanMitt.png?width=1920",
-    "Progressive Sword": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/c/cc/ALttP_Master_Sword_Sprite.png?version=55869db2a20e157cd3b5c8f556097725",
-    "Pegasus Boots": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/e/ed/ALttP_Pegasus_Shoes_Sprite.png?version=405f42f97240c9dcd2b71ffc4bebc7f9",
-    "Progressive Glove": r"https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/c/c1/STitanMitt.png?width=1920",
-    "Flippers": r"https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/4/4c/ZoraFlippers.png?width=1920",
-    "Moon Pearl": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/6/63/ALttP_Moon_Pearl_Sprite.png?version=d601542d5abcc3e006ee163254bea77e",
-    "Progressive Bow": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/b/bc/ALttP_Bow_%26_Arrows_Sprite.png?version=cfb7648b3714cccc80e2b17b2adf00ed",
-    "Blue Boomerang": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/c/c3/ALttP_Boomerang_Sprite.png?version=96127d163759395eb510b81a556d500e",
-    "Red Boomerang": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/b/b9/ALttP_Magical_Boomerang_Sprite.png?version=47cddce7a07bc3e4c2c10727b491f400",
-    "Hookshot": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/2/24/Hookshot.png?version=c90bc8e07a52e8090377bd6ef854c18b",
-    "Mushroom": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/3/35/ALttP_Mushroom_Sprite.png?version=1f1acb30d71bd96b60a3491e54bbfe59",
-    "Magic Powder": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/e/e5/ALttP_Magic_Powder_Sprite.png?version=c24e38effbd4f80496d35830ce8ff4ec",
-    "Fire Rod": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/d/d6/FireRod.png?version=6eabc9f24d25697e2c4cd43ddc8207c0",
-    "Ice Rod": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/d/d7/ALttP_Ice_Rod_Sprite.png?version=1f944148223d91cfc6a615c92286c3bc",
-    "Bombos": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/8/8c/ALttP_Bombos_Medallion_Sprite.png?version=f4d6aba47fb69375e090178f0fc33b26",
-    "Ether": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/3/3c/Ether.png?version=34027651a5565fcc5a83189178ab17b5",
-    "Quake": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/5/56/ALttP_Quake_Medallion_Sprite.png?version=efd64d451b1831bd59f7b7d6b61b5879",
-    "Lamp": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/6/63/ALttP_Lantern_Sprite.png?version=e76eaa1ec509c9a5efb2916698d5a4ce",
-    "Hammer": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/d/d1/ALttP_Hammer_Sprite.png?version=e0adec227193818dcaedf587eba34500",
-    "Shovel": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/c/c4/ALttP_Shovel_Sprite.png?version=e73d1ce0115c2c70eaca15b014bd6f05",
-    "Flute": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/d/db/Flute.png?version=ec4982b31c56da2c0c010905c5c60390",
-    "Bug Catching Net": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/5/54/Bug-CatchingNet.png?version=4d40e0ee015b687ff75b333b968d8be6",
-    "Book of Mudora": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/2/22/ALttP_Book_of_Mudora_Sprite.png?version=11e4632bba54f6b9bf921df06ac93744",
-    "Bottle": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/e/ef/ALttP_Magic_Bottle_Sprite.png?version=fd98ab04db775270cbe79fce0235777b",
-    "Cane of Somaria": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/e/e1/ALttP_Cane_of_Somaria_Sprite.png?version=8cc1900dfd887890badffc903bb87943",
-    "Cane of Byrna": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/b/bc/ALttP_Cane_of_Byrna_Sprite.png?version=758b607c8cbe2cf1900d42a0b3d0fb54",
-    "Cape": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/1/1c/ALttP_Magic_Cape_Sprite.png?version=6b77f0d609aab0c751307fc124736832",
-    "Magic Mirror": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/e/e5/ALttP_Magic_Mirror_Sprite.png?version=e035dbc9cbe2a3bd44aa6d047762b0cc",
-    "Triforce": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/4/4e/TriforceALttPTitle.png?version=dc398e1293177581c16303e4f9d12a48",
-    "Small Key": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/f/f1/ALttP_Small_Key_Sprite.png?version=4f35d92842f0de39d969181eea03774e",
-    "Big Key": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/3/33/ALttP_Big_Key_Sprite.png?version=136dfa418ba76c8b4e270f466fc12f4d",
-    "Chest": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/7/73/ALttP_Treasure_Chest_Sprite.png?version=5f530ecd98dcb22251e146e8049c0dda",
-    "Light World": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/e/e7/ALttP_Soldier_Green_Sprite.png?version=d650d417934cd707a47e496489c268a6",
-    "Dark World": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/9/94/ALttP_Moblin_Sprite.png?version=ebf50e33f4657c377d1606bcc0886ddc",
-    "Hyrule Castle": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/d/d3/ALttP_Ball_and_Chain_Trooper_Sprite.png?version=1768a87c06d29cc8e7ddd80b9fa516be",
-    "Agahnims Tower": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/1/1e/ALttP_Agahnim_Sprite.png?version=365956e61b0c2191eae4eddbe591dab5",
-    "Desert Palace": r"https://www.zeldadungeon.net/wiki/images/2/25/Lanmola-ALTTP-Sprite.png",
-    "Eastern Palace": r"https://www.zeldadungeon.net/wiki/images/d/dc/RedArmosKnight.png",
-    "Tower of Hera": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/3/3c/ALttP_Moldorm_Sprite.png?version=c588257bdc2543468e008a6b30f262a7",
-    "Palace of Darkness": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/e/ed/ALttP_Helmasaur_King_Sprite.png?version=ab8a4a1cfd91d4fc43466c56cba30022",
-    "Swamp Palace": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/7/73/ALttP_Arrghus_Sprite.png?version=b098be3122e53f751b74f4a5ef9184b5",
-    "Skull Woods": r"https://alttp-wiki.net/images/6/6a/Mothula.png",
-    "Thieves Town": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/8/86/ALttP_Blind_the_Thief_Sprite.png?version=3833021bfcd112be54e7390679047222",
-    "Ice Palace": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/3/33/ALttP_Kholdstare_Sprite.png?version=e5a1b0e8b2298e550d85f90bf97045c0",
-    "Misery Mire": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/8/85/ALttP_Vitreous_Sprite.png?version=92b2e9cb0aa63f831760f08041d8d8d8",
-    "Turtle Rock": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/9/91/ALttP_Trinexx_Sprite.png?version=0cc867d513952aa03edd155597a0c0be",
-    "Ganons Tower": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/b/b9/ALttP_Ganon_Sprite.png?version=956f51f054954dfff53c1a9d4f929c74"
+# Multisave is currently updated, at most, every minute.
+TRACKER_CACHE_TIMEOUT_IN_SECONDS = 60
+
+multidata_cache = {}
+multiworld_trackers: Dict[str, Callable] = {}
+game_specific_trackers: Dict[str, Callable] = {
+    # "Minecraft": __renderMinecraftTracker,
+    # "Ocarina of Time": __renderOoTTracker,
+    # "Timespinner": __renderTimespinnerTracker,
+    # "A Link to the Past": __renderAlttpTracker,
+    # "ChecksFinder": __renderChecksfinder,
+    # "Super Metroid": __renderSuperMetroidTracker,
+    # "Starcraft 2 Wings of Liberty": __renderSC2WoLTracker
 }
 
 
-def get_alttp_id(item_name):
-    return Items.item_table[item_name][2]
-
-
-links = {"Bow": "Progressive Bow",
-         "Silver Arrows": "Progressive Bow",
-         "Silver Bow": "Progressive Bow",
-         "Progressive Bow (Alt)": "Progressive Bow",
-         "Bottle (Red Potion)": "Bottle",
-         "Bottle (Green Potion)": "Bottle",
-         "Bottle (Blue Potion)": "Bottle",
-         "Bottle (Fairy)": "Bottle",
-         "Bottle (Bee)": "Bottle",
-         "Bottle (Good Bee)": "Bottle",
-         "Fighter Sword": "Progressive Sword",
-         "Master Sword": "Progressive Sword",
-         "Tempered Sword": "Progressive Sword",
-         "Golden Sword": "Progressive Sword",
-         "Power Glove": "Progressive Glove",
-         "Titans Mitts": "Progressive Glove"
-         }
-
-levels = {"Fighter Sword": 1,
-          "Master Sword": 2,
-          "Tempered Sword": 3,
-          "Golden Sword": 4,
-          "Power Glove": 1,
-          "Titans Mitts": 2,
-          "Bow": 1,
-          "Silver Bow": 2}
-
-multi_items = {get_alttp_id(name) for name in ("Progressive Sword", "Progressive Bow", "Bottle", "Progressive Glove")}
-links = {get_alttp_id(key): get_alttp_id(value) for key, value in links.items()}
-levels = {get_alttp_id(key): value for key, value in levels.items()}
-
-tracking_names = ["Progressive Sword", "Progressive Bow", "Book of Mudora", "Hammer",
-                  "Hookshot", "Magic Mirror", "Flute",
-                  "Pegasus Boots", "Progressive Glove", "Flippers", "Moon Pearl", "Blue Boomerang",
-                  "Red Boomerang", "Bug Catching Net", "Cape", "Shovel", "Lamp",
-                  "Mushroom", "Magic Powder",
-                  "Cane of Somaria", "Cane of Byrna", "Fire Rod", "Ice Rod", "Bombos", "Ether", "Quake",
-                  "Bottle", "Triforce"]
-
-default_locations = {
-    'Light World': {1572864, 1572865, 60034, 1572867, 1572868, 60037, 1572869, 1572866, 60040, 59788, 60046, 60175,
-                    1572880, 60049, 60178, 1572883, 60052, 60181, 1572885, 60055, 60184, 191256, 60058, 60187, 1572884,
-                    1572886, 1572887, 1572906, 60202, 60205, 59824, 166320, 1010170, 60208, 60211, 60214, 60217, 59836,
-                    60220, 60223, 59839, 1573184, 60226, 975299, 1573188, 1573189, 188229, 60229, 60232, 1573193,
-                    1573194, 60235, 1573187, 59845, 59854, 211407, 60238, 59857, 1573185, 1573186, 1572882, 212328,
-                    59881, 59761, 59890, 59770, 193020, 212605},
-    'Dark World': {59776, 59779, 975237, 1572870, 60043, 1572881, 60190, 60193, 60196, 60199, 60840, 1573190, 209095,
-                   1573192, 1573191, 60241, 60244, 60247, 60250, 59884, 59887, 60019, 60022, 60028, 60031},
-    'Desert Palace': {1573216, 59842, 59851, 59791, 1573201, 59830},
-    'Eastern Palace': {1573200, 59827, 59893, 59767, 59833, 59773},
-    'Hyrule Castle': {60256, 60259, 60169, 60172, 59758, 59764, 60025, 60253},
-    'Agahnims Tower': {60082, 60085},
-    'Tower of Hera': {1573218, 59878, 59821, 1573202, 59896, 59899},
-    'Swamp Palace': {60064, 60067, 60070, 59782, 59785, 60073, 60076, 60079, 1573204, 60061},
-    'Thieves Town': {59905, 59908, 59911, 59914, 59917, 59920, 59923, 1573206},
-    'Skull Woods': {59809, 59902, 59848, 59794, 1573205, 59800, 59803, 59806},
-    'Ice Palace': {59872, 59875, 59812, 59818, 59860, 59797, 1573207, 59869},
-    'Misery Mire': {60001, 60004, 60007, 60010, 60013, 1573208, 59866, 59998},
-    'Turtle Rock': {59938, 59941, 59944, 1573209, 59947, 59950, 59953, 59956, 59926, 59929, 59932, 59935},
-    'Palace of Darkness': {59968, 59971, 59974, 59977, 59980, 59983, 59986, 1573203, 59989, 59959, 59992, 59962, 59995,
-                           59965},
-    'Ganons Tower': {60160, 60163, 60166, 60088, 60091, 60094, 60097, 60100, 60103, 60106, 60109, 60112, 60115, 60118,
-                     60121, 60124, 60127, 1573217, 60130, 60133, 60136, 60139, 60142, 60145, 60148, 60151, 60157},
-    'Total': set()}
-
-key_only_locations = {
-    'Light World': set(),
-    'Dark World': set(),
-    'Desert Palace': {0x140031, 0x14002b, 0x140061, 0x140028},
-    'Eastern Palace': {0x14005b, 0x140049},
-    'Hyrule Castle': {0x140037, 0x140034, 0x14000d, 0x14003d},
-    'Agahnims Tower': {0x140061, 0x140052},
-    'Tower of Hera': set(),
-    'Swamp Palace': {0x140019, 0x140016, 0x140013, 0x140010, 0x14000a},
-    'Thieves Town': {0x14005e, 0x14004f},
-    'Skull Woods': {0x14002e, 0x14001c},
-    'Ice Palace': {0x140004, 0x140022, 0x140025, 0x140046},
-    'Misery Mire': {0x140055, 0x14004c, 0x140064},
-    'Turtle Rock': {0x140058, 0x140007},
-    'Palace of Darkness': set(),
-    'Ganons Tower': {0x140040, 0x140043, 0x14003a, 0x14001f},
-    'Total': set()
-}
-
-location_to_area = {}
-for area, locations in default_locations.items():
-    for location in locations:
-        location_to_area[location] = area
-
-for area, locations in key_only_locations.items():
-    for location in locations:
-        location_to_area[location] = area
-
-checks_in_area = {area: len(checks) for area, checks in default_locations.items()}
-checks_in_area["Total"] = 216
-
-ordered_areas = ('Light World', 'Dark World', 'Hyrule Castle', 'Agahnims Tower', 'Eastern Palace', 'Desert Palace',
-                 'Tower of Hera', 'Palace of Darkness', 'Swamp Palace', 'Skull Woods', 'Thieves Town', 'Ice Palace',
-                 'Misery Mire', 'Turtle Rock', 'Ganons Tower', "Total")
-
-tracking_ids = []
-
-for item in tracking_names:
-    tracking_ids.append(get_alttp_id(item))
-
-small_key_ids = {}
-big_key_ids = {}
-ids_small_key = {}
-ids_big_key = {}
-
-for item_name, data in Items.item_table.items():
-    if "Key" in item_name:
-        area = item_name.split("(")[1][:-1]
-        if "Small" in item_name:
-            small_key_ids[area] = data[2]
-            ids_small_key[data[2]] = area
-        else:
-            big_key_ids[area] = data[2]
-            ids_big_key[data[2]] = area
-
-# cleanup global namespace
-del item_name
-del data
-del item
-
-
-def attribute_item_solo(inventory, item):
-    """Adds item to inventory counter, converts everything to progressive."""
-    target_item = links.get(item, item)
-    if item in levels:  # non-progressive
-        inventory[target_item] = max(inventory[target_item], levels[item])
-    else:
-        inventory[target_item] += 1
+class RoomData(NamedTuple):
+    """Curated metadata from multidata for tracker purposes."""
+
+    # This is a dictionary of player ids to a dictionary of location ids to NetworkItem data (sans location).
+    #     The Tuple is (item_code, item_player_id, item_flags)
+    multidata: Dict[str, Any]
+    locations: Dict[int, Dict[int, Tuple[int, int, int]]]
+    room: Room
+    names: List[List[str]]
+    starting_items: Dict[int, List[int]]
+    games: Dict[int, str]
+    slot_data: Dict[int, Dict[str, Any]]
+    groups: Dict[int, Union[List[int], Tuple[int, ...]]]
+    saving_second: int
+    location_id_to_name: Dict[str, Dict[int, str]]
+    item_id_to_name: Dict[str, Dict[int, str]]
+
+
+class RoomState(NamedTuple):
+    """Curated metadata from RoomData and multisave for multi-tracker purposes."""
+
+    multisave: Dict[str, Any]
+    room_data: RoomData
+    hints: Dict[int, Set[Hint]]
+    player_names: Dict[Tuple[int, int], str]
+    player_names_with_alias: Dict[Tuple[int, int], str]
+    locations_complete: Dict[int, Dict[int, int]]
+    percentage_of_locations_complete: Dict[int, Dict[int, int]]
+    total_team_locations: Dict[int, int]
+    completed_worlds: int
+    activity_timers: Dict[Tuple[int, int], datetime.timedelta]
+    states: Dict[Tuple[int, int], ClientStatus]
+    videos: Dict[Tuple[int, int], List[str]]
 
 
 @app.template_filter()
-def render_timedelta(delta: datetime.timedelta):
+def render_timedelta(delta: datetime.timedelta) -> str:
     hours, minutes = divmod(delta.total_seconds() / 60, 60)
     hours = str(int(hours))
     minutes = str(int(minutes)).zfill(2)
     return f"{hours}:{minutes}"
 
 
-@pass_context
-def get_location_name(context: runtime.Context, loc: int) -> str:
-    # once all rooms embed data package, the chain lookup can be dropped
-    context_locations = context.get("custom_locations", {})
-    return collections.ChainMap(context_locations, lookup_any_location_id_to_name).get(loc, loc)
-
-
-@pass_context
-def get_item_name(context: runtime.Context, item: int) -> str:
-    context_items = context.get("custom_items", {})
-    return collections.ChainMap(context_items, lookup_any_item_id_to_name).get(item, item)
-
-
-app.jinja_env.filters["location_name"] = get_location_name
-app.jinja_env.filters["item_name"] = get_item_name
+def get_static_room_data(room: Room) -> RoomData:
+    """Fetches the static RoomData for a given room."""
 
+    # If cached, return the cached room data.
+    room_data = multidata_cache.get(room.seed.id, None)
+    if room_data:
+        return room_data
 
-_multidata_cache = {}
-
-
-def get_location_table(checks_table: dict) -> dict:
-    loc_to_area = {}
-    for area, locations in checks_table.items():
-        if area == "Total":
+    # In rooms with a lot of players this can take a bit of time, so this is the main reason for caching.
+    multidata = Context.decompress(room.seed.multidata)
+    games = {slot: slot_info.game for slot, slot_info in multidata["slot_info"].items()}
+    location_id_to_name = {}
+    item_id_to_name = {}
+    for game in games.values():
+        if game not in multidata["datapackage"]:
             continue
-        for location in locations:
-            loc_to_area[location] = area
-    return loc_to_area
 
+        checksum = multidata["datapackage"][game]["checksum"]
+        game_package = restricted_loads(GameDataPackage.get(checksum=checksum).data)
+        location_id_to_name.update({game: {id: name for name, id in game_package["location_name_to_id"].items()}})
+        item_id_to_name.update({game: {id: name for name, id in game_package["item_name_to_id"].items()}})
+
+    room_data = RoomData(
+        multidata=multidata,
+        room=room,
+        locations=multidata["locations"],
+        names=[[slot_info.name for _, slot_info in sorted(multidata["slot_info"].items())]],
+        starting_items=multidata["precollected_items"],
+        games=games,
+        slot_data=multidata["slot_data"],
+        groups={
+            slot: slot_info.group_members
+            for slot, slot_info in multidata["slot_info"].items()
+            if slot_info.type == SlotType.group
+        },
+        saving_second=get_saving_second(multidata["seed_name"]),
+        location_id_to_name=location_id_to_name,
+        item_id_to_name=item_id_to_name,
+    )
 
-def get_static_room_data(room: Room):
-    result = _multidata_cache.get(room.seed.id, None)
-    if result:
-        return result
-    multidata = Context.decompress(room.seed.multidata)
-    # in > 100 players this can take a bit of time and is the main reason for the cache
-    locations: Dict[int, Dict[int, Tuple[int, int, int]]] = multidata['locations']
-    names: List[List[str]] = multidata.get("names", [])
-    games = multidata.get("games", {})
-    groups = {}
-    custom_locations = {}
-    custom_items = {}
-    if "slot_info" in multidata:
-        slot_info_dict: Dict[int, NetworkSlot] = multidata["slot_info"]
-        games = {slot: slot_info.game for slot, slot_info in slot_info_dict.items()}
-        groups = {slot: slot_info.group_members for slot, slot_info in slot_info_dict.items()
-                  if slot_info.type == SlotType.group}
-        names = [[slot_info.name for slot, slot_info in sorted(slot_info_dict.items())]]
-        for game in games.values():
-            if game not in multidata["datapackage"]:
-                continue
-            game_data = multidata["datapackage"][game]
-            if "checksum" in game_data:
-                if network_data_package["games"].get(game, {}).get("checksum") == game_data["checksum"]:
-                    # non-custom. remove from multidata
-                    # network_data_package import could be skipped once all rooms embed data package
-                    del multidata["datapackage"][game]
-                    continue
-                else:
-                    game_data = restricted_loads(GameDataPackage.get(checksum=game_data["checksum"]).data)
-            custom_locations.update(
-                {id_: name for name, id_ in game_data["location_name_to_id"].items()})
-            custom_items.update(
-                {id_: name for name, id_ in game_data["item_name_to_id"].items()})
-
-    seed_checks_in_area = checks_in_area.copy()
-
-    use_door_tracker = False
-    if "tags" in multidata:
-        use_door_tracker = "DR" in multidata["tags"]
-    if use_door_tracker:
-        for area, checks in key_only_locations.items():
-            seed_checks_in_area[area] += len(checks)
-        seed_checks_in_area["Total"] = 249
-
-    player_checks_in_area = {
-        playernumber: {
-            areaname: len(multidata["checks_in_area"][playernumber][areaname]) if areaname != "Total" else
-            multidata["checks_in_area"][playernumber]["Total"]
-            for areaname in ordered_areas
-        }
-        for playernumber in multidata["checks_in_area"]
-    }
-
-    player_location_to_area = {playernumber: get_location_table(multidata["checks_in_area"][playernumber])
-                               for playernumber in multidata["checks_in_area"]}
-    saving_second = get_saving_second(multidata["seed_name"])
-    result = locations, names, use_door_tracker, player_checks_in_area, player_location_to_area, \
-             multidata["precollected_items"], games, multidata["slot_data"], groups, saving_second, \
-             custom_locations, custom_items
-    _multidata_cache[room.seed.id] = result
-    return result
+    multidata_cache[room.seed.id] = room_data
+    return room_data
 
 
 @app.route('/tracker/<suuid:tracker>/<int:tracked_team>/<int:tracked_player>')
-def get_player_tracker(tracker: UUID, tracked_team: int, tracked_player: int, want_generic: bool = False):
+def get_player_tracker(tracker: UUID, tracked_team: int, tracked_player: int, want_generic: bool = False) -> str:
     key = f"{tracker}_{tracked_team}_{tracked_player}_{want_generic}"
     tracker_page = cache.get(key)
     if tracker_page:
@@ -332,8 +127,12 @@ def get_player_tracker(tracker: UUID, tracked_team: int, tracked_player: int, wa
     return tracker_page
 
 
-def _get_player_tracker(tracker: UUID, tracked_team: int, tracked_player: int, want_generic: bool):
-    # Team and player must be positive and greater than zero
+def _get_player_tracker(tracker: UUID, tracked_team: int, tracked_player: int, want_generic: bool) -> Tuple[int, str]:
+    """
+    :return: Returns a tuple with the timeout value and jinja template
+    """
+
+    # Team and player must be positive and greater than zero.
     if tracked_team < 0 or tracked_player < 1:
         abort(404)
 
@@ -341,57 +140,48 @@ def _get_player_tracker(tracker: UUID, tracked_team: int, tracked_player: int, w
     if not room:
         abort(404)
 
-    # Collect seed information and pare it down to a single player
-    locations, names, use_door_tracker, seed_checks_in_area, player_location_to_area, \
-        precollected_items, games, slot_data, groups, saving_second, custom_locations, custom_items = \
-        get_static_room_data(room)
-    player_name = names[tracked_team][tracked_player - 1]
-    location_to_area = player_location_to_area.get(tracked_player, {})
+    # Collect seed information and pare it down to a single player.
+    room_data = get_static_room_data(room)
     inventory = collections.Counter()
-    checks_done = {loc_name: 0 for loc_name in default_locations}
 
-    # Add starting items to inventory
-    starting_items = precollected_items[tracked_player]
-    if starting_items:
-        for item_id in starting_items:
-            attribute_item_solo(inventory, item_id)
+    # Add starting items to inventory.
+    for item_id in room_data.starting_items[tracked_player]:
+        inventory[item_id] += 1
 
+    # Load save data.
     if room.multisave:
         multisave: Dict[str, Any] = restricted_loads(room.multisave)
     else:
         multisave: Dict[str, Any] = {}
 
-    slots_aimed_at_player = {tracked_player}
-    for group_id, group_members in groups.items():
+    slots_player_is_member_of = {tracked_player}
+    for group_id, group_members in room_data.groups.items():
         if tracked_player in group_members:
-            slots_aimed_at_player.add(group_id)
-
-    # Add items to player inventory
-    for (ms_team, ms_player), locations_checked in multisave.get("location_checks", {}).items():
-        # Skip teams and players not matching the request
-        player_locations = locations[ms_player]
-        if ms_team == tracked_team:
-            # If the player does not have the item, do nothing
-            for location in locations_checked:
-                if location in player_locations:
-                    item, recipient, flags = player_locations[location]
-                    if recipient in slots_aimed_at_player:  # a check done for the tracked player
-                        attribute_item_solo(inventory, item)
-                    if ms_player == tracked_player:  # a check done by the tracked player
-                        area_name = location_to_area.get(location, None)
-                        if area_name:
-                            checks_done[area_name] += 1
-                        checks_done["Total"] += 1
-    specific_tracker = game_specific_trackers.get(games[tracked_player], None)
+            slots_player_is_member_of.add(group_id)
+
+    # Add items to player inventory.
+    for (team, player), locations_checked in multisave.get("location_checks", {}).items():
+        # Skip teams and players not matching the request.
+        player_locations = room_data.locations[player]
+
+        if team != tracked_team:
+            continue
+
+        for location in locations_checked:
+            if location in player_locations:
+                # Keep track of items received by the player, excluding cheated items.
+                (item_code, recipient, _) = player_locations[location]
+                if recipient in slots_player_is_member_of:
+                    inventory[item_code] += 1
+
+    # Load and render the game-specific player tracker, or fallback to generic tracker if none exists.
+    specific_tracker = game_specific_trackers.get(room_data.games[tracked_player], None)
     if specific_tracker and not want_generic:
-        tracker =  specific_tracker(multisave, room, locations, inventory, tracked_team, tracked_player, player_name,
-                                    seed_checks_in_area, checks_done, slot_data[tracked_player], saving_second)
+        tracker = specific_tracker(multisave, room_data, tracked_team, tracked_player, inventory)
     else:
-        tracker =  __renderGenericTracker(multisave, room, locations, inventory, tracked_team, tracked_player,
-                                          player_name, seed_checks_in_area, checks_done, saving_second,
-                                          custom_locations, custom_items)
+        tracker = __render_generic_tracker(multisave, room_data, tracked_team, tracked_player, inventory)
 
-    return (saving_second - datetime.datetime.now().second) % 60 or 60, tracker
+    return (room_data.saving_second - datetime.datetime.now().second) % 60 or 60, tracker
 
 
 @app.route('/generic_tracker/<suuid:tracker>/<int:tracked_team>/<int:tracked_player>')
@@ -399,1375 +189,453 @@ def get_generic_tracker(tracker: UUID, tracked_team: int, tracked_player: int):
     return get_player_tracker(tracker, tracked_team, tracked_player, True)
 
 
-def __renderAlttpTracker(multisave: Dict[str, Any], room: Room, locations: Dict[int, Dict[int, Tuple[int, int, int]]],
-                         inventory: Counter, team: int, player: int, player_name: str,
-                         seed_checks_in_area: Dict[int, Dict[str, int]], checks_done: Dict[str, int], slot_data: Dict,
-                         saving_second: int) -> str:
-
-    # Note the presence of the triforce item
-    game_state = multisave.get("client_game_state", {}).get((team, player), 0)
-    if game_state == 30:
-        inventory[106] = 1  # Triforce
-
-    # Progressive items need special handling for icons and class
-    progressive_items = {
-        "Progressive Sword": 94,
-        "Progressive Glove": 97,
-        "Progressive Bow": 100,
-        "Progressive Mail": 96,
-        "Progressive Shield": 95,
-    }
-    progressive_names = {
-        "Progressive Sword": [None, 'Fighter Sword', 'Master Sword', 'Tempered Sword', 'Golden Sword'],
-        "Progressive Glove": [None, 'Power Glove', 'Titan Mitts'],
-        "Progressive Bow": [None, "Bow", "Silver Bow"],
-        "Progressive Mail": ["Green Mail", "Blue Mail", "Red Mail"],
-        "Progressive Shield": [None, "Blue Shield", "Red Shield", "Mirror Shield"]
-    }
-
-    # Determine which icon to use
-    display_data = {}
-    for item_name, item_id in progressive_items.items():
-        level = min(inventory[item_id], len(progressive_names[item_name]) - 1)
-        display_name = progressive_names[item_name][level]
-        acquired = True
-        if not display_name:
-            acquired = False
-            display_name = progressive_names[item_name][level + 1]
-        base_name = item_name.split(maxsplit=1)[1].lower()
-        display_data[base_name + "_acquired"] = acquired
-        display_data[base_name + "_url"] = alttp_icons[display_name]
-
-    # The single player tracker doesn't care about overworld, underworld, and total checks. Maybe it should?
-    sp_areas = ordered_areas[2:15]
-
-    player_big_key_locations = set()
-    player_small_key_locations = set()
-    for loc_data in locations.values():
-        for values in loc_data.values():
-            item_id, item_player, flags = values
-            if item_player == player:
-                if item_id in ids_big_key:
-                    player_big_key_locations.add(ids_big_key[item_id])
-                elif item_id in ids_small_key:
-                    player_small_key_locations.add(ids_small_key[item_id])
-
-    return render_template("lttpTracker.html", inventory=inventory,
-                            player_name=player_name, room=room, icons=alttp_icons, checks_done=checks_done,
-                            checks_in_area=seed_checks_in_area[player],
-                            acquired_items={lookup_any_item_id_to_name[id] for id in inventory},
-                            small_key_ids=small_key_ids, big_key_ids=big_key_ids, sp_areas=sp_areas,
-                            key_locations=player_small_key_locations,
-                            big_key_locations=player_big_key_locations,
-                            **display_data)
-
-
-def __renderMinecraftTracker(multisave: Dict[str, Any], room: Room, locations: Dict[int, Dict[int, Tuple[int, int, int]]],
-                             inventory: Counter, team: int, player: int, playerName: str,
-                             seed_checks_in_area: Dict[int, Dict[str, int]], checks_done: Dict[str, int], slot_data: Dict,
-                             saving_second: int) -> str:
-
-    icons = {
-        "Wooden Pickaxe": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/d/d2/Wooden_Pickaxe_JE3_BE3.png",
-        "Stone Pickaxe": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/c/c4/Stone_Pickaxe_JE2_BE2.png",
-        "Iron Pickaxe": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/d/d1/Iron_Pickaxe_JE3_BE2.png",
-        "Diamond Pickaxe": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/e/e7/Diamond_Pickaxe_JE3_BE3.png",
-        "Wooden Sword": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/d/d5/Wooden_Sword_JE2_BE2.png",
-        "Stone Sword": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/b/b1/Stone_Sword_JE2_BE2.png",
-        "Iron Sword": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/8/8e/Iron_Sword_JE2_BE2.png",
-        "Diamond Sword": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/4/44/Diamond_Sword_JE3_BE3.png",
-        "Leather Tunic": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/b/b7/Leather_Tunic_JE4_BE2.png",
-        "Iron Chestplate": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/3/31/Iron_Chestplate_JE2_BE2.png",
-        "Diamond Chestplate": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/e/e0/Diamond_Chestplate_JE3_BE2.png",
-        "Iron Ingot": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/f/fc/Iron_Ingot_JE3_BE2.png",
-        "Block of Iron": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/7/7e/Block_of_Iron_JE4_BE3.png",
-        "Brewing Stand": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/b/b3/Brewing_Stand_%28empty%29_JE10.png",
-        "Ender Pearl": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/f/f6/Ender_Pearl_JE3_BE2.png",
-        "Bucket": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/f/fc/Bucket_JE2_BE2.png",
-        "Bow": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/a/ab/Bow_%28Pull_2%29_JE1_BE1.png",
-        "Shield": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/c/c6/Shield_JE2_BE1.png",
-        "Red Bed": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/6/6a/Red_Bed_%28N%29.png",
-        "Netherite Scrap": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/3/33/Netherite_Scrap_JE2_BE1.png",
-        "Flint and Steel": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/9/94/Flint_and_Steel_JE4_BE2.png",
-        "Enchanting Table": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/3/31/Enchanting_Table.gif",
-        "Fishing Rod": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/7/7f/Fishing_Rod_JE2_BE2.png",
-        "Campfire": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/9/91/Campfire_JE2_BE2.gif",
-        "Water Bottle": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/7/75/Water_Bottle_JE2_BE2.png",
-        "Spyglass": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/c/c1/Spyglass_JE2_BE1.png",
-        "Dragon Egg Shard": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/3/38/Dragon_Egg_JE4.png",
-        "Lead": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/1/1f/Lead_JE2_BE2.png",
-        "Saddle": "https://i.imgur.com/2QtDyR0.png",
-        "Channeling Book": "https://i.imgur.com/J3WsYZw.png",
-        "Silk Touch Book": "https://i.imgur.com/iqERxHQ.png",
-        "Piercing IV Book": "https://i.imgur.com/OzJptGz.png",
-    }
-
-    minecraft_location_ids = {
-        "Story": [42073, 42023, 42027, 42039, 42002, 42009, 42010, 42070,
-                  42041, 42049, 42004, 42031, 42025, 42029, 42051, 42077],
-        "Nether": [42017, 42044, 42069, 42058, 42034, 42060, 42066, 42076, 42064, 42071, 42021,
-                   42062, 42008, 42061, 42033, 42011, 42006, 42019, 42000, 42040, 42001, 42015, 42104, 42014],
-        "The End": [42052, 42005, 42012, 42032, 42030, 42042, 42018, 42038, 42046],
-        "Adventure": [42047, 42050, 42096, 42097, 42098, 42059, 42055, 42072, 42003, 42109, 42035, 42016, 42020,
-                      42048, 42054, 42068, 42043, 42106, 42074, 42075, 42024, 42026, 42037, 42045, 42056, 42105, 42099, 42103, 42110, 42100],
-        "Husbandry": [42065, 42067, 42078, 42022, 42113, 42107, 42007, 42079, 42013, 42028, 42036, 42108, 42111, 42112,
-                      42057, 42063, 42053, 42102, 42101, 42092, 42093, 42094, 42095],
-        "Archipelago": [42080, 42081, 42082, 42083, 42084, 42085, 42086, 42087, 42088, 42089, 42090, 42091],
-    }
-
-    display_data = {}
-
-    # Determine display for progressive items
-    progressive_items = {
-        "Progressive Tools": 45013,
-        "Progressive Weapons": 45012,
-        "Progressive Armor": 45014,
-        "Progressive Resource Crafting": 45001
-    }
-    progressive_names = {
-        "Progressive Tools": ["Wooden Pickaxe", "Stone Pickaxe", "Iron Pickaxe", "Diamond Pickaxe"],
-        "Progressive Weapons": ["Wooden Sword", "Stone Sword", "Iron Sword", "Diamond Sword"],
-        "Progressive Armor": ["Leather Tunic", "Iron Chestplate", "Diamond Chestplate"],
-        "Progressive Resource Crafting": ["Iron Ingot", "Iron Ingot", "Block of Iron"]
-    }
-    for item_name, item_id in progressive_items.items():
-        level = min(inventory[item_id], len(progressive_names[item_name]) - 1)
-        display_name = progressive_names[item_name][level]
-        base_name = item_name.split(maxsplit=1)[1].lower().replace(' ', '_')
-        display_data[base_name + "_url"] = icons[display_name]
-
-    # Multi-items
-    multi_items = {
-        "3 Ender Pearls": 45029,
-        "8 Netherite Scrap": 45015,
-        "Dragon Egg Shard": 45043
-    }
-    for item_name, item_id in multi_items.items():
-        base_name = item_name.split()[-1].lower()
-        count = inventory[item_id]
-        if count >= 0:
-            display_data[base_name + "_count"] = count
-
-    # Victory condition
-    game_state = multisave.get("client_game_state", {}).get((team, player), 0)
-    display_data['game_finished'] = game_state == 30
-
-    # Turn location IDs into advancement tab counts
-    checked_locations = multisave.get("location_checks", {}).get((team, player), set())
-    lookup_name = lambda id: lookup_any_location_id_to_name[id]
-    location_info = {tab_name: {lookup_name(id): (id in checked_locations) for id in tab_locations}
-                        for tab_name, tab_locations in minecraft_location_ids.items()}
-    checks_done = {tab_name: len([id for id in tab_locations if id in checked_locations])
-                    for tab_name, tab_locations in minecraft_location_ids.items()}
-    checks_done['Total'] = len(checked_locations)
-    checks_in_area = {tab_name: len(tab_locations) for tab_name, tab_locations in minecraft_location_ids.items()}
-    checks_in_area['Total'] = sum(checks_in_area.values())
-
-    return render_template("minecraftTracker.html",
-                            inventory=inventory, icons=icons,
-                            acquired_items={lookup_any_item_id_to_name[id] for id in inventory if
-                                            id in lookup_any_item_id_to_name},
-                            player=player, team=team, room=room, player_name=playerName, saving_second = saving_second,
-                            checks_done=checks_done, checks_in_area=checks_in_area, location_info=location_info,
-                            **display_data)
-
-
-def __renderOoTTracker(multisave: Dict[str, Any], room: Room, locations: Dict[int, Dict[int, Tuple[int, int, int]]],
-                       inventory: Counter, team: int, player: int, playerName: str,
-                       seed_checks_in_area: Dict[int, Dict[str, int]], checks_done: Dict[str, int], slot_data: Dict,
-                       saving_second: int) -> str:
-
-    icons = {
-        "Fairy Ocarina":            "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/9/97/OoT_Fairy_Ocarina_Icon.png",
-        "Ocarina of Time":          "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/4/4e/OoT_Ocarina_of_Time_Icon.png",
-        "Slingshot":                "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/3/32/OoT_Fairy_Slingshot_Icon.png",
-        "Boomerang":                "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/d/d5/OoT_Boomerang_Icon.png",
-        "Bottle":                   "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/f/fc/OoT_Bottle_Icon.png",
-        "Rutos Letter":             "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/2/21/OoT_Letter_Icon.png",
-        "Bombs":                    "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/1/11/OoT_Bomb_Icon.png",
-        "Bombchus":                 "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/3/36/OoT_Bombchu_Icon.png",
-        "Lens of Truth":            "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/0/05/OoT_Lens_of_Truth_Icon.png",
-        "Bow":                      "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/9/9a/OoT_Fairy_Bow_Icon.png",
-        "Hookshot":                 "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/7/77/OoT_Hookshot_Icon.png",
-        "Longshot":                 "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/a/a4/OoT_Longshot_Icon.png",
-        "Megaton Hammer":           "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/9/93/OoT_Megaton_Hammer_Icon.png",
-        "Fire Arrows":              "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/1/1e/OoT_Fire_Arrow_Icon.png",
-        "Ice Arrows":               "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/3/3c/OoT_Ice_Arrow_Icon.png",
-        "Light Arrows":             "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/7/76/OoT_Light_Arrow_Icon.png",
-        "Dins Fire":                r"https://static.wikia.nocookie.net/zelda_gamepedia_en/images/d/da/OoT_Din%27s_Fire_Icon.png",
-        "Farores Wind":             r"https://static.wikia.nocookie.net/zelda_gamepedia_en/images/7/7a/OoT_Farore%27s_Wind_Icon.png",
-        "Nayrus Love":              r"https://static.wikia.nocookie.net/zelda_gamepedia_en/images/b/be/OoT_Nayru%27s_Love_Icon.png",
-        "Kokiri Sword":             "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/5/53/OoT_Kokiri_Sword_Icon.png",
-        "Biggoron Sword":           r"https://static.wikia.nocookie.net/zelda_gamepedia_en/images/2/2e/OoT_Giant%27s_Knife_Icon.png",
-        "Mirror Shield":            "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/b/b0/OoT_Mirror_Shield_Icon_2.png",
-        "Goron Bracelet":           r"https://static.wikia.nocookie.net/zelda_gamepedia_en/images/b/b7/OoT_Goron%27s_Bracelet_Icon.png",
-        "Silver Gauntlets":         "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/b/b9/OoT_Silver_Gauntlets_Icon.png",
-        "Golden Gauntlets":         "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/6/6a/OoT_Golden_Gauntlets_Icon.png",
-        "Goron Tunic":              "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/1/1c/OoT_Goron_Tunic_Icon.png",
-        "Zora Tunic":               "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/2/2c/OoT_Zora_Tunic_Icon.png",
-        "Silver Scale":             "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/4/4e/OoT_Silver_Scale_Icon.png",
-        "Gold Scale":               "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/9/95/OoT_Golden_Scale_Icon.png",
-        "Iron Boots":               "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/3/34/OoT_Iron_Boots_Icon.png",
-        "Hover Boots":              "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/2/22/OoT_Hover_Boots_Icon.png",
-        "Adults Wallet":            r"https://static.wikia.nocookie.net/zelda_gamepedia_en/images/f/f9/OoT_Adult%27s_Wallet_Icon.png",
-        "Giants Wallet":            r"https://static.wikia.nocookie.net/zelda_gamepedia_en/images/8/87/OoT_Giant%27s_Wallet_Icon.png",
-        "Small Magic":              "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/9/9f/OoT3D_Magic_Jar_Icon.png",
-        "Large Magic":              "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/3/3e/OoT3D_Large_Magic_Jar_Icon.png",
-        "Gerudo Membership Card":   "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/4/4e/OoT_Gerudo_Token_Icon.png",
-        "Gold Skulltula Token":     "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/4/47/OoT_Token_Icon.png",
-        "Triforce Piece":           "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/0/0b/SS_Triforce_Piece_Icon.png",
-        "Triforce":                 "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/6/68/ALttP_Triforce_Title_Sprite.png",
-        "Zeldas Lullaby":           "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/2/21/Grey_Note.png",
-        "Eponas Song":              "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/2/21/Grey_Note.png",
-        "Sarias Song":              "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/2/21/Grey_Note.png",
-        "Suns Song":                "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/2/21/Grey_Note.png",
-        "Song of Time":             "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/2/21/Grey_Note.png",
-        "Song of Storms":           "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/2/21/Grey_Note.png",
-        "Minuet of Forest":         "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/e/e4/Green_Note.png",
-        "Bolero of Fire":           "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/f/f0/Red_Note.png",
-        "Serenade of Water":        "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/0/0f/Blue_Note.png",
-        "Requiem of Spirit":        "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/a/a4/Orange_Note.png",
-        "Nocturne of Shadow":       "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/9/97/Purple_Note.png",
-        "Prelude of Light":         "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/9/90/Yellow_Note.png",
-        "Small Key":                "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/e/e5/OoT_Small_Key_Icon.png",
-        "Boss Key":                 "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/4/40/OoT_Boss_Key_Icon.png",
-    }
-
-    display_data = {}
-
-    # Determine display for progressive items
-    progressive_items = {
-        "Progressive Hookshot": 66128,
-        "Progressive Strength Upgrade": 66129,
-        "Progressive Wallet": 66133,
-        "Progressive Scale": 66134,
-        "Magic Meter": 66138,
-        "Ocarina": 66139,
-    }
-
-    progressive_names = {
-        "Progressive Hookshot": ["Hookshot", "Hookshot", "Longshot"],
-        "Progressive Strength Upgrade": ["Goron Bracelet", "Goron Bracelet", "Silver Gauntlets", "Golden Gauntlets"],
-        "Progressive Wallet": ["Adults Wallet", "Adults Wallet", "Giants Wallet", "Giants Wallet"],
-        "Progressive Scale": ["Silver Scale", "Silver Scale", "Gold Scale"],
-        "Magic Meter": ["Small Magic", "Small Magic", "Large Magic"],
-        "Ocarina": ["Fairy Ocarina", "Fairy Ocarina", "Ocarina of Time"]
-    }
-
-    for item_name, item_id in progressive_items.items():
-        level = min(inventory[item_id], len(progressive_names[item_name])-1)
-        display_name = progressive_names[item_name][level]
-        if item_name.startswith("Progressive"):
-            base_name = item_name.split(maxsplit=1)[1].lower().replace(' ', '_')
-        else:
-            base_name = item_name.lower().replace(' ', '_')
-        display_data[base_name+"_url"] = icons[display_name]
-
-        if base_name == "hookshot":
-            display_data['hookshot_length'] = {0: '', 1: 'H', 2: 'L'}.get(level)
-        if base_name == "wallet":
-            display_data['wallet_size'] = {0: '99', 1: '200', 2: '500', 3: '999'}.get(level)
-
-    # Determine display for bottles. Show letter if it's obtained, determine bottle count
-    bottle_ids = [66015, 66020, 66021, 66140, 66141, 66142, 66143, 66144, 66145, 66146, 66147, 66148]
-    display_data['bottle_count'] = min(sum(map(lambda item_id: inventory[item_id], bottle_ids)), 4)
-    display_data['bottle_url'] = icons['Rutos Letter'] if inventory[66021] > 0 else icons['Bottle']
-
-    # Determine bombchu display
-    display_data['has_bombchus'] = any(map(lambda item_id: inventory[item_id] > 0, [66003, 66106, 66107, 66137]))
-
-    # Multi-items
-    multi_items = {
-        "Gold Skulltula Token": 66091,
-        "Triforce Piece": 66202,
-    }
-    for item_name, item_id in multi_items.items():
-        base_name = item_name.split()[-1].lower()
-        display_data[base_name+"_count"] = inventory[item_id]
-
-    # Gather dungeon locations
-    area_id_ranges = {
-        "Overworld":                ((67000, 67263), (67269, 67280), (67747, 68024), (68054, 68062)),
-        "Deku Tree":                ((67281, 67303), (68063, 68077)),
-        "Dodongo's Cavern":         ((67304, 67334), (68078, 68160)),
-        "Jabu Jabu's Belly":        ((67335, 67359), (68161, 68188)),
-        "Bottom of the Well":       ((67360, 67384), (68189, 68230)),
-        "Forest Temple":            ((67385, 67420), (68231, 68281)),
-        "Fire Temple":              ((67421, 67457), (68282, 68350)),
-        "Water Temple":             ((67458, 67484), (68351, 68483)),
-        "Shadow Temple":            ((67485, 67532), (68484, 68565)),
-        "Spirit Temple":            ((67533, 67582), (68566, 68625)),
-        "Ice Cavern":               ((67583, 67596), (68626, 68649)),
-        "Gerudo Training Ground":   ((67597, 67635), (68650, 68656)),
-        "Thieves' Hideout":         ((67264, 67268), (68025, 68053)),
-        "Ganon's Castle":           ((67636, 67673), (68657, 68705)),
-    }
-
-    def lookup_and_trim(id, area):
-        full_name = lookup_any_location_id_to_name[id]
-        if 'Ganons Tower' in full_name:
-            return full_name
-        if area not in ["Overworld", "Thieves' Hideout"]:
-            # trim dungeon name. leaves an extra space that doesn't display, or trims fully for DC/Jabu/GC
-            return full_name[len(area):]
-        return full_name
-
-    checked_locations = multisave.get("location_checks", {}).get((team, player), set()).intersection(set(locations[player]))
-    location_info = {}
-    checks_done = {}
-    checks_in_area = {}
-    for area, ranges in area_id_ranges.items():
-        location_info[area] = {}
-        checks_done[area] = 0
-        checks_in_area[area] = 0
-        for r in ranges:
-            min_id, max_id = r
-            for id in range(min_id, max_id+1):
-                if id in locations[player]:
-                    checked = id in checked_locations
-                    location_info[area][lookup_and_trim(id, area)] = checked
-                    checks_in_area[area] += 1
-                    checks_done[area] += checked
-
-    checks_done['Total'] = sum(checks_done.values())
-    checks_in_area['Total'] = sum(checks_in_area.values())
-
-    # Give skulltulas on non-tracked locations
-    non_tracked_locations = multisave.get("location_checks", {}).get((team, player), set()).difference(set(locations[player]))
-    for id in non_tracked_locations:
-        if "GS" in lookup_and_trim(id, ''):
-            display_data["token_count"] += 1
-
-    oot_y = '✔'
-    oot_x = '✕'
-
-    # Gather small and boss key info
-    small_key_counts = {
-        "Forest Temple":            oot_y if inventory[66203] else inventory[66175],
-        "Fire Temple":              oot_y if inventory[66204] else inventory[66176],
-        "Water Temple":             oot_y if inventory[66205] else inventory[66177],
-        "Spirit Temple":            oot_y if inventory[66206] else inventory[66178],
-        "Shadow Temple":            oot_y if inventory[66207] else inventory[66179],
-        "Bottom of the Well":       oot_y if inventory[66208] else inventory[66180],
-        "Gerudo Training Ground":   oot_y if inventory[66209] else inventory[66181],
-        "Thieves' Hideout":         oot_y if inventory[66210] else inventory[66182],
-        "Ganon's Castle":           oot_y if inventory[66211] else inventory[66183],
-    }
-    boss_key_counts = {
-        "Forest Temple":            oot_y if inventory[66149] else oot_x,
-        "Fire Temple":              oot_y if inventory[66150] else oot_x,
-        "Water Temple":             oot_y if inventory[66151] else oot_x,
-        "Spirit Temple":            oot_y if inventory[66152] else oot_x,
-        "Shadow Temple":            oot_y if inventory[66153] else oot_x,
-        "Ganon's Castle":           oot_y if inventory[66154] else oot_x,
-    }
-
-    # Victory condition
-    game_state = multisave.get("client_game_state", {}).get((team, player), 0)
-    display_data['game_finished'] = game_state == 30
-
-    return render_template("ootTracker.html",
-                           inventory=inventory, player=player, team=team, room=room, player_name=playerName,
-                           icons=icons, acquired_items={lookup_any_item_id_to_name[id] for id in inventory},
-                           checks_done=checks_done, checks_in_area=checks_in_area, location_info=location_info,
-                           small_key_counts=small_key_counts, boss_key_counts=boss_key_counts,
-                           **display_data)
-
-
-def __renderTimespinnerTracker(multisave: Dict[str, Any], room: Room, locations: Dict[int, Dict[int, Tuple[int, int, int]]],
-                               inventory: Counter, team: int, player: int, playerName: str,
-                               seed_checks_in_area: Dict[int, Dict[str, int]], checks_done: Dict[str, int],
-                               slot_data: Dict[str, Any], saving_second: int) -> str:
-
-    icons = {
-        "Timespinner Wheel":    "https://timespinnerwiki.com/mediawiki/images/7/76/Timespinner_Wheel.png",
-        "Timespinner Spindle":  "https://timespinnerwiki.com/mediawiki/images/1/1a/Timespinner_Spindle.png",
-        "Timespinner Gear 1":   "https://timespinnerwiki.com/mediawiki/images/3/3c/Timespinner_Gear_1.png",
-        "Timespinner Gear 2":   "https://timespinnerwiki.com/mediawiki/images/e/e9/Timespinner_Gear_2.png",
-        "Timespinner Gear 3":   "https://timespinnerwiki.com/mediawiki/images/2/22/Timespinner_Gear_3.png",
-        "Talaria Attachment":   "https://timespinnerwiki.com/mediawiki/images/6/61/Talaria_Attachment.png",
-        "Succubus Hairpin":     "https://timespinnerwiki.com/mediawiki/images/4/49/Succubus_Hairpin.png",
-        "Lightwall":            "https://timespinnerwiki.com/mediawiki/images/0/03/Lightwall.png",
-        "Celestial Sash":       "https://timespinnerwiki.com/mediawiki/images/f/f1/Celestial_Sash.png",
-        "Twin Pyramid Key":     "https://timespinnerwiki.com/mediawiki/images/4/49/Twin_Pyramid_Key.png",
-        "Security Keycard D":   "https://timespinnerwiki.com/mediawiki/images/1/1b/Security_Keycard_D.png",
-        "Security Keycard C":   "https://timespinnerwiki.com/mediawiki/images/e/e5/Security_Keycard_C.png",
-        "Security Keycard B":   "https://timespinnerwiki.com/mediawiki/images/f/f6/Security_Keycard_B.png",
-        "Security Keycard A":   "https://timespinnerwiki.com/mediawiki/images/b/b9/Security_Keycard_A.png",
-        "Library Keycard V":    "https://timespinnerwiki.com/mediawiki/images/5/50/Library_Keycard_V.png",
-        "Tablet":               "https://timespinnerwiki.com/mediawiki/images/a/a0/Tablet.png",
-        "Elevator Keycard":     "https://timespinnerwiki.com/mediawiki/images/5/55/Elevator_Keycard.png",
-        "Oculus Ring":          "https://timespinnerwiki.com/mediawiki/images/8/8d/Oculus_Ring.png",
-        "Water Mask":           "https://timespinnerwiki.com/mediawiki/images/0/04/Water_Mask.png",
-        "Gas Mask":             "https://timespinnerwiki.com/mediawiki/images/2/2e/Gas_Mask.png",
-        "Djinn Inferno":        "https://timespinnerwiki.com/mediawiki/images/f/f6/Djinn_Inferno.png",
-        "Pyro Ring":            "https://timespinnerwiki.com/mediawiki/images/2/2c/Pyro_Ring.png",
-        "Infernal Flames":      "https://timespinnerwiki.com/mediawiki/images/1/1f/Infernal_Flames.png",
-        "Fire Orb":             "https://timespinnerwiki.com/mediawiki/images/3/3e/Fire_Orb.png",
-        "Royal Ring":           "https://timespinnerwiki.com/mediawiki/images/f/f3/Royal_Ring.png",
-        "Plasma Geyser":        "https://timespinnerwiki.com/mediawiki/images/1/12/Plasma_Geyser.png",
-        "Plasma Orb":           "https://timespinnerwiki.com/mediawiki/images/4/44/Plasma_Orb.png",
-        "Kobo":                 "https://timespinnerwiki.com/mediawiki/images/c/c6/Familiar_Kobo.png",
-        "Merchant Crow":        "https://timespinnerwiki.com/mediawiki/images/4/4e/Familiar_Crow.png",
-    }
-
-    timespinner_location_ids = {
-        "Present": [
-            1337000, 1337001, 1337002, 1337003, 1337004, 1337005, 1337006, 1337007, 1337008, 1337009,
-            1337010, 1337011, 1337012, 1337013, 1337014, 1337015, 1337016, 1337017, 1337018, 1337019,
-            1337020, 1337021, 1337022, 1337023, 1337024, 1337025, 1337026, 1337027, 1337028, 1337029,
-            1337030, 1337031, 1337032, 1337033, 1337034, 1337035, 1337036, 1337037, 1337038, 1337039,
-            1337040, 1337041, 1337042, 1337043, 1337044, 1337045, 1337046, 1337047, 1337048, 1337049,
-            1337050, 1337051, 1337052, 1337053, 1337054, 1337055, 1337056, 1337057, 1337058, 1337059,
-            1337060, 1337061, 1337062, 1337063, 1337064, 1337065, 1337066, 1337067, 1337068, 1337069,
-            1337070, 1337071, 1337072, 1337073, 1337074, 1337075, 1337076, 1337077, 1337078, 1337079,
-            1337080, 1337081, 1337082, 1337083, 1337084, 1337085],
-        "Past": [
-                                                                  1337086, 1337087, 1337088, 1337089,
-            1337090, 1337091, 1337092, 1337093, 1337094, 1337095, 1337096, 1337097, 1337098, 1337099,
-            1337100, 1337101, 1337102, 1337103, 1337104, 1337105, 1337106, 1337107, 1337108, 1337109,
-            1337110, 1337111, 1337112, 1337113, 1337114, 1337115, 1337116, 1337117, 1337118, 1337119,
-            1337120, 1337121, 1337122, 1337123, 1337124, 1337125, 1337126, 1337127, 1337128, 1337129,
-            1337130, 1337131, 1337132, 1337133, 1337134, 1337135, 1337136, 1337137, 1337138, 1337139,
-            1337140, 1337141, 1337142, 1337143, 1337144, 1337145, 1337146, 1337147, 1337148, 1337149,
-            1337150, 1337151, 1337152, 1337153, 1337154, 1337155,
-                     1337171, 1337172, 1337173, 1337174, 1337175],
-        "Ancient Pyramid": [
-                                                                  1337236,
-                                                                  1337246, 1337247, 1337248, 1337249]
-    }
-
-    if(slot_data["DownloadableItems"]):
-        timespinner_location_ids["Present"] += [
-                                                                  1337156, 1337157,          1337159,
-            1337160, 1337161, 1337162, 1337163, 1337164, 1337165, 1337166, 1337167, 1337168, 1337169,
-            1337170]
-    if(slot_data["Cantoran"]):
-        timespinner_location_ids["Past"].append(1337176)
-    if(slot_data["LoreChecks"]):
-        timespinner_location_ids["Present"] += [
-                                                                           1337177, 1337178, 1337179,
-            1337180, 1337181, 1337182, 1337183, 1337184, 1337185, 1337186, 1337187]
-        timespinner_location_ids["Past"] += [
-                                                                                    1337188, 1337189,
-            1337190, 1337191, 1337192, 1337193, 1337194, 1337195, 1337196, 1337197, 1337198]
-    if(slot_data["GyreArchives"]):
-        timespinner_location_ids["Ancient Pyramid"] += [
-                                                                           1337237, 1337238, 1337239,
-            1337240, 1337241, 1337242, 1337243, 1337244, 1337245]
-
-    display_data = {}
-
-    # Victory condition
-    game_state = multisave.get("client_game_state", {}).get((team, player), 0)
-    display_data['game_finished'] = game_state == 30
-
-    # Turn location IDs into advancement tab counts
-    checked_locations = multisave.get("location_checks", {}).get((team, player), set())
-    lookup_name = lambda id: lookup_any_location_id_to_name[id]
-    location_info = {tab_name: {lookup_name(id): (id in checked_locations) for id in tab_locations}
-                        for tab_name, tab_locations in timespinner_location_ids.items()}
-    checks_done = {tab_name: len([id for id in tab_locations if id in checked_locations])
-                    for tab_name, tab_locations in timespinner_location_ids.items()}
-    checks_done['Total'] = len(checked_locations)
-    checks_in_area = {tab_name: len(tab_locations) for tab_name, tab_locations in timespinner_location_ids.items()}
-    checks_in_area['Total'] = sum(checks_in_area.values())
-    acquired_items = {lookup_any_item_id_to_name[id] for id in inventory if id in lookup_any_item_id_to_name}
-    options = {k for k, v in slot_data.items() if v}
-
-    return render_template("timespinnerTracker.html",
-                            inventory=inventory, icons=icons, acquired_items=acquired_items,
-                            player=player, team=team, room=room, player_name=playerName,
-                            checks_done=checks_done, checks_in_area=checks_in_area, location_info=location_info,
-                            options=options, **display_data)
-
-def __renderSuperMetroidTracker(multisave: Dict[str, Any], room: Room, locations: Dict[int, Dict[int, Tuple[int, int, int]]],
-                                inventory: Counter, team: int, player: int, playerName: str,
-                                seed_checks_in_area: Dict[int, Dict[str, int]], checks_done: Dict[str, int], slot_data: Dict,
-                                saving_second: int) -> str:
-
-    icons = {
-        "Energy Tank":      "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/ETank.png",
-        "Missile":          "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/Missile.png",
-        "Super Missile":    "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/Super.png",
-        "Power Bomb":       "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/PowerBomb.png",
-        "Bomb":             "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/Bomb.png",
-        "Charge Beam":      "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/Charge.png",
-        "Ice Beam":         "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/Ice.png",
-        "Hi-Jump Boots":    "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/HiJump.png",
-        "Speed Booster":    "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/SpeedBooster.png",
-        "Wave Beam":        "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/Wave.png",
-        "Spazer":           "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/Spazer.png",
-        "Spring Ball":      "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/SpringBall.png",
-        "Varia Suit":       "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/Varia.png",
-        "Plasma Beam":      "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/Plasma.png",
-        "Grappling Beam":   "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/Grapple.png",
-        "Morph Ball":       "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/Morph.png",
-        "Reserve Tank":     "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/Reserve.png",
-        "Gravity Suit":     "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/Gravity.png",
-        "X-Ray Scope":      "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/XRayScope.png",
-        "Space Jump":       "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/SpaceJump.png",
-        "Screw Attack":     "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/ScrewAttack.png",
-        "Nothing":          "",
-        "No Energy":        "",
-        "Kraid":            "",
-        "Phantoon":         "",
-        "Draygon":          "",
-        "Ridley":           "",
-        "Mother Brain":     "",
-    }
-
-    multi_items = {
-        "Energy Tank": 83000,
-        "Missile": 83001,
-        "Super Missile": 83002,
-        "Power Bomb": 83003,
-        "Reserve Tank": 83020,
-    }
-
-    supermetroid_location_ids = {
-        'Crateria/Blue Brinstar': [82005, 82007, 82008, 82026, 82029,
-                     82000, 82004, 82006, 82009, 82010,
-                     82011, 82012, 82027, 82028, 82034,
-                     82036, 82037],
-        'Green/Pink Brinstar': [82017, 82023, 82030, 82033, 82035,
-                              82013, 82014, 82015, 82016, 82018,
-                              82019, 82021, 82022, 82024, 82025,
-                              82031],
-        'Red Brinstar': [82038, 82042, 82039, 82040, 82041],
-        'Kraid': [82043, 82048, 82044],
-        'Norfair': [82050, 82053, 82061, 82066, 82068,
-                    82049, 82051, 82054, 82055, 82056,
-                    82062, 82063, 82064, 82065, 82067],
-        'Lower Norfair': [82078, 82079, 82080, 82070, 82071,
-                         82073, 82074, 82075, 82076, 82077],
-        'Crocomire': [82052, 82060, 82057, 82058, 82059],
-        'Wrecked Ship': [82129, 82132, 82134, 82135, 82001,
-                        82002, 82003, 82128, 82130, 82131,
-                        82133],
-        'West Maridia': [82138, 82136, 82137, 82139, 82140,
-                        82141, 82142],
-        'East Maridia': [82143, 82145, 82150, 82152, 82154,
-                        82144, 82146, 82147, 82148, 82149,
-                        82151],
-    }
-
-    display_data = {}
-
-
-    for item_name, item_id in multi_items.items():
-        base_name = item_name.split()[0].lower()
-        display_data[base_name+"_count"] = inventory[item_id]
-
-    # Victory condition
-    game_state = multisave.get("client_game_state", {}).get((team, player), 0)
-    display_data['game_finished'] = game_state == 30
-
-    # Turn location IDs into advancement tab counts
-    checked_locations = multisave.get("location_checks", {}).get((team, player), set())
-    lookup_name = lambda id: lookup_any_location_id_to_name[id]
-    location_info = {tab_name: {lookup_name(id): (id in checked_locations) for id in tab_locations}
-                     for tab_name, tab_locations in supermetroid_location_ids.items()}
-    checks_done = {tab_name: len([id for id in tab_locations if id in checked_locations])
-                   for tab_name, tab_locations in supermetroid_location_ids.items()}
-    checks_done['Total'] = len(checked_locations)
-    checks_in_area = {tab_name: len(tab_locations) for tab_name, tab_locations in supermetroid_location_ids.items()}
-    checks_in_area['Total'] = sum(checks_in_area.values())
-
-    return render_template("supermetroidTracker.html",
-                            inventory=inventory, icons=icons,
-                            acquired_items={lookup_any_item_id_to_name[id] for id in inventory if
-                                            id in lookup_any_item_id_to_name},
-                            player=player, team=team, room=room, player_name=playerName,
-                            checks_done=checks_done, checks_in_area=checks_in_area, location_info=location_info,
-                            **display_data)
-
-def __renderSC2WoLTracker(multisave: Dict[str, Any], room: Room, locations: Dict[int, Dict[int, Tuple[int, int, int]]],
-                          inventory: Counter, team: int, player: int, playerName: str,
-                          seed_checks_in_area: Dict[int, Dict[str, int]], checks_done: Dict[str, int],
-                          slot_data: Dict, saving_second: int) -> str:
-
-    SC2WOL_LOC_ID_OFFSET = 1000
-    SC2WOL_ITEM_ID_OFFSET = 1000
-
-
-    icons = {
-        "Starting Minerals": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/icons/icon-mineral-protoss.png",
-        "Starting Vespene": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/icons/icon-gas-terran.png",
-        "Starting Supply": "https://static.wikia.nocookie.net/starcraft/images/d/d3/TerranSupply_SC2_Icon1.gif",
-
-        "Infantry Weapons Level 1": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-infantryweaponslevel1.png",
-        "Infantry Weapons Level 2": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-infantryweaponslevel2.png",
-        "Infantry Weapons Level 3": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-infantryweaponslevel3.png",
-        "Infantry Armor Level 1": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-infantryarmorlevel1.png",
-        "Infantry Armor Level 2": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-infantryarmorlevel2.png",
-        "Infantry Armor Level 3": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-infantryarmorlevel3.png",
-        "Vehicle Weapons Level 1": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-vehicleweaponslevel1.png",
-        "Vehicle Weapons Level 2": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-vehicleweaponslevel2.png",
-        "Vehicle Weapons Level 3": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-vehicleweaponslevel3.png",
-        "Vehicle Armor Level 1": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-vehicleplatinglevel1.png",
-        "Vehicle Armor Level 2": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-vehicleplatinglevel2.png",
-        "Vehicle Armor Level 3": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-vehicleplatinglevel3.png",
-        "Ship Weapons Level 1": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-shipweaponslevel1.png",
-        "Ship Weapons Level 2": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-shipweaponslevel2.png",
-        "Ship Weapons Level 3": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-shipweaponslevel3.png",
-        "Ship Armor Level 1": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-shipplatinglevel1.png",
-        "Ship Armor Level 2": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-shipplatinglevel2.png",
-        "Ship Armor Level 3": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-shipplatinglevel3.png",
-
-        "Bunker": "https://static.wikia.nocookie.net/starcraft/images/c/c5/Bunker_SC2_Icon1.jpg",
-        "Missile Turret": "https://static.wikia.nocookie.net/starcraft/images/5/5f/MissileTurret_SC2_Icon1.jpg",
-        "Sensor Tower": "https://static.wikia.nocookie.net/starcraft/images/d/d2/SensorTower_SC2_Icon1.jpg",
-
-        "Projectile Accelerator (Bunker)": "https://0rganics.org/archipelago/sc2wol/ProjectileAccelerator.png",
-        "Neosteel Bunker (Bunker)": "https://0rganics.org/archipelago/sc2wol/NeosteelBunker.png",
-        "Titanium Housing (Missile Turret)": "https://0rganics.org/archipelago/sc2wol/TitaniumHousing.png",
-        "Hellstorm Batteries (Missile Turret)": "https://0rganics.org/archipelago/sc2wol/HellstormBatteries.png",
-        "Advanced Construction (SCV)": "https://0rganics.org/archipelago/sc2wol/AdvancedConstruction.png",
-        "Dual-Fusion Welders (SCV)": "https://0rganics.org/archipelago/sc2wol/Dual-FusionWelders.png",
-        "Fire-Suppression System (Building)": "https://0rganics.org/archipelago/sc2wol/Fire-SuppressionSystem.png",
-        "Orbital Command (Building)": "https://0rganics.org/archipelago/sc2wol/OrbitalCommandCampaign.png",
-
-        "Marine": "https://static.wikia.nocookie.net/starcraft/images/4/47/Marine_SC2_Icon1.jpg",
-        "Medic": "https://static.wikia.nocookie.net/starcraft/images/7/74/Medic_SC2_Rend1.jpg",
-        "Firebat": "https://static.wikia.nocookie.net/starcraft/images/3/3c/Firebat_SC2_Rend1.jpg",
-        "Marauder": "https://static.wikia.nocookie.net/starcraft/images/b/ba/Marauder_SC2_Icon1.jpg",
-        "Reaper": "https://static.wikia.nocookie.net/starcraft/images/7/7d/Reaper_SC2_Icon1.jpg",
-
-        "Stimpack (Marine)": "https://0rganics.org/archipelago/sc2wol/StimpacksCampaign.png",
-        "Super Stimpack (Marine)": "/static/static/icons/sc2/superstimpack.png",
-        "Combat Shield (Marine)": "https://0rganics.org/archipelago/sc2wol/CombatShieldCampaign.png",
-        "Laser Targeting System (Marine)": "/static/static/icons/sc2/lasertargetingsystem.png",
-        "Magrail Munitions (Marine)": "/static/static/icons/sc2/magrailmunitions.png",
-        "Optimized Logistics (Marine)": "/static/static/icons/sc2/optimizedlogistics.png",
-        "Advanced Medic Facilities (Medic)": "https://0rganics.org/archipelago/sc2wol/AdvancedMedicFacilities.png",
-        "Stabilizer Medpacks (Medic)": "https://0rganics.org/archipelago/sc2wol/StabilizerMedpacks.png",
-        "Restoration (Medic)": "/static/static/icons/sc2/restoration.png",
-        "Optical Flare (Medic)": "/static/static/icons/sc2/opticalflare.png",
-        "Optimized Logistics (Medic)": "/static/static/icons/sc2/optimizedlogistics.png",
-        "Incinerator Gauntlets (Firebat)": "https://0rganics.org/archipelago/sc2wol/IncineratorGauntlets.png",
-        "Juggernaut Plating (Firebat)": "https://0rganics.org/archipelago/sc2wol/JuggernautPlating.png",
-        "Stimpack (Firebat)": "https://0rganics.org/archipelago/sc2wol/StimpacksCampaign.png",
-        "Super Stimpack (Firebat)": "/static/static/icons/sc2/superstimpack.png",
-        "Optimized Logistics (Firebat)": "/static/static/icons/sc2/optimizedlogistics.png",
-        "Concussive Shells (Marauder)": "https://0rganics.org/archipelago/sc2wol/ConcussiveShellsCampaign.png",
-        "Kinetic Foam (Marauder)": "https://0rganics.org/archipelago/sc2wol/KineticFoam.png",
-        "Stimpack (Marauder)": "https://0rganics.org/archipelago/sc2wol/StimpacksCampaign.png",
-        "Super Stimpack (Marauder)": "/static/static/icons/sc2/superstimpack.png",
-        "Laser Targeting System (Marauder)": "/static/static/icons/sc2/lasertargetingsystem.png",
-        "Magrail Munitions (Marauder)": "/static/static/icons/sc2/magrailmunitions.png",
-        "Internal Tech Module (Marauder)": "/static/static/icons/sc2/internalizedtechmodule.png",
-        "U-238 Rounds (Reaper)": "https://0rganics.org/archipelago/sc2wol/U-238Rounds.png",
-        "G-4 Clusterbomb (Reaper)": "https://0rganics.org/archipelago/sc2wol/G-4Clusterbomb.png",
-        "Stimpack (Reaper)": "https://0rganics.org/archipelago/sc2wol/StimpacksCampaign.png",
-        "Super Stimpack (Reaper)": "/static/static/icons/sc2/superstimpack.png",
-        "Laser Targeting System (Reaper)": "/static/static/icons/sc2/lasertargetingsystem.png",
-        "Advanced Cloaking Field (Reaper)": "/static/static/icons/sc2/terran-cloak-color.png",
-        "Spider Mines (Reaper)": "/static/static/icons/sc2/spidermine.png",
-        "Combat Drugs (Reaper)": "/static/static/icons/sc2/reapercombatdrugs.png",
-
-        "Hellion": "https://static.wikia.nocookie.net/starcraft/images/5/56/Hellion_SC2_Icon1.jpg",
-        "Vulture": "https://static.wikia.nocookie.net/starcraft/images/d/da/Vulture_WoL.jpg",
-        "Goliath": "https://static.wikia.nocookie.net/starcraft/images/e/eb/Goliath_WoL.jpg",
-        "Diamondback": "https://static.wikia.nocookie.net/starcraft/images/a/a6/Diamondback_WoL.jpg",
-        "Siege Tank": "https://static.wikia.nocookie.net/starcraft/images/5/57/SiegeTank_SC2_Icon1.jpg",
-
-        "Twin-Linked Flamethrower (Hellion)": "https://0rganics.org/archipelago/sc2wol/Twin-LinkedFlamethrower.png",
-        "Thermite Filaments (Hellion)": "https://0rganics.org/archipelago/sc2wol/ThermiteFilaments.png",
-        "Hellbat Aspect (Hellion)": "/static/static/icons/sc2/hellionbattlemode.png",
-        "Smart Servos (Hellion)": "/static/static/icons/sc2/transformationservos.png",
-        "Optimized Logistics (Hellion)": "/static/static/icons/sc2/optimizedlogistics.png",
-        "Jump Jets (Hellion)": "/static/static/icons/sc2/jumpjets.png",
-        "Stimpack (Hellion)": "https://0rganics.org/archipelago/sc2wol/StimpacksCampaign.png",
-        "Super Stimpack (Hellion)": "/static/static/icons/sc2/superstimpack.png",
-        "Cerberus Mine (Spider Mine)": "https://0rganics.org/archipelago/sc2wol/CerberusMine.png",
-        "High Explosive Munition (Spider Mine)": "/static/static/icons/sc2/high-explosive-spidermine.png",
-        "Replenishable Magazine (Vulture)": "https://0rganics.org/archipelago/sc2wol/ReplenishableMagazine.png",
-        "Ion Thrusters (Vulture)": "/static/static/icons/sc2/emergencythrusters.png",
-        "Auto Launchers (Vulture)": "/static/static/icons/sc2/jotunboosters.png",
-        "Multi-Lock Weapons System (Goliath)": "https://0rganics.org/archipelago/sc2wol/Multi-LockWeaponsSystem.png",
-        "Ares-Class Targeting System (Goliath)": "https://0rganics.org/archipelago/sc2wol/Ares-ClassTargetingSystem.png",
-        "Jump Jets (Goliath)": "/static/static/icons/sc2/jumpjets.png",
-        "Optimized Logistics (Goliath)": "/static/static/icons/sc2/optimizedlogistics.png",
-        "Tri-Lithium Power Cell (Diamondback)": "https://0rganics.org/archipelago/sc2wol/Tri-LithiumPowerCell.png",
-        "Shaped Hull (Diamondback)": "https://0rganics.org/archipelago/sc2wol/ShapedHull.png",
-        "Hyperfluxor (Diamondback)": "/static/static/icons/sc2/hyperfluxor.png",
-        "Burst Capacitors (Diamondback)": "/static/static/icons/sc2/burstcapacitors.png",
-        "Optimized Logistics (Diamondback)": "/static/static/icons/sc2/optimizedlogistics.png",
-        "Maelstrom Rounds (Siege Tank)": "https://0rganics.org/archipelago/sc2wol/MaelstromRounds.png",
-        "Shaped Blast (Siege Tank)": "https://0rganics.org/archipelago/sc2wol/ShapedBlast.png",
-        "Jump Jets (Siege Tank)": "/static/static/icons/sc2/jumpjets.png",
-        "Spider Mines (Siege Tank)": "/static/static/icons/sc2/siegetank-spidermines.png",
-        "Smart Servos (Siege Tank)": "/static/static/icons/sc2/transformationservos.png",
-        "Graduating Range (Siege Tank)": "/static/static/icons/sc2/siegetankrange.png",
-        "Laser Targeting System (Siege Tank)": "/static/static/icons/sc2/lasertargetingsystem.png",
-        "Advanced Siege Tech (Siege Tank)": "/static/static/icons/sc2/improvedsiegemode.png",
-        "Internal Tech Module (Siege Tank)": "/static/static/icons/sc2/internalizedtechmodule.png",
-
-        "Medivac": "https://static.wikia.nocookie.net/starcraft/images/d/db/Medivac_SC2_Icon1.jpg",
-        "Wraith": "https://static.wikia.nocookie.net/starcraft/images/7/75/Wraith_WoL.jpg",
-        "Viking": "https://static.wikia.nocookie.net/starcraft/images/2/2a/Viking_SC2_Icon1.jpg",
-        "Banshee": "https://static.wikia.nocookie.net/starcraft/images/3/32/Banshee_SC2_Icon1.jpg",
-        "Battlecruiser": "https://static.wikia.nocookie.net/starcraft/images/f/f5/Battlecruiser_SC2_Icon1.jpg",
-
-        "Rapid Deployment Tube (Medivac)": "https://0rganics.org/archipelago/sc2wol/RapidDeploymentTube.png",
-        "Advanced Healing AI (Medivac)": "https://0rganics.org/archipelago/sc2wol/AdvancedHealingAI.png",
-        "Expanded Hull (Medivac)": "/static/static/icons/sc2/neosteelfortifiedarmor.png",
-        "Afterburners (Medivac)": "/static/static/icons/sc2/medivacemergencythrusters.png",
-        "Tomahawk Power Cells (Wraith)": "https://0rganics.org/archipelago/sc2wol/TomahawkPowerCells.png",
-        "Displacement Field (Wraith)": "https://0rganics.org/archipelago/sc2wol/DisplacementField.png",
-        "Advanced Laser Technology (Wraith)": "/static/static/icons/sc2/improvedburstlaser.png",
-        "Ripwave Missiles (Viking)": "https://0rganics.org/archipelago/sc2wol/RipwaveMissiles.png",
-        "Phobos-Class Weapons System (Viking)": "https://0rganics.org/archipelago/sc2wol/Phobos-ClassWeaponsSystem.png",
-        "Smart Servos (Viking)": "/static/static/icons/sc2/transformationservos.png",
-        "Magrail Munitions (Viking)": "/static/static/icons/sc2/magrailmunitions.png",
-        "Cross-Spectrum Dampeners (Banshee)": "/static/static/icons/sc2/crossspectrumdampeners.png",
-        "Advanced Cross-Spectrum Dampeners (Banshee)": "https://0rganics.org/archipelago/sc2wol/Cross-SpectrumDampeners.png",
-        "Shockwave Missile Battery (Banshee)": "https://0rganics.org/archipelago/sc2wol/ShockwaveMissileBattery.png",
-        "Hyperflight Rotors (Banshee)": "/static/static/icons/sc2/hyperflightrotors.png",
-        "Laser Targeting System (Banshee)": "/static/static/icons/sc2/lasertargetingsystem.png",
-        "Internal Tech Module (Banshee)": "/static/static/icons/sc2/internalizedtechmodule.png",
-        "Missile Pods (Battlecruiser)": "https://0rganics.org/archipelago/sc2wol/MissilePods.png",
-        "Defensive Matrix (Battlecruiser)": "https://0rganics.org/archipelago/sc2wol/DefensiveMatrix.png",
-        "Tactical Jump (Battlecruiser)": "/static/static/icons/sc2/warpjump.png",
-        "Cloak (Battlecruiser)": "/static/static/icons/sc2/terran-cloak-color.png",
-        "ATX Laser Battery (Battlecruiser)": "/static/static/icons/sc2/specialordance.png",
-        "Optimized Logistics (Battlecruiser)": "/static/static/icons/sc2/optimizedlogistics.png",
-        "Internal Tech Module (Battlecruiser)": "/static/static/icons/sc2/internalizedtechmodule.png",
-
-        "Ghost": "https://static.wikia.nocookie.net/starcraft/images/6/6e/Ghost_SC2_Icon1.jpg",
-        "Spectre": "https://static.wikia.nocookie.net/starcraft/images/0/0d/Spectre_WoL.jpg",
-        "Thor": "https://static.wikia.nocookie.net/starcraft/images/e/ef/Thor_SC2_Icon1.jpg",
-
-        "Widow Mine": "/static/static/icons/sc2/widowmine.png",
-        "Cyclone": "/static/static/icons/sc2/cyclone.png",
-        "Liberator": "/static/static/icons/sc2/liberator.png",
-        "Valkyrie": "/static/static/icons/sc2/valkyrie.png",
-
-        "Ocular Implants (Ghost)": "https://0rganics.org/archipelago/sc2wol/OcularImplants.png",
-        "Crius Suit (Ghost)": "https://0rganics.org/archipelago/sc2wol/CriusSuit.png",
-        "EMP Rounds (Ghost)": "/static/static/icons/sc2/terran-emp-color.png",
-        "Lockdown (Ghost)": "/static/static/icons/sc2/lockdown.png",
-        "Psionic Lash (Spectre)": "https://0rganics.org/archipelago/sc2wol/PsionicLash.png",
-        "Nyx-Class Cloaking Module (Spectre)": "https://0rganics.org/archipelago/sc2wol/Nyx-ClassCloakingModule.png",
-        "Impaler Rounds (Spectre)": "/static/static/icons/sc2/impalerrounds.png",
-        "330mm Barrage Cannon (Thor)": "https://0rganics.org/archipelago/sc2wol/330mmBarrageCannon.png",
-        "Immortality Protocol (Thor)": "https://0rganics.org/archipelago/sc2wol/ImmortalityProtocol.png",
-        "High Impact Payload (Thor)": "/static/static/icons/sc2/thorsiegemode.png",
-        "Smart Servos (Thor)": "/static/static/icons/sc2/transformationservos.png",
-
-        "Optimized Logistics (Predator)": "/static/static/icons/sc2/optimizedlogistics.png",
-        "Drilling Claws (Widow Mine)": "/static/static/icons/sc2/drillingclaws.png",
-        "Concealment (Widow Mine)": "/static/static/icons/sc2/widowminehidden.png",
-        "Black Market Launchers (Widow Mine)": "/static/static/icons/sc2/widowmine-attackrange.png",
-        "Executioner Missiles (Widow Mine)": "/static/static/icons/sc2/widowmine-deathblossom.png",
-        "Mag-Field Accelerators (Cyclone)": "/static/static/icons/sc2/magfieldaccelerator.png",
-        "Mag-Field Launchers (Cyclone)": "/static/static/icons/sc2/cyclonerangeupgrade.png",
-        "Targeting Optics (Cyclone)": "/static/static/icons/sc2/targetingoptics.png",
-        "Rapid Fire Launchers (Cyclone)": "/static/static/icons/sc2/ripwavemissiles.png",
-        "Bio Mechanical Repair Drone (Raven)": "/static/static/icons/sc2/biomechanicaldrone.png",
-        "Spider Mines (Raven)": "/static/static/icons/sc2/siegetank-spidermines.png",
-        "Railgun Turret (Raven)": "/static/static/icons/sc2/autoturretblackops.png",
-        "Hunter-Seeker Weapon (Raven)": "/static/static/icons/sc2/specialordance.png",
-        "Interference Matrix (Raven)": "/static/static/icons/sc2/interferencematrix.png",
-        "Anti-Armor Missile (Raven)": "/static/static/icons/sc2/shreddermissile.png",
-        "Internal Tech Module (Raven)": "/static/static/icons/sc2/internalizedtechmodule.png",
-        "EMP Shockwave (Science Vessel)": "/static/static/icons/sc2/staticempblast.png",
-        "Defensive Matrix (Science Vessel)": "https://0rganics.org/archipelago/sc2wol/DefensiveMatrix.png",
-        "Advanced Ballistics (Liberator)": "/static/static/icons/sc2/advanceballistics.png",
-        "Raid Artillery (Liberator)": "/static/static/icons/sc2/terrandefendermodestructureattack.png",
-        "Cloak (Liberator)": "/static/static/icons/sc2/terran-cloak-color.png",
-        "Laser Targeting System (Liberator)": "/static/static/icons/sc2/lasertargetingsystem.png",
-        "Optimized Logistics (Liberator)": "/static/static/icons/sc2/optimizedlogistics.png",
-        "Enhanced Cluster Launchers (Valkyrie)": "https://0rganics.org/archipelago/sc2wol/HellstormBatteries.png",
-        "Shaped Hull (Valkyrie)": "https://0rganics.org/archipelago/sc2wol/ShapedHull.png",
-        "Burst Lasers (Valkyrie)": "/static/static/icons/sc2/improvedburstlaser.png",
-        "Afterburners (Valkyrie)": "/static/static/icons/sc2/medivacemergencythrusters.png",
-
-        "War Pigs": "https://static.wikia.nocookie.net/starcraft/images/e/ed/WarPigs_SC2_Icon1.jpg",
-        "Devil Dogs": "https://static.wikia.nocookie.net/starcraft/images/3/33/DevilDogs_SC2_Icon1.jpg",
-        "Hammer Securities": "https://static.wikia.nocookie.net/starcraft/images/3/3b/HammerSecurity_SC2_Icon1.jpg",
-        "Spartan Company": "https://static.wikia.nocookie.net/starcraft/images/b/be/SpartanCompany_SC2_Icon1.jpg",
-        "Siege Breakers": "https://static.wikia.nocookie.net/starcraft/images/3/31/SiegeBreakers_SC2_Icon1.jpg",
-        "Hel's Angel": "https://static.wikia.nocookie.net/starcraft/images/6/63/HelsAngels_SC2_Icon1.jpg",
-        "Dusk Wings": "https://static.wikia.nocookie.net/starcraft/images/5/52/DuskWings_SC2_Icon1.jpg",
-        "Jackson's Revenge": "https://static.wikia.nocookie.net/starcraft/images/9/95/JacksonsRevenge_SC2_Icon1.jpg",
-
-        "Ultra-Capacitors": "https://static.wikia.nocookie.net/starcraft/images/2/23/SC2_Lab_Ultra_Capacitors_Icon.png",
-        "Vanadium Plating": "https://static.wikia.nocookie.net/starcraft/images/6/67/SC2_Lab_VanPlating_Icon.png",
-        "Orbital Depots": "https://static.wikia.nocookie.net/starcraft/images/0/01/SC2_Lab_Orbital_Depot_Icon.png",
-        "Micro-Filtering": "https://static.wikia.nocookie.net/starcraft/images/2/20/SC2_Lab_MicroFilter_Icon.png",
-        "Automated Refinery": "https://static.wikia.nocookie.net/starcraft/images/7/71/SC2_Lab_Auto_Refinery_Icon.png",
-        "Command Center Reactor": "https://static.wikia.nocookie.net/starcraft/images/e/ef/SC2_Lab_CC_Reactor_Icon.png",
-        "Raven": "https://static.wikia.nocookie.net/starcraft/images/1/19/SC2_Lab_Raven_Icon.png",
-        "Science Vessel": "https://static.wikia.nocookie.net/starcraft/images/c/c3/SC2_Lab_SciVes_Icon.png",
-        "Tech Reactor": "https://static.wikia.nocookie.net/starcraft/images/c/c5/SC2_Lab_Tech_Reactor_Icon.png",
-        "Orbital Strike": "https://static.wikia.nocookie.net/starcraft/images/d/df/SC2_Lab_Orb_Strike_Icon.png",
-
-        "Shrike Turret (Bunker)": "https://static.wikia.nocookie.net/starcraft/images/4/44/SC2_Lab_Shrike_Turret_Icon.png",
-        "Fortified Bunker (Bunker)": "https://static.wikia.nocookie.net/starcraft/images/4/4f/SC2_Lab_FortBunker_Icon.png",
-        "Planetary Fortress": "https://static.wikia.nocookie.net/starcraft/images/0/0b/SC2_Lab_PlanetFortress_Icon.png",
-        "Perdition Turret": "https://static.wikia.nocookie.net/starcraft/images/a/af/SC2_Lab_PerdTurret_Icon.png",
-        "Predator": "https://static.wikia.nocookie.net/starcraft/images/8/83/SC2_Lab_Predator_Icon.png",
-        "Hercules": "https://static.wikia.nocookie.net/starcraft/images/4/40/SC2_Lab_Hercules_Icon.png",
-        "Cellular Reactor": "https://static.wikia.nocookie.net/starcraft/images/d/d8/SC2_Lab_CellReactor_Icon.png",
-        "Regenerative Bio-Steel Level 1": "/static/static/icons/sc2/SC2_Lab_BioSteel_L1.png",
-        "Regenerative Bio-Steel Level 2": "/static/static/icons/sc2/SC2_Lab_BioSteel_L2.png",
-        "Hive Mind Emulator": "https://static.wikia.nocookie.net/starcraft/images/b/bc/SC2_Lab_Hive_Emulator_Icon.png",
-        "Psi Disrupter": "https://static.wikia.nocookie.net/starcraft/images/c/cf/SC2_Lab_Psi_Disruptor_Icon.png",
-
-        "Zealot": "https://static.wikia.nocookie.net/starcraft/images/6/6e/Icon_Protoss_Zealot.jpg",
-        "Stalker": "https://static.wikia.nocookie.net/starcraft/images/0/0d/Icon_Protoss_Stalker.jpg",
-        "High Templar": "https://static.wikia.nocookie.net/starcraft/images/a/a0/Icon_Protoss_High_Templar.jpg",
-        "Dark Templar": "https://static.wikia.nocookie.net/starcraft/images/9/90/Icon_Protoss_Dark_Templar.jpg",
-        "Immortal": "https://static.wikia.nocookie.net/starcraft/images/c/c1/Icon_Protoss_Immortal.jpg",
-        "Colossus": "https://static.wikia.nocookie.net/starcraft/images/4/40/Icon_Protoss_Colossus.jpg",
-        "Phoenix": "https://static.wikia.nocookie.net/starcraft/images/b/b1/Icon_Protoss_Phoenix.jpg",
-        "Void Ray": "https://static.wikia.nocookie.net/starcraft/images/1/1d/VoidRay_SC2_Rend1.jpg",
-        "Carrier": "https://static.wikia.nocookie.net/starcraft/images/2/2c/Icon_Protoss_Carrier.jpg",
-
-        "Nothing": "",
-    }
-    sc2wol_location_ids = {
-        "Liberation Day": range(SC2WOL_LOC_ID_OFFSET + 100, SC2WOL_LOC_ID_OFFSET + 200),
-        "The Outlaws": range(SC2WOL_LOC_ID_OFFSET + 200, SC2WOL_LOC_ID_OFFSET + 300),
-        "Zero Hour": range(SC2WOL_LOC_ID_OFFSET + 300, SC2WOL_LOC_ID_OFFSET + 400),
-        "Evacuation": range(SC2WOL_LOC_ID_OFFSET + 400, SC2WOL_LOC_ID_OFFSET + 500),
-        "Outbreak": range(SC2WOL_LOC_ID_OFFSET + 500, SC2WOL_LOC_ID_OFFSET + 600),
-        "Safe Haven": range(SC2WOL_LOC_ID_OFFSET + 600, SC2WOL_LOC_ID_OFFSET + 700),
-        "Haven's Fall": range(SC2WOL_LOC_ID_OFFSET + 700, SC2WOL_LOC_ID_OFFSET + 800),
-        "Smash and Grab": range(SC2WOL_LOC_ID_OFFSET + 800, SC2WOL_LOC_ID_OFFSET + 900),
-        "The Dig": range(SC2WOL_LOC_ID_OFFSET + 900, SC2WOL_LOC_ID_OFFSET + 1000),
-        "The Moebius Factor": range(SC2WOL_LOC_ID_OFFSET + 1000, SC2WOL_LOC_ID_OFFSET + 1100),
-        "Supernova": range(SC2WOL_LOC_ID_OFFSET + 1100, SC2WOL_LOC_ID_OFFSET + 1200),
-        "Maw of the Void": range(SC2WOL_LOC_ID_OFFSET + 1200, SC2WOL_LOC_ID_OFFSET + 1300),
-        "Devil's Playground": range(SC2WOL_LOC_ID_OFFSET + 1300, SC2WOL_LOC_ID_OFFSET + 1400),
-        "Welcome to the Jungle": range(SC2WOL_LOC_ID_OFFSET + 1400, SC2WOL_LOC_ID_OFFSET + 1500),
-        "Breakout": range(SC2WOL_LOC_ID_OFFSET + 1500, SC2WOL_LOC_ID_OFFSET + 1600),
-        "Ghost of a Chance": range(SC2WOL_LOC_ID_OFFSET + 1600, SC2WOL_LOC_ID_OFFSET + 1700),
-        "The Great Train Robbery": range(SC2WOL_LOC_ID_OFFSET + 1700, SC2WOL_LOC_ID_OFFSET + 1800),
-        "Cutthroat": range(SC2WOL_LOC_ID_OFFSET + 1800, SC2WOL_LOC_ID_OFFSET + 1900),
-        "Engine of Destruction": range(SC2WOL_LOC_ID_OFFSET + 1900, SC2WOL_LOC_ID_OFFSET + 2000),
-        "Media Blitz": range(SC2WOL_LOC_ID_OFFSET + 2000, SC2WOL_LOC_ID_OFFSET + 2100),
-        "Piercing the Shroud": range(SC2WOL_LOC_ID_OFFSET + 2100, SC2WOL_LOC_ID_OFFSET + 2200),
-        "Whispers of Doom": range(SC2WOL_LOC_ID_OFFSET + 2200, SC2WOL_LOC_ID_OFFSET + 2300),
-        "A Sinister Turn": range(SC2WOL_LOC_ID_OFFSET + 2300, SC2WOL_LOC_ID_OFFSET + 2400),
-        "Echoes of the Future": range(SC2WOL_LOC_ID_OFFSET + 2400, SC2WOL_LOC_ID_OFFSET + 2500),
-        "In Utter Darkness": range(SC2WOL_LOC_ID_OFFSET + 2500, SC2WOL_LOC_ID_OFFSET + 2600),
-        "Gates of Hell": range(SC2WOL_LOC_ID_OFFSET + 2600, SC2WOL_LOC_ID_OFFSET + 2700),
-        "Belly of the Beast": range(SC2WOL_LOC_ID_OFFSET + 2700, SC2WOL_LOC_ID_OFFSET + 2800),
-        "Shatter the Sky": range(SC2WOL_LOC_ID_OFFSET + 2800, SC2WOL_LOC_ID_OFFSET + 2900),
-    }
-
-    display_data = {}
-
-    # Grouped Items
-    grouped_item_ids = {
-        "Progressive Weapon Upgrade": 107 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Armor Upgrade": 108 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Infantry Upgrade": 109 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Vehicle Upgrade": 110 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Ship Upgrade": 111 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Weapon/Armor Upgrade": 112 + SC2WOL_ITEM_ID_OFFSET
-    }
-    grouped_item_replacements = {
-        "Progressive Weapon Upgrade": ["Progressive Infantry Weapon", "Progressive Vehicle Weapon", "Progressive Ship Weapon"],
-        "Progressive Armor Upgrade": ["Progressive Infantry Armor", "Progressive Vehicle Armor", "Progressive Ship Armor"],
-        "Progressive Infantry Upgrade": ["Progressive Infantry Weapon", "Progressive Infantry Armor"],
-        "Progressive Vehicle Upgrade": ["Progressive Vehicle Weapon", "Progressive Vehicle Armor"],
-        "Progressive Ship Upgrade": ["Progressive Ship Weapon", "Progressive Ship Armor"]
-    }
-    grouped_item_replacements["Progressive Weapon/Armor Upgrade"] = grouped_item_replacements["Progressive Weapon Upgrade"] + grouped_item_replacements["Progressive Armor Upgrade"]
-    replacement_item_ids = {
-        "Progressive Infantry Weapon": 100 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Infantry Armor": 102 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Vehicle Weapon": 103 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Vehicle Armor": 104 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Ship Weapon": 105 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Ship Armor": 106 + SC2WOL_ITEM_ID_OFFSET,
-    }
-    for grouped_item_name, grouped_item_id in grouped_item_ids.items():
-        count: int = inventory[grouped_item_id]
-        if count > 0:
-            for replacement_item in grouped_item_replacements[grouped_item_name]:
-                replacement_id: int = replacement_item_ids[replacement_item]
-                inventory[replacement_id] = count
-
-    # Determine display for progressive items
-    progressive_items = {
-        "Progressive Infantry Weapon": 100 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Infantry Armor": 102 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Vehicle Weapon": 103 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Vehicle Armor": 104 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Ship Weapon": 105 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Ship Armor": 106 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Stimpack (Marine)": 208 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Stimpack (Firebat)": 226 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Stimpack (Marauder)": 228 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Stimpack (Reaper)": 250 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Stimpack (Hellion)": 259 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive High Impact Payload (Thor)": 361 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Cross-Spectrum Dampeners (Banshee)": 316 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Regenerative Bio-Steel": 617 + SC2WOL_ITEM_ID_OFFSET
-    }
-    progressive_names = {
-        "Progressive Infantry Weapon": ["Infantry Weapons Level 1", "Infantry Weapons Level 1", "Infantry Weapons Level 2", "Infantry Weapons Level 3"],
-        "Progressive Infantry Armor": ["Infantry Armor Level 1", "Infantry Armor Level 1", "Infantry Armor Level 2", "Infantry Armor Level 3"],
-        "Progressive Vehicle Weapon": ["Vehicle Weapons Level 1", "Vehicle Weapons Level 1", "Vehicle Weapons Level 2", "Vehicle Weapons Level 3"],
-        "Progressive Vehicle Armor": ["Vehicle Armor Level 1", "Vehicle Armor Level 1", "Vehicle Armor Level 2", "Vehicle Armor Level 3"],
-        "Progressive Ship Weapon": ["Ship Weapons Level 1", "Ship Weapons Level 1", "Ship Weapons Level 2", "Ship Weapons Level 3"],
-        "Progressive Ship Armor": ["Ship Armor Level 1", "Ship Armor Level 1", "Ship Armor Level 2", "Ship Armor Level 3"],
-        "Progressive Stimpack (Marine)": ["Stimpack (Marine)", "Stimpack (Marine)", "Super Stimpack (Marine)"],
-        "Progressive Stimpack (Firebat)": ["Stimpack (Firebat)", "Stimpack (Firebat)", "Super Stimpack (Firebat)"],
-        "Progressive Stimpack (Marauder)": ["Stimpack (Marauder)", "Stimpack (Marauder)", "Super Stimpack (Marauder)"],
-        "Progressive Stimpack (Reaper)": ["Stimpack (Reaper)", "Stimpack (Reaper)", "Super Stimpack (Reaper)"],
-        "Progressive Stimpack (Hellion)": ["Stimpack (Hellion)", "Stimpack (Hellion)", "Super Stimpack (Hellion)"],
-        "Progressive High Impact Payload (Thor)": ["High Impact Payload (Thor)", "High Impact Payload (Thor)", "Smart Servos (Thor)"],
-        "Progressive Cross-Spectrum Dampeners (Banshee)": ["Cross-Spectrum Dampeners (Banshee)", "Cross-Spectrum Dampeners (Banshee)", "Advanced Cross-Spectrum Dampeners (Banshee)"],
-        "Progressive Regenerative Bio-Steel": ["Regenerative Bio-Steel Level 1", "Regenerative Bio-Steel Level 1", "Regenerative Bio-Steel Level 2"]
-    }
-    for item_name, item_id in progressive_items.items():
-        level = min(inventory[item_id], len(progressive_names[item_name]) - 1)
-        display_name = progressive_names[item_name][level]
-        base_name = (item_name.split(maxsplit=1)[1].lower()
-                     .replace(' ', '_')
-                     .replace("-", "")
-                     .replace("(", "")
-                     .replace(")", ""))
-        display_data[base_name + "_level"] = level
-        display_data[base_name + "_url"] = icons[display_name]
-        display_data[base_name + "_name"] = display_name
-
-    # Multi-items
-    multi_items = {
-        "+15 Starting Minerals": 800 + SC2WOL_ITEM_ID_OFFSET,
-        "+15 Starting Vespene": 801 + SC2WOL_ITEM_ID_OFFSET,
-        "+2 Starting Supply": 802 + SC2WOL_ITEM_ID_OFFSET
-    }
-    for item_name, item_id in multi_items.items():
-        base_name = item_name.split()[-1].lower()
-        count = inventory[item_id]
-        if base_name == "supply":
-            count = count * 2
-            display_data[base_name + "_count"] = count
-        else:
-            count = count * 15
-            display_data[base_name + "_count"] = count
-
-    # Victory condition
-    game_state = multisave.get("client_game_state", {}).get((team, player), 0)
-    display_data['game_finished'] = game_state == 30
-
-    # Turn location IDs into mission objective counts
-    checked_locations = multisave.get("location_checks", {}).get((team, player), set())
-    lookup_name = lambda id: lookup_any_location_id_to_name[id]
-    location_info = {mission_name: {lookup_name(id): (id in checked_locations) for id in mission_locations if id in set(locations[player])} for mission_name, mission_locations in sc2wol_location_ids.items()}
-    checks_done = {mission_name: len([id for id in mission_locations if id in checked_locations and id in set(locations[player])]) for mission_name, mission_locations in sc2wol_location_ids.items()}
-    checks_done['Total'] = len(checked_locations)
-    checks_in_area = {mission_name: len([id for id in mission_locations if id in set(locations[player])]) for mission_name, mission_locations in sc2wol_location_ids.items()}
-    checks_in_area['Total'] = sum(checks_in_area.values())
-
-    return render_template("sc2wolTracker.html",
-                           inventory=inventory, icons=icons,
-                           acquired_items={lookup_any_item_id_to_name[id] for id in inventory if
-                                           id in lookup_any_item_id_to_name},
-                           player=player, team=team, room=room, player_name=playerName,
-                           checks_done=checks_done, checks_in_area=checks_in_area, location_info=location_info,
-                           **display_data)
-
-def __renderChecksfinder(multisave: Dict[str, Any], room: Room, locations: Dict[int, Dict[int, Tuple[int, int, int]]],
-                             inventory: Counter, team: int, player: int, playerName: str,
-                             seed_checks_in_area: Dict[int, Dict[str, int]], checks_done: Dict[str, int], slot_data: Dict, saving_second: int) -> str:
-
-    icons = {
-        "Checks Available": "https://0rganics.org/archipelago/cf/spr_tiles_3.png",
-        "Map Width": "https://0rganics.org/archipelago/cf/spr_tiles_4.png",
-        "Map Height": "https://0rganics.org/archipelago/cf/spr_tiles_5.png",
-        "Map Bombs": "https://0rganics.org/archipelago/cf/spr_tiles_6.png",
-
-        "Nothing": "",
-    }
-
-    checksfinder_location_ids = {
-        "Tile 1": 81000,
-        "Tile 2": 81001,
-        "Tile 3": 81002,
-        "Tile 4": 81003,
-        "Tile 5": 81004,
-        "Tile 6": 81005,
-        "Tile 7": 81006,
-        "Tile 8": 81007,
-        "Tile 9": 81008,
-        "Tile 10": 81009,
-        "Tile 11": 81010,
-        "Tile 12": 81011,
-        "Tile 13": 81012,
-        "Tile 14": 81013,
-        "Tile 15": 81014,
-        "Tile 16": 81015,
-        "Tile 17": 81016,
-        "Tile 18": 81017,
-        "Tile 19": 81018,
-        "Tile 20": 81019,
-        "Tile 21": 81020,
-        "Tile 22": 81021,
-        "Tile 23": 81022,
-        "Tile 24": 81023,
-        "Tile 25": 81024,
-    }
-
-    display_data = {}
-
-    # Multi-items
-    multi_items = {
-        "Map Width": 80000,
-        "Map Height": 80001,
-        "Map Bombs": 80002
-    }
-    for item_name, item_id in multi_items.items():
-        base_name = item_name.split()[-1].lower()
-        count = inventory[item_id]
-        display_data[base_name + "_count"] = count
-        display_data[base_name + "_display"] = count + 5
-
-    # Get location info
+def __render_generic_tracker(multisave: dict, room_data: RoomData, team: int, player: int, inventory: Counter) -> str:
     checked_locations = multisave.get("location_checks", {}).get((team, player), set())
-    lookup_name = lambda id: lookup_any_location_id_to_name[id]
-    location_info = {tile_name: {lookup_name(tile_location): (tile_location in checked_locations)} for tile_name, tile_location in checksfinder_location_ids.items() if tile_location in set(locations[player])}
-    checks_done = {tile_name: len([tile_location]) for tile_name, tile_location in checksfinder_location_ids.items() if tile_location in checked_locations and tile_location in set(locations[player])}
-    checks_done['Total'] = len(checked_locations)
-    checks_in_area = checks_done
-
-    # Calculate checks available
-    display_data["checks_unlocked"] = min(display_data["width_count"] + display_data["height_count"] + display_data["bombs_count"] + 5, 25)
-    display_data["checks_available"] = max(display_data["checks_unlocked"] - len(checked_locations), 0)
-
-    # Victory condition
-    game_state = multisave.get("client_game_state", {}).get((team, player), 0)
-    display_data['game_finished'] = game_state == 30
-
-    return render_template("checksfinderTracker.html",
-                            inventory=inventory, icons=icons,
-                            acquired_items={lookup_any_item_id_to_name[id] for id in inventory if
-                                            id in lookup_any_item_id_to_name},
-                            player=player, team=team, room=room, player_name=playerName,
-                            checks_done=checks_done, checks_in_area=checks_in_area, location_info=location_info,
-                            **display_data)
-
-def __renderGenericTracker(multisave: Dict[str, Any], room: Room, locations: Dict[int, Dict[int, Tuple[int, int, int]]],
-                           inventory: Counter, team: int, player: int, playerName: str,
-                           seed_checks_in_area: Dict[int, Dict[str, int]], checks_done: Dict[str, int],
-                           saving_second: int, custom_locations: Dict[int, str], custom_items: Dict[int, str]) -> str:
+    received_items = multisave.get('received_items', {}).get((team, player, True), [])
+    received_items_in_order = {}
+
+    # Add received index to all received items, excluding starting inventory.
+    for received_index, network_item in enumerate(received_items, start=1):
+        received_items_in_order[network_item.item] = received_index
+
+    return render_template(
+        template_name_or_list="generic-tracker.html",
+        room=room_data.room,
+        team=team,
+        player=player,
+        player_name=room_data.names[team][player],
+        inventory=inventory,
+        checked_locations=checked_locations,
+        not_checked_locations=set(room_data.locations[player]) - checked_locations,
+        received_items=received_items_in_order,
+        saving_second=room_data.saving_second,
+        location_name=room_data.location_id_to_name[room_data.games[player]],
+        item_name=room_data.item_id_to_name[room_data.games[player]],
+    )
 
-    checked_locations = multisave.get("location_checks", {}).get((team, player), set())
-    player_received_items = {}
-    if multisave.get('version', 0) > 0:
-        ordered_items = multisave.get('received_items', {}).get((team, player, True), [])
-    else:
-        ordered_items = multisave.get('received_items', {}).get((team, player), [])
-
-    # add numbering to all items but starter_inventory
-    for order_index, networkItem in enumerate(ordered_items, start=1):
-        player_received_items[networkItem.item] = order_index
-
-    return render_template("genericTracker.html",
-                           inventory=inventory,
-                           player=player, team=team, room=room, player_name=playerName,
-                           checked_locations=checked_locations,
-                           not_checked_locations=set(locations[player]) - checked_locations,
-                           received_items=player_received_items, saving_second=saving_second,
-                           custom_items=custom_items, custom_locations=custom_locations)
-
-
-def get_enabled_multiworld_trackers(room: Room, current: str):
-    enabled = [
-        {
-            "name": "Generic",
-            "endpoint": "get_multiworld_tracker",
-            "current": current == "Generic"
-         }
-    ]
-    for game_name, endpoint in multi_trackers.items():
+
+def get_enabled_multiworld_trackers(room: Room, current: str) -> List[Dict[str, Any]]:
+    enabled = [{
+        "name": "Generic",
+        "endpoint": "render_generic_multiworld_tracker",
+        "current": current == "Generic"
+    }]
+
+    # Render the multitracker for any games that exist in the current room if they are defined.
+    for game_name, endpoint in multiworld_trackers.items():
         if any(slot.game == game_name for slot in room.seed.slots) or current == game_name:
             enabled.append({
                 "name": game_name,
                 "endpoint": endpoint.__name__,
-                "current": current == game_name}
-            )
+                "current": current == game_name
+            })
+
     return enabled
 
 
-def _get_multiworld_tracker_data(tracker: UUID) -> typing.Optional[typing.Dict[str, typing.Any]]:
+def get_room_state(tracker: UUID) -> Optional[RoomState]:
     room: Room = Room.get(tracker=tracker)
     if not room:
         return None
 
-    locations, names, use_door_tracker, checks_in_area, player_location_to_area, \
-        precollected_items, games, slot_data, groups, saving_second, custom_locations, custom_items = \
-        get_static_room_data(room)
-
-    checks_done = {teamnumber: {playernumber: {loc_name: 0 for loc_name in default_locations}
-                                for playernumber in range(1, len(team) + 1) if playernumber not in groups}
-                   for teamnumber, team in enumerate(names)}
-
-    percent_total_checks_done = {teamnumber: {playernumber: 0
-                                for playernumber in range(1, len(team) + 1) if playernumber not in groups}
-                    for teamnumber, team in enumerate(names)}
+    room_data = get_static_room_data(room)
+
+    # Prepare location counters and hints.
+    locations_complete = {}
+    total_team_locations = {}
+    percentage_of_locations_complete = {}
+    for team, team_members in enumerate(room_data.names):
+        locations_complete.setdefault(team, {})
+        total_team_locations.setdefault(team, 0)
+        percentage_of_locations_complete.setdefault(team, {})
+        for player in range(1, len(team_members) + 1):
+            if player in room_data.groups:
+                continue
 
-    total_locations = {teamnumber: sum(len(locations[playernumber])
-                                for playernumber in range(1, len(team) + 1) if playernumber not in groups)
-                    for teamnumber, team in enumerate(names)}
+            locations_complete[team][player] = 0
+            total_team_locations[team] += len(room_data.locations[player])
+            percentage_of_locations_complete[team][player] = 0
 
-    hints = {team: set() for team in range(len(names))}
+    # Load save data.
     if room.multisave:
         multisave = restricted_loads(room.multisave)
     else:
         multisave = {}
+
+    # Load known hints.
+    hints = {}
     if "hints" in multisave:
         for (team, slot), slot_hints in multisave["hints"].items():
+            hints.setdefault(team, set())
             hints[team] |= set(slot_hints)
 
+    # Iterate over all checked locations and calculate overall state.
     for (team, player), locations_checked in multisave.get("location_checks", {}).items():
-        if player in groups:
+        if player in room_data.groups:
             continue
-        player_locations = locations[player]
-        checks_done[team][player]["Total"] = len(locations_checked)
-        percent_total_checks_done[team][player] = (
-            checks_done[team][player]["Total"] / len(player_locations) * 100
-            if player_locations
-            else 100
+
+        player_locations = room_data.locations[player]
+        locations_complete[team][player] = len(locations_checked)
+        percentage_of_locations_complete[team][player] = (
+            # If no locations exist, let's report 100%, so we don't divide by 0.
+            locations_complete[team][player] / len(player_locations) * 100 if player_locations else 100
         )
 
+    # Calculate activity.
     activity_timers = {}
     now = datetime.datetime.utcnow()
     for (team, player), timestamp in multisave.get("client_activity_timers", []):
         activity_timers[team, player] = now - datetime.datetime.utcfromtimestamp(timestamp)
 
+    # Build an easily accessible player names lookup.
     player_names = {}
     completed_worlds = 0
-    states: typing.Dict[typing.Tuple[int, int], int] = {}
-    for team, names in enumerate(names):
-        for player, name in enumerate(names, 1):
-            player_names[team, player] = name
+    states: Dict[Tuple[int, int], ClientStatus] = {}
+    for team, team_members in enumerate(room_data.names):
+        for player, player_name in enumerate(team_members, 1):
+            player_names[team, player] = player_name
             states[team, player] = multisave.get("client_game_state", {}).get((team, player), 0)
-            if states[team, player] == ClientStatus.CLIENT_GOAL and player not in groups:
+            if states[team, player] == ClientStatus.CLIENT_GOAL and player not in room_data.groups:
                 completed_worlds += 1
-    long_player_names = player_names.copy()
+
+    player_names_with_alias = player_names.copy()
     for (team, player), alias in multisave.get("name_aliases", {}).items():
         player_names[team, player] = alias
-        long_player_names[(team, player)] = f"{alias} ({long_player_names[team, player]})"
+        player_names_with_alias[(team, player)] = f"{alias} ({player_names_with_alias[team, player]})"
 
-    video = {}
+    # Video / Streaming links.
+    videos = {}
     for (team, player), data in multisave.get("video", []):
-        video[team, player] = data
-
-    return dict(
-        player_names=player_names, room=room, checks_done=checks_done,
-        percent_total_checks_done=percent_total_checks_done, checks_in_area=checks_in_area,
-        activity_timers=activity_timers, video=video, hints=hints,
-        long_player_names=long_player_names,
-        multisave=multisave, precollected_items=precollected_items, groups=groups,
-        locations=locations, total_locations=total_locations, games=games, states=states,
+        videos[team, player] = data
+
+    return RoomState(
+        multisave=multisave,
+        room_data=room_data,
+        hints=hints,
+        player_names=player_names,
+        player_names_with_alias=player_names_with_alias,
+        locations_complete=locations_complete,
+        percentage_of_locations_complete=percentage_of_locations_complete,
+        total_team_locations=total_team_locations,
         completed_worlds=completed_worlds,
-        custom_locations=custom_locations, custom_items=custom_items,
+        activity_timers=activity_timers,
+        states=states,
+        videos=videos,
     )
 
 
-def _get_inventory_data(data: typing.Dict[str, typing.Any]) \
-        -> typing.Dict[int, typing.Dict[int, typing.Dict[int, int]]]:
-    inventory: typing.Dict[int, typing.Dict[int, typing.Dict[int, int]]] = {
-        teamnumber: {playernumber: collections.Counter() for playernumber in team_data}
-        for teamnumber, team_data in data["checks_done"].items()
-    }
-
-    groups = data["groups"]
-
-    for (team, player), locations_checked in data["multisave"].get("location_checks", {}).items():
-        if player in data["groups"]:
-            continue
-        player_locations = data["locations"][player]
-        precollected = data["precollected_items"][player]
-        for item_id in precollected:
-            inventory[team][player][item_id] += 1
-        for location in locations_checked:
-            item_id, recipient, flags = player_locations[location]
-            recipients = groups.get(recipient, [recipient])
-            for recipient in recipients:
-                inventory[team][recipient][item_id] += 1
-    return inventory
-
-
-def _get_named_inventory(inventory: typing.Dict[int, int], custom_items: typing.Dict[int, str] = None) \
-        -> typing.Dict[str, int]:
-    """slow"""
-    if custom_items:
-        mapping = collections.ChainMap(custom_items, lookup_any_item_id_to_name)
-    else:
-        mapping = lookup_any_item_id_to_name
-
-    return collections.Counter({mapping.get(item_id, None): count for item_id, count in inventory.items()})
-
-
 @app.route('/tracker/<suuid:tracker>')
-@cache.memoize(timeout=60)  # multisave is currently created at most every minute
-def get_multiworld_tracker(tracker: UUID):
-    data = _get_multiworld_tracker_data(tracker)
-    if not data:
+@cache.memoize(timeout=TRACKER_CACHE_TIMEOUT_IN_SECONDS)
+def render_generic_multiworld_tracker(tracker: UUID):
+    room_state = get_room_state(tracker)
+    if not room_state:
         abort(404)
 
-    data["enabled_multiworld_trackers"] = get_enabled_multiworld_trackers(data["room"], "Generic")
+    return render_template(
+        template_name_or_list="multitracker.html",
+        enabled_multiworld_trackers=get_enabled_multiworld_trackers(room_state.room_data.room, "Generic"),
+        current_tracker="Generic",
+        **room_state._asdict(),
+    )
 
-    return render_template("multiTracker.html", **data)
 
-if "Factorio" in games:
+if "Factorio" in network_data_package["games"].keys():
     @app.route('/tracker/<suuid:tracker>/Factorio')
-    @cache.memoize(timeout=60)  # multisave is currently created at most every minute
-    def get_Factorio_multiworld_tracker(tracker: UUID):
-        data = _get_multiworld_tracker_data(tracker)
-        if not data:
+    @cache.memoize(timeout=TRACKER_CACHE_TIMEOUT_IN_SECONDS)
+    def render_Factorio_multiworld_tracker(tracker: UUID):
+        room_state = get_room_state(tracker)
+        if not room_state:
             abort(404)
 
-        data["inventory"] = _get_inventory_data(data)
-        data["named_inventory"] = {team_id : {
-            player_id: _get_named_inventory(inventory, data["custom_items"])
-            for player_id, inventory in team_inventory.items()
-        } for team_id, team_inventory in data["inventory"].items()}
-        data["enabled_multiworld_trackers"] = get_enabled_multiworld_trackers(data["room"], "Factorio")
+        def _get_inventory_data(room_state: RoomState) -> Dict[int, Dict[int, Dict[int, int]]]:
+            inventory: Dict[int, Dict[int, Dict[int, int]]] = {
+                team: {player: collections.Counter() for player in team_data}
+                for team, team_data in room_state.locations_complete.items()
+            }
 
-        return render_template("multiFactorioTracker.html", **data)
+            groups = room_state.room_data.groups
+            for (team, player), locations_checked in room_state.multisave.get("location_checks", {}).items():
+                if player in groups:
+                    continue
 
+                player_locations = room_state.room_data.locations[player]
+                starting_items = room_state.room_data.starting_items[player]
+                for item_id in starting_items:
+                    inventory[team][player][item_id] += 1
+                for location in locations_checked:
+                    item_id, recipient, flags = player_locations[location]
+                    recipients = groups.get(recipient, [recipient])
+                    for recipient in recipients:
+                        inventory[team][recipient][item_id] += 1
+            return inventory
+
+        def _get_named_inventory(inventory: Dict[int, int]) -> Dict[str, int]:
+            """slow"""
+            mapping = room_state.room_data.item_id_to_name["Factorio"]
+            return collections.Counter({mapping.get(item_id, None): count for item_id, count in inventory.items()})
+
+        inventory = _get_inventory_data(room_state)
+        return render_template(
+            template_name_or_list="multitracker__Factorio.html",
+            enabled_multiworld_trackers=get_enabled_multiworld_trackers(room_state.room_data.room, "Factorio"),
+            current_tracker="Factorio",
+            inventory=inventory,
+            named_inventory={
+                team_id: {
+                    player_id: _get_named_inventory(inventory)
+                    for player_id, inventory in team_inventory.items()
+                } for team_id, team_inventory in inventory.items()
+            },
+            **room_state._asdict(),
+        )
 
-@app.route('/tracker/<suuid:tracker>/A Link to the Past')
-@cache.memoize(timeout=60)  # multisave is currently created at most every minute
-def get_LttP_multiworld_tracker(tracker: UUID):
-    room: Room = Room.get(tracker=tracker)
-    if not room:
-        abort(404)
-    locations, names, use_door_tracker, seed_checks_in_area, player_location_to_area, \
-        precollected_items, games, slot_data, groups, saving_second, custom_locations, custom_items = \
-        get_static_room_data(room)
+    multiworld_trackers["Factorio"] = render_Factorio_multiworld_tracker
+
+if "A Link to the Past" in network_data_package["games"].keys():
+    @app.route('/tracker/<suuid:tracker>/A Link to the Past')
+    @cache.memoize(timeout=TRACKER_CACHE_TIMEOUT_IN_SECONDS)
+    def render_ALinkToThePast_multiworld_tracker(tracker: UUID):
+        room_state = get_room_state(tracker)
+        if not room_state:
+            abort(404)
 
-    inventory = {teamnumber: {playernumber: collections.Counter() for playernumber in range(1, len(team) + 1) if
-                              playernumber not in groups}
-                 for teamnumber, team in enumerate(names)}
+        # Helper objects.
+        alttp_id_lookup = {name: id for id, name in room_state.room_data.item_id_to_name["A Link to the Past"].items()}
 
-    checks_done = {teamnumber: {playernumber: {loc_name: 0 for loc_name in default_locations}
-                                for playernumber in range(1, len(team) + 1) if playernumber not in groups}
-                   for teamnumber, team in enumerate(names)}
+        groups = room_state.room_data.groups
+        inventory: Dict[int, Dict[int, Dict[int, int]]] = {
+            team: {player: collections.Counter() for player in team_data}
+            for team, team_data in room_state.locations_complete.items()
+        }
+        multi_items = {alttp_id_lookup[name] for name in ("Progressive Sword", "Progressive Bow", "Bottle", "Progressive Glove")}
+        links = {
+            "Bow":                   "Progressive Bow",
+            "Silver Arrows":         "Progressive Bow",
+            "Silver Bow":            "Progressive Bow",
+            "Progressive Bow (Alt)": "Progressive Bow",
+            "Bottle (Red Potion)":   "Bottle",
+            "Bottle (Green Potion)": "Bottle",
+            "Bottle (Blue Potion)":  "Bottle",
+            "Bottle (Fairy)":        "Bottle",
+            "Bottle (Bee)":          "Bottle",
+            "Bottle (Good Bee)":     "Bottle",
+            "Fighter Sword":         "Progressive Sword",
+            "Master Sword":          "Progressive Sword",
+            "Tempered Sword":        "Progressive Sword",
+            "Golden Sword":          "Progressive Sword",
+            "Power Glove":           "Progressive Glove",
+            "Titans Mitts":          "Progressive Glove",
+        }
+        links = {alttp_id_lookup[key]: alttp_id_lookup[value] for key, value in links.items()}
+        levels = {
+            "Fighter Sword":  1,
+            "Master Sword":   2,
+            "Tempered Sword": 3,
+            "Golden Sword":   4,
+            "Power Glove":    1,
+            "Titans Mitts":   2,
+            "Bow":            1,
+            "Silver Bow":     2,
+        }
+        tracking_names = [
+            "Progressive Sword", "Progressive Bow", "Book of Mudora", "Hammer", "Hookshot", "Magic Mirror", "Flute",
+            "Pegasus Boots", "Progressive Glove", "Flippers", "Moon Pearl", "Blue Boomerang", "Red Boomerang",
+            "Bug Catching Net", "Cape", "Shovel", "Lamp", "Mushroom", "Magic Powder", "Cane of Somaria",
+            "Cane of Byrna", "Fire Rod", "Ice Rod", "Bombos", "Ether", "Quake", "Bottle", "Triforce Piece", "Triforce",
+        ]
+        default_locations = {
+            "Light World": {
+                1572864, 1572865, 60034, 1572867, 1572868, 60037, 1572869, 1572866, 60040, 59788, 60046, 60175,
+                1572880, 60049, 60178, 1572883, 60052, 60181, 1572885, 60055, 60184, 191256, 60058, 60187, 1572884,
+                1572886, 1572887, 1572906, 60202, 60205, 59824, 166320, 1010170, 60208, 60211, 60214, 60217, 59836,
+                60220, 60223, 59839, 1573184, 60226, 975299, 1573188, 1573189, 188229, 60229, 60232, 1573193,
+                1573194, 60235, 1573187, 59845, 59854, 211407, 60238, 59857, 1573185, 1573186, 1572882, 212328,
+                59881, 59761, 59890, 59770, 193020, 212605
+            },
+            "Dark World": {
+                59776, 59779, 975237, 1572870, 60043, 1572881, 60190, 60193, 60196, 60199, 60840, 1573190, 209095,
+                1573192, 1573191, 60241, 60244, 60247, 60250, 59884, 59887, 60019, 60022, 60028, 60031
+            },
+            "Desert Palace": {1573216, 59842, 59851, 59791, 1573201, 59830},
+            "Eastern Palace": {1573200, 59827, 59893, 59767, 59833, 59773},
+            "Hyrule Castle": {60256, 60259, 60169, 60172, 59758, 59764, 60025, 60253},
+            "Agahnims Tower": {60082, 60085},
+            "Tower of Hera": {1573218, 59878, 59821, 1573202, 59896, 59899},
+            "Swamp Palace": {60064, 60067, 60070, 59782, 59785, 60073, 60076, 60079, 1573204, 60061},
+            "Thieves Town": {59905, 59908, 59911, 59914, 59917, 59920, 59923, 1573206},
+            "Skull Woods": {59809, 59902, 59848, 59794, 1573205, 59800, 59803, 59806},
+            "Ice Palace": {59872, 59875, 59812, 59818, 59860, 59797, 1573207, 59869},
+            "Misery Mire": {60001, 60004, 60007, 60010, 60013, 1573208, 59866, 59998},
+            "Turtle Rock": {59938, 59941, 59944, 1573209, 59947, 59950, 59953, 59956, 59926, 59929, 59932, 59935},
+            "Palace of Darkness": {
+                59968, 59971, 59974, 59977, 59980, 59983, 59986, 1573203, 59989, 59959, 59992, 59962, 59995,
+                59965
+            },
+            "Ganons Tower": {
+                60160, 60163, 60166, 60088, 60091, 60094, 60097, 60100, 60103, 60106, 60109, 60112, 60115, 60118,
+                60121, 60124, 60127, 1573217, 60130, 60133, 60136, 60139, 60142, 60145, 60148, 60151, 60157
+            },
+            "Total": set()
+        }
+        key_only_locations = {
+            "Light World": set(),
+            "Dark World": set(),
+            "Desert Palace": {0x140031, 0x14002b, 0x140061, 0x140028},
+            "Eastern Palace": {0x14005b, 0x140049},
+            "Hyrule Castle": {0x140037, 0x140034, 0x14000d, 0x14003d},
+            "Agahnims Tower": {0x140061, 0x140052},
+            "Tower of Hera": set(),
+            "Swamp Palace": {0x140019, 0x140016, 0x140013, 0x140010, 0x14000a},
+            "Thieves Town": {0x14005e, 0x14004f},
+            "Skull Woods": {0x14002e, 0x14001c},
+            "Ice Palace": {0x140004, 0x140022, 0x140025, 0x140046},
+            "Misery Mire": {0x140055, 0x14004c, 0x140064},
+            "Turtle Rock": {0x140058, 0x140007},
+            "Palace of Darkness": set(),
+            "Ganons Tower": {0x140040, 0x140043, 0x14003a, 0x14001f},
+            "Total": set()
+        }
+        location_to_area = {}
+        for area, locations in default_locations.items():
+            for location in locations:
+                location_to_area[location] = area
+        for area, locations in key_only_locations.items():
+            for location in locations:
+                location_to_area[location] = area
+
+        checks_in_area = {area: len(checks) for area, checks in default_locations.items()}
+        checks_in_area["Total"] = 216
+        ordered_areas = (
+            "Light World", "Dark World", "Hyrule Castle", "Agahnims Tower", "Eastern Palace", "Desert Palace",
+            "Tower of Hera", "Palace of Darkness", "Swamp Palace", "Skull Woods", "Thieves Town", "Ice Palace",
+            "Misery Mire", "Turtle Rock", "Ganons Tower", "Total"
+        )
 
-    percent_total_checks_done = {teamnumber: {playernumber: 0
-                                              for playernumber in range(1, len(team) + 1) if playernumber not in groups}
-                                 for teamnumber, team in enumerate(names)}
+        player_checks_in_area = {
+            player_id: {
+                area_name: len(room_state.room_data.multidata["checks_in_area"][player_id][area_name]) if area_name != "Total" else
+                           room_state.room_data.multidata["checks_in_area"][player_id]["Total"]
+                for area_name in ordered_areas
+            }
+            for player_id in room_state.room_data.multidata["checks_in_area"]
+        }
 
-    hints = {team: set() for team in range(len(names))}
-    if room.multisave:
-        multisave = restricted_loads(room.multisave)
-    else:
-        multisave = {}
-    if "hints" in multisave:
-        for (team, slot), slot_hints in multisave["hints"].items():
-            hints[team] |= set(slot_hints)
+        tracking_ids = []
+        for item in tracking_names:
+            tracking_ids.append(alttp_id_lookup[item])
+
+        from worlds.alttp import Items
+
+        small_key_ids = {}
+        big_key_ids = {}
+        ids_small_key = {}
+        ids_big_key = {}
+        for item_name, data in Items.item_table.items():
+            if "Key" in item_name:
+                area = item_name.split("(")[1][:-1]
+                if "Small" in item_name:
+                    small_key_ids[area] = data[2]
+                    ids_small_key[data[2]] = area
+                else:
+                    big_key_ids[area] = data[2]
+                    ids_big_key[data[2]] = area
 
-    def attribute_item(team: int, recipient: int, item: int):
-        nonlocal inventory
-        target_item = links.get(item, item)
-        if item in levels:  # non-progressive
-            inventory[team][recipient][target_item] = max(inventory[team][recipient][target_item], levels[item])
-        else:
-            inventory[team][recipient][target_item] += 1
+        def _get_location_table(checks_table: dict) -> dict:
+            loc_to_area = {}
+            for area, locations in checks_table.items():
+                if area == "Total":
+                    continue
+                for location in locations:
+                    loc_to_area[location] = area
+            return loc_to_area
+
+        def _attribute_item(team: int, recipient: int, item: int):
+            target_item = links.get(item, item)
+            if item in levels:  # non-progressive
+                inventory[team][recipient][target_item] = max(inventory[team][recipient][target_item], levels[item])
+            else:
+                inventory[team][recipient][target_item] += 1
+
+        player_location_to_area = {
+            player_id: _get_location_table(room_state.room_data.multidata["checks_in_area"][player_id])
+            for player_id in room_state.room_data.multidata["checks_in_area"]
+        }
 
-    for (team, player), locations_checked in multisave.get("location_checks", {}).items():
-        if player in groups:
-            continue
-        player_locations = locations[player]
-        if precollected_items:
-            precollected = precollected_items[player]
-            for item_id in precollected:
-                attribute_item(team, player, item_id)
-        for location in locations_checked:
-            if location not in player_locations or location not in player_location_to_area.get(player, {}):
+        checks_done = {
+            team_id: {
+                player_id: {
+                    loc_name: 0 for loc_name in default_locations
+                }
+                for player_id in range(1, len(team_members) + 1) if player_id not in groups
+            }
+            for team_id, team_members in enumerate(room_state.room_data.names)
+        }
+
+        # Sum items received and calculate checked locations.
+        for (team, player), locations_checked in room_state.multisave.get("location_checks", {}).items():
+            if player in groups:
                 continue
-            item, recipient, flags = player_locations[location]
-            recipients = groups.get(recipient, [recipient])
-            for recipient in recipients:
-                attribute_item(team, recipient, item)
-                checks_done[team][player][player_location_to_area[player][location]] += 1
-        checks_done[team][player]["Total"] = len(locations_checked)
-
-        percent_total_checks_done[team][player] = (
-            checks_done[team][player]["Total"] / len(player_locations) * 100
-            if player_locations
-            else 100
-        )
 
-    for (team, player), game_state in multisave.get("client_game_state", {}).items():
-        if player in groups:
-            continue
-        if game_state == 30:
-            inventory[team][player][106] = 1  # Triforce
-
-    player_big_key_locations = {playernumber: set() for playernumber in range(1, len(names[0]) + 1)}
-    player_small_key_locations = {playernumber: set() for playernumber in range(1, len(names[0]) + 1)}
-    for loc_data in locations.values():
-        for values in loc_data.values():
-            item_id, item_player, flags = values
-
-            if item_id in ids_big_key:
-                player_big_key_locations[item_player].add(ids_big_key[item_id])
-            elif item_id in ids_small_key:
-                player_small_key_locations[item_player].add(ids_small_key[item_id])
-    group_big_key_locations = set()
-    group_key_locations = set()
-    for player in [player for player in range(1, len(names[0]) + 1) if player not in groups]:
-        group_key_locations |= player_small_key_locations[player]
-        group_big_key_locations |= player_big_key_locations[player]
+            player_locations = room_state.room_data.locations[player]
+            if room_state.room_data.starting_items:
+                starting_items = room_state.room_data.starting_items[player]
+                for item_id in starting_items:
+                    _attribute_item(team, player, item_id)
 
-    activity_timers = {}
-    now = datetime.datetime.utcnow()
-    for (team, player), timestamp in multisave.get("client_activity_timers", []):
-        activity_timers[team, player] = now - datetime.datetime.utcfromtimestamp(timestamp)
+            for location in locations_checked:
+                item, recipient, flags = player_locations[location]
+                recipients = groups.get(recipient, [recipient])
+                for recipient in recipients:
+                    _attribute_item(team, recipient, item)
+                    if room_state.room_data.games[player] == "A Link to the Past":
+                        checks_done[team][player][player_location_to_area[player][location]] += 1
+
+            checks_done[team][player]["Total"] = len(locations_checked)
+
+        # Check if game complete.
+        for (team, player), game_state in room_state.states.items():
+            if player in groups:
+                continue
 
-    player_names = {}
-    for team, names in enumerate(names):
-        for player, name in enumerate(names, 1):
-            player_names[(team, player)] = name
-    long_player_names = player_names.copy()
-    for (team, player), alias in multisave.get("name_aliases", {}).items():
-        player_names[(team, player)] = alias
-        long_player_names[(team, player)] = f"{alias} ({long_player_names[(team, player)]})"
+            if game_state == ClientStatus.CLIENT_GOAL:
+                inventory[team][player][106] = 1  # Triforce
 
-    video = {}
-    for (team, player), data in multisave.get("video", []):
-        video[(team, player)] = data
-
-    enabled_multiworld_trackers = get_enabled_multiworld_trackers(room, "A Link to the Past")
-
-    return render_template("lttpMultiTracker.html", inventory=inventory, get_item_name_from_id=lookup_any_item_id_to_name,
-                           lookup_id_to_name=Items.lookup_id_to_name, player_names=player_names,
-                           tracking_names=tracking_names, tracking_ids=tracking_ids, room=room, icons=alttp_icons,
-                           multi_items=multi_items, checks_done=checks_done,
-                           percent_total_checks_done=percent_total_checks_done,
-                           ordered_areas=ordered_areas, checks_in_area=seed_checks_in_area,
-                           activity_timers=activity_timers,
-                           key_locations=group_key_locations, small_key_ids=small_key_ids, big_key_ids=big_key_ids,
-                           video=video, big_key_locations=group_big_key_locations,
-                           hints=hints, long_player_names=long_player_names,
-                           enabled_multiworld_trackers=enabled_multiworld_trackers)
-
-
-game_specific_trackers: typing.Dict[str, typing.Callable] = {
-    "Minecraft": __renderMinecraftTracker,
-    "Ocarina of Time": __renderOoTTracker,
-    "Timespinner": __renderTimespinnerTracker,
-    "A Link to the Past": __renderAlttpTracker,
-    "ChecksFinder": __renderChecksfinder,
-    "Super Metroid": __renderSuperMetroidTracker,
-    "Starcraft 2 Wings of Liberty": __renderSC2WoLTracker
-}
+        # Track key locations.
+        player_big_key_locations = {player_id: set() for player_id in range(1, len(room_state.room_data.names[0]) + 1)}
+        player_small_key_locations = {player_id: set() for player_id in range(1, len(room_state.room_data.names[0]) + 1)}
+        for location_data in room_state.room_data.locations.values():
+            for item in location_data.values():
+                item_id, receiving_player, flags = item
 
-multi_trackers: typing.Dict[str, typing.Callable] = {
-    "A Link to the Past": get_LttP_multiworld_tracker,
-}
+                if item_id in ids_big_key:
+                    player_big_key_locations[receiving_player].add(ids_big_key[item_id])
+                elif item_id in ids_small_key:
+                    player_small_key_locations[receiving_player].add(ids_small_key[item_id])
+
+        group_big_key_locations = set()
+        group_key_locations = set()
+        for player in [player for player in range(1, len(room_state.room_data.names[0]) + 1) if player not in groups]:
+            group_key_locations |= player_small_key_locations[player]
+            group_big_key_locations |= player_big_key_locations[player]
+
+        return render_template(
+            template_name_or_list="multitracker__ALinkToThePast.html",
+            enabled_multiworld_trackers=get_enabled_multiworld_trackers(room_state.room_data.room, "A Link to the Past"),
+            current_tracker="A Link to the Past",
+            inventory=inventory,
+            get_item_name_from_id=room_state.room_data.item_id_to_name["A Link to the Past"],
+            lookup_id_to_name=Items.lookup_id_to_name,
+            tracking_names=tracking_names,
+            tracking_ids=tracking_ids,
+            multi_items=multi_items,
+            checks_done=checks_done,
+            ordered_areas=ordered_areas,
+            checks_in_area=player_checks_in_area,
+            key_locations=group_key_locations,
+            big_key_locations=group_big_key_locations,
+            small_key_ids=small_key_ids,
+            big_key_ids=big_key_ids,
+            **room_state._asdict(),
+        )
 
-if "Factorio" in games:
-    multi_trackers["Factorio"] = get_Factorio_multiworld_tracker
+    multiworld_trackers["A Link to the Past"] = render_ALinkToThePast_multiworld_tracker
diff --git a/test/general/test_ids.py b/test/general/test_ids.py
index 4edfb8d994ef..cfe97da1187e 100644
--- a/test/general/test_ids.py
+++ b/test/general/test_ids.py
@@ -3,22 +3,6 @@
 
 
 class TestIDs(unittest.TestCase):
-    def test_unique_items(self):
-        """Tests that every game has a unique ID per item in the datapackage"""
-        known_item_ids = set()
-        for gamename, world_type in AutoWorldRegister.world_types.items():
-            current = len(known_item_ids)
-            known_item_ids |= set(world_type.item_id_to_name)
-            self.assertEqual(len(known_item_ids) - len(world_type.item_id_to_name), current)
-
-    def test_unique_locations(self):
-        """Tests that every game has a unique ID per location in the datapackage"""
-        known_location_ids = set()
-        for gamename, world_type in AutoWorldRegister.world_types.items():
-            current = len(known_location_ids)
-            known_location_ids |= set(world_type.location_id_to_name)
-            self.assertEqual(len(known_location_ids) - len(world_type.location_id_to_name), current)
-
     def test_range_items(self):
         """There are Javascript clients, which are limited to Number.MAX_SAFE_INTEGER due to 64bit float precision."""
         for gamename, world_type in AutoWorldRegister.world_types.items():
diff --git a/worlds/AutoWorld.py b/worlds/AutoWorld.py
index d05797cf9e12..a9e370d8f705 100644
--- a/worlds/AutoWorld.py
+++ b/worlds/AutoWorld.py
@@ -6,16 +6,16 @@
 import sys
 import time
 from dataclasses import make_dataclass
-from typing import Any, Callable, ClassVar, Dict, Set, Tuple, FrozenSet, List, Optional, TYPE_CHECKING, TextIO, Type, \
+from typing import Any, Callable, ClassVar, Dict, FrozenSet, List, Optional, Set, TYPE_CHECKING, TextIO, Tuple, Type, \
     Union
 
-from Options import PerGameCommonOptions
 from BaseClasses import CollectionState
+from Options import PerGameCommonOptions
 
 if TYPE_CHECKING:
     import random
     from BaseClasses import MultiWorld, Item, Location, Tutorial
-    from . import GamesPackage
+    from . import GamePackage
     from settings import Group
 
 perf_logger = logging.getLogger("performance")
@@ -208,18 +208,6 @@ class World(metaclass=AutoWorldRegister):
     location_name_groups: ClassVar[Dict[str, Set[str]]] = {}
     """maps location group names to sets of locations. Example: {"Sewer": {"Sewer Key Drop 1", "Sewer Key Drop 2"}}"""
 
-    data_version: ClassVar[int] = 0
-    """
-    Increment this every time something in your world's names/id mappings changes.
-
-    When this is set to 0, that world's DataPackage is considered in "testing mode", which signals to servers/clients
-    that it should not be cached, and clients should request that world's DataPackage every connection. Not
-    recommended for production-ready worlds.
-
-    Deprecated. Clients should utilize `checksum` to determine if DataPackage has changed since last connection and
-    request a new DataPackage, if necessary.
-    """
-
     required_client_version: Tuple[int, int, int] = (0, 1, 6)
     """
     override this if changes to a world break forward-compatibility of the client
@@ -431,20 +419,19 @@ def create_filler(self) -> "Item":
         return self.create_item(self.get_filler_item_name())
 
     @classmethod
-    def get_data_package_data(cls) -> "GamesPackage":
+    def get_data_package_data(cls) -> GamePackage:
         sorted_item_name_groups = {
             name: sorted(cls.item_name_groups[name]) for name in sorted(cls.item_name_groups)
         }
         sorted_location_name_groups = {
             name: sorted(cls.location_name_groups[name]) for name in sorted(cls.location_name_groups)
         }
-        res: "GamesPackage" = {
+        res: GamePackage = {
             # sorted alphabetically
             "item_name_groups": sorted_item_name_groups,
             "item_name_to_id": cls.item_name_to_id,
             "location_name_groups": sorted_location_name_groups,
             "location_name_to_id": cls.location_name_to_id,
-            "version": cls.data_version,
         }
         res["checksum"] = data_package_checksum(res)
         return res
@@ -456,7 +443,7 @@ class LogicMixin(metaclass=AutoLogicRegister):
     pass
 
 
-def data_package_checksum(data: "GamesPackage") -> str:
+def data_package_checksum(data: "GamePackage") -> str:
     """Calculates the data package checksum for a game from a dict"""
     assert "checksum" not in data, "Checksum already in data"
     assert sorted(data) == list(data), "Data not ordered"
diff --git a/worlds/__init__.py b/worlds/__init__.py
index c6208fa9a159..64ad8ac5f51d 100644
--- a/worlds/__init__.py
+++ b/worlds/__init__.py
@@ -1,42 +1,41 @@
 import importlib
 import os
 import sys
-import typing
 import warnings
 import zipimport
+from typing import Dict, List, NamedTuple, TYPE_CHECKING, TypedDict
+
+if TYPE_CHECKING:
+    from .AutoWorld import World
+
 
 folder = os.path.dirname(__file__)
 
 __all__ = {
-    "lookup_any_item_id_to_name",
-    "lookup_any_location_id_to_name",
+    "lookup_world_item_id_to_name",
+    "lookup_world_location_id_to_name",
     "network_data_package",
     "AutoWorldRegister",
     "world_sources",
     "folder",
+    "GamePackage",
+    "DataPackage",
 }
 
-if typing.TYPE_CHECKING:
-    from .AutoWorld import World
-
-
-class GamesData(typing.TypedDict):
-    item_name_groups: typing.Dict[str, typing.List[str]]
-    item_name_to_id: typing.Dict[str, int]
-    location_name_groups: typing.Dict[str, typing.List[str]]
-    location_name_to_id: typing.Dict[str, int]
-    version: int
 
-
-class GamesPackage(GamesData, total=False):
+class GamePackage(TypedDict, total=False):
+    item_name_groups: Dict[str, List[str]]
+    item_name_to_id: Dict[str, int]
+    location_name_groups: Dict[str, List[str]]
+    location_name_to_id: Dict[str, int]
     checksum: str
 
 
-class DataPackage(typing.TypedDict):
-    games: typing.Dict[str, GamesPackage]
+class DataPackage(TypedDict):
+    games: Dict[str, GamePackage]
 
 
-class WorldSource(typing.NamedTuple):
+class WorldSource(NamedTuple):
     path: str  # typically relative path from this module
     is_zip: bool = False
     relative: bool = True  # relative to regular world import folder
@@ -86,7 +85,7 @@ def load(self) -> bool:
 
 
 # find potential world containers, currently folders and zip-importable .apworld's
-world_sources: typing.List[WorldSource] = []
+world_sources: List[WorldSource] = []
 file: os.DirEntry  # for me (Berserker) at least, PyCharm doesn't seem to infer the type correctly
 for file in os.scandir(folder):
     # prevent loading of __pycache__ and allow _* for non-world folders, disable files/folders starting with "."
@@ -101,25 +100,18 @@ def load(self) -> bool:
 for world_source in world_sources:
     world_source.load()
 
-lookup_any_item_id_to_name = {}
-lookup_any_location_id_to_name = {}
-games: typing.Dict[str, GamesPackage] = {}
-
-from .AutoWorld import AutoWorldRegister
 
 # Build the data package for each game.
-for world_name, world in AutoWorldRegister.world_types.items():
-    games[world_name] = world.get_data_package_data()
-    lookup_any_item_id_to_name.update(world.item_id_to_name)
-    lookup_any_location_id_to_name.update(world.location_id_to_name)
+from .AutoWorld import AutoWorldRegister
 
 network_data_package: DataPackage = {
-    "games": games,
+    "games": {world_name: world.get_data_package_data() for world_name, world in AutoWorldRegister.world_types.items()},
 }
 
-# Set entire datapackage to version 0 if any of them are set to 0
-if any(not world.data_version for world in AutoWorldRegister.world_types.values()):
-    import logging
+lookup_world_item_id_to_name = {
+    world_name: world.item_id_to_name for world_name, world in AutoWorldRegister.world_types.items()
+}
 
-    logging.warning(f"Datapackage is in custom mode. Custom Worlds: "
-                    f"{[world for world in AutoWorldRegister.world_types.values() if not world.data_version]}")
+lookup_world_location_id_to_name = {
+    world_name: world.location_id_to_name for world_name, world in AutoWorldRegister.world_types.items()
+}
diff --git a/worlds/alttp/__init__.py b/worlds/alttp/__init__.py
index d89e65c59d89..1edcaa5f5c26 100644
--- a/worlds/alttp/__init__.py
+++ b/worlds/alttp/__init__.py
@@ -213,7 +213,6 @@ class ALTTPWorld(World):
     item_name_to_id = {name: data.item_code for name, data in item_table.items() if type(data.item_code) == int}
     location_name_to_id = lookup_name_to_id
 
-    data_version = 8
     required_client_version = (0, 4, 1)
     web = ALTTPWeb()
 
diff --git a/worlds/archipidle/__init__.py b/worlds/archipidle/__init__.py
index 2d182f31dc20..ffa7e189fe72 100644
--- a/worlds/archipidle/__init__.py
+++ b/worlds/archipidle/__init__.py
@@ -33,7 +33,6 @@ class ArchipIDLEWorld(World):
     """
     game = "ArchipIDLE"
     topology_present = False
-    data_version = 5
     hidden = (datetime.now().month != 4)  # ArchipIDLE is only visible during April
     web = ArchipIDLEWebWorld()
 
diff --git a/worlds/bk_sudoku/__init__.py b/worlds/bk_sudoku/__init__.py
index 36d863bb4475..13099f91c1fe 100644
--- a/worlds/bk_sudoku/__init__.py
+++ b/worlds/bk_sudoku/__init__.py
@@ -25,7 +25,6 @@ class Bk_SudokuWorld(World):
     """
     game = "Sudoku"
     web = Bk_SudokuWebWorld()
-    data_version = 1
 
     item_name_to_id: Dict[str, int] = {}
     location_name_to_id: Dict[str, int] = {}
diff --git a/worlds/blasphemous/__init__.py b/worlds/blasphemous/__init__.py
index 9abcd81b20e1..a46fb55b9541 100644
--- a/worlds/blasphemous/__init__.py
+++ b/worlds/blasphemous/__init__.py
@@ -32,7 +32,6 @@ class BlasphemousWorld(World):
 
     game: str = "Blasphemous"
     web = BlasphemousWeb()
-    data_version = 2
 
     item_name_to_id = {item["name"]: (base_id + index) for index, item in enumerate(item_table)}
     location_name_to_id = {loc["name"]: (base_id + index) for index, loc in enumerate(location_table)}
diff --git a/worlds/bumpstik/__init__.py b/worlds/bumpstik/__init__.py
index c4e65d07b6a9..a88ee03dae36 100644
--- a/worlds/bumpstik/__init__.py
+++ b/worlds/bumpstik/__init__.py
@@ -39,8 +39,6 @@ class BumpStikWorld(World):
     location_name_to_id = location_table
     item_name_groups = item_groups
 
-    data_version = 1
-
     required_client_version = (0, 3, 8)
 
     option_definitions = bumpstik_options
diff --git a/worlds/checksfinder/__init__.py b/worlds/checksfinder/__init__.py
index 4978500da0cb..8ce854627d7b 100644
--- a/worlds/checksfinder/__init__.py
+++ b/worlds/checksfinder/__init__.py
@@ -33,8 +33,6 @@ class ChecksFinderWorld(World):
     item_name_to_id = {name: data.code for name, data in item_table.items()}
     location_name_to_id = {name: data.id for name, data in advancement_table.items()}
 
-    data_version = 4
-
     def _get_checksfinder_data(self):
         return {
             'world_seed': self.multiworld.per_slot_randoms[self.player].getrandbits(32),
diff --git a/worlds/clique/Items.py b/worlds/clique/Items.py
index 5474f58b82d5..065be176f927 100644
--- a/worlds/clique/Items.py
+++ b/worlds/clique/Items.py
@@ -15,16 +15,16 @@ class CliqueItemData(NamedTuple):
 
 item_data_table: Dict[str, CliqueItemData] = {
     "Feeling of Satisfaction": CliqueItemData(
-        code=69696969,
+        code=1,
         type=ItemClassification.progression,
     ),
     "Button Activation": CliqueItemData(
-        code=69696968,
+        code=2,
         type=ItemClassification.progression,
         can_create=lambda multiworld, player: bool(getattr(multiworld, "hard_mode")[player]),
     ),
     "A Cool Filler Item (No Satisfaction Guaranteed)": CliqueItemData(
-        code=69696967,
+        code=3,
         can_create=lambda multiworld, player: False  # Only created from `get_filler_item_name`.
     ),
     "The Urge to Push": CliqueItemData(
diff --git a/worlds/clique/Locations.py b/worlds/clique/Locations.py
index 144becae5368..2d7dd2546ae4 100644
--- a/worlds/clique/Locations.py
+++ b/worlds/clique/Locations.py
@@ -17,11 +17,11 @@ class CliqueLocationData(NamedTuple):
 location_data_table: Dict[str, CliqueLocationData] = {
     "The Big Red Button": CliqueLocationData(
         region="The Button Realm",
-        address=69696969,
+        address=1,
     ),
     "The Item on the Desk": CliqueLocationData(
         region="The Button Realm",
-        address=69696968,
+        address=2,
         can_create=lambda multiworld, player: bool(getattr(multiworld, "hard_mode")[player]),
     ),
     "In the Player's Mind": CliqueLocationData(
diff --git a/worlds/clique/__init__.py b/worlds/clique/__init__.py
index 583838904726..5840048efa56 100644
--- a/worlds/clique/__init__.py
+++ b/worlds/clique/__init__.py
@@ -27,7 +27,6 @@ class CliqueWorld(World):
     """The greatest game of all time."""
 
     game = "Clique"
-    data_version = 3
     web = CliqueWebWorld()
     option_definitions = clique_options
     location_name_to_id = location_table
diff --git a/worlds/dark_souls_3/__init__.py b/worlds/dark_souls_3/__init__.py
index 195d319887d5..87c2d4e78ea4 100644
--- a/worlds/dark_souls_3/__init__.py
+++ b/worlds/dark_souls_3/__init__.py
@@ -46,7 +46,6 @@ class DarkSouls3World(World):
     option_definitions = dark_souls_options
     topology_present: bool = True
     web = DarkSouls3Web()
-    data_version = 8
     base_id = 100000
     enabled_location_categories: Set[DS3LocationCategory]
     required_client_version = (0, 4, 2)
diff --git a/worlds/dkc3/__init__.py b/worlds/dkc3/__init__.py
index 462e1416d9e6..1306ae991516 100644
--- a/worlds/dkc3/__init__.py
+++ b/worlds/dkc3/__init__.py
@@ -53,7 +53,6 @@ class DKC3World(World):
     option_definitions = dkc3_options
     settings: typing.ClassVar[DK3Settings]
     topology_present = False
-    data_version = 2
     #hint_blacklist = {LocationName.rocket_rush_flag}
 
     item_name_to_id = {name: data.code for name, data in item_table.items()}
diff --git a/worlds/dlcquest/__init__.py b/worlds/dlcquest/__init__.py
index e4e0a29274da..a8f43c584b4c 100644
--- a/worlds/dlcquest/__init__.py
+++ b/worlds/dlcquest/__init__.py
@@ -34,8 +34,6 @@ class DLCqworld(World):
     item_name_to_id = {name: data.code for name, data in item_table.items()}
     location_name_to_id = location_table
 
-    data_version = 1
-
     options_dataclass = DLCQuestOptions
     options: DLCQuestOptions
 
diff --git a/worlds/doom_1993/__init__.py b/worlds/doom_1993/__init__.py
index 83a8652af1d1..3b875db98031 100644
--- a/worlds/doom_1993/__init__.py
+++ b/worlds/doom_1993/__init__.py
@@ -40,7 +40,6 @@ class DOOM1993World(World):
     option_definitions = Options.options
     game = "DOOM 1993"
     web = DOOM1993Web()
-    data_version = 3
     required_client_version = (0, 3, 9)
 
     item_name_to_id = {data["name"]: item_id for item_id, data in Items.item_table.items()}
diff --git a/worlds/factorio/__init__.py b/worlds/factorio/__init__.py
index 8308bb2d6559..6a40c88bb48c 100644
--- a/worlds/factorio/__init__.py
+++ b/worlds/factorio/__init__.py
@@ -95,7 +95,6 @@ class Factorio(World):
     item_name_groups = {
         "Progressive": set(progressive_tech_table.keys()),
     }
-    data_version = 8
     required_client_version = (0, 4, 2)
 
     ordered_science_packs: typing.List[str] = MaxSciencePack.get_ordered_science_packs()
diff --git a/worlds/ff1/__init__.py b/worlds/ff1/__init__.py
index 16905cc6da0c..02782a51b5c9 100644
--- a/worlds/ff1/__init__.py
+++ b/worlds/ff1/__init__.py
@@ -39,7 +39,6 @@ class FF1World(World):
     settings_key = "ffr_options"
     game = "Final Fantasy"
     topology_present = False
-    data_version = 2
 
     ff1_items = FF1Items()
     ff1_locations = FF1Locations()
diff --git a/worlds/generic/__init__.py b/worlds/generic/__init__.py
index 6b2ffdfee180..9cc6e64a3aed 100644
--- a/worlds/generic/__init__.py
+++ b/worlds/generic/__init__.py
@@ -1,10 +1,10 @@
 from typing import NamedTuple, Union
 import logging
+from typing import NamedTuple, Union
 
-from BaseClasses import Item, Tutorial, ItemClassification
-
-from ..AutoWorld import World, WebWorld
+from BaseClasses import Item, ItemClassification, Tutorial
 from NetUtils import SlotType
+from worlds.AutoWorld import WebWorld, World
 
 
 class GenericWeb(WebWorld):
@@ -40,7 +40,6 @@ class GenericWorld(World):
     }
     hidden = True
     web = GenericWeb()
-    data_version = 1
 
     def generate_early(self):
         self.multiworld.player_types[self.player] = SlotType.spectator  # mark as spectator
diff --git a/worlds/hk/__init__.py b/worlds/hk/__init__.py
index c16a108cd169..13218c7fe2a2 100644
--- a/worlds/hk/__init__.py
+++ b/worlds/hk/__init__.py
@@ -154,7 +154,6 @@ class HKWorld(World):
     ranges: typing.Dict[str, typing.Tuple[int, int]]
     charm_costs: typing.List[int]
     cached_filler_items = {}
-    data_version = 2
 
     def __init__(self, world, player):
         super(HKWorld, self).__init__(world, player)
diff --git a/worlds/hylics2/__init__.py b/worlds/hylics2/__init__.py
index 19d901bf5a05..1b4d211a0e2d 100644
--- a/worlds/hylics2/__init__.py
+++ b/worlds/hylics2/__init__.py
@@ -36,8 +36,6 @@ class Hylics2World(World):
 
     topology_present: bool = True
 
-    data_version = 3
-
     start_location = "Waynehouse"
 
 
diff --git a/worlds/kh2/__init__.py b/worlds/kh2/__init__.py
index 23075a2084df..fb8d2d36b9ed 100644
--- a/worlds/kh2/__init__.py
+++ b/worlds/kh2/__init__.py
@@ -32,7 +32,6 @@ class KH2World(World):
     """
     game: str = "Kingdom Hearts 2"
     web = KingdomHearts2Web()
-    data_version = 1
     required_client_version = (0, 4, 0)
     option_definitions = KH2_Options
     item_name_to_id = {name: data.code for name, data in item_dictionary_table.items()}
diff --git a/worlds/ladx/__init__.py b/worlds/ladx/__init__.py
index eaaea5be2f67..c50f7a5e17bc 100644
--- a/worlds/ladx/__init__.py
+++ b/worlds/ladx/__init__.py
@@ -81,11 +81,6 @@ class LinksAwakeningWorld(World):
     settings: typing.ClassVar[LinksAwakeningSettings]
     topology_present = True  # show path to required location checks in spoiler
 
-    # data_version is used to signal that items, locations or their names
-    # changed. Set this to 0 during development so other games' clients do not
-    # cache any texts, then increase by 1 for each release that makes changes.
-    data_version = 1
-
     # ID of first item and location, could be hard-coded but code may be easier
     # to read with this as a propery.
     base_id = BASE_ID
diff --git a/worlds/meritous/__init__.py b/worlds/meritous/__init__.py
index 1bf1bfc0f2e6..fd80be00007e 100644
--- a/worlds/meritous/__init__.py
+++ b/worlds/meritous/__init__.py
@@ -44,8 +44,6 @@ class MeritousWorld(World):
     location_name_to_id = location_table
     item_name_groups = item_groups
 
-    data_version = 2
-
     # NOTE: Remember to change this before this game goes live
     required_client_version = (0, 2, 4)
 
diff --git a/worlds/messenger/__init__.py b/worlds/messenger/__init__.py
index 3fe13a3cb421..0109ac6765d7 100644
--- a/worlds/messenger/__init__.py
+++ b/worlds/messenger/__init__.py
@@ -62,7 +62,6 @@ class MessengerWorld(World):
                                "Money Wrench",
                            ], base_offset)}
 
-    data_version = 3
     required_client_version = (0, 4, 0)
 
     web = MessengerWeb()
diff --git a/worlds/minecraft/__init__.py b/worlds/minecraft/__init__.py
index 187f1fdf196a..84fb694d83c7 100644
--- a/worlds/minecraft/__init__.py
+++ b/worlds/minecraft/__init__.py
@@ -92,8 +92,6 @@ class MinecraftWorld(World):
     item_name_to_id = Constants.item_name_to_id
     location_name_to_id = Constants.location_name_to_id
 
-    data_version = 7
-
     def _get_mc_data(self) -> Dict[str, Any]:
         exits = [connection[0] for connection in Constants.region_info["default_connections"]]
         return {
diff --git a/worlds/mmbn3/__init__.py b/worlds/mmbn3/__init__.py
index ec68825c2d2c..e3d14180c341 100644
--- a/worlds/mmbn3/__init__.py
+++ b/worlds/mmbn3/__init__.py
@@ -54,8 +54,6 @@ class MMBN3World(World):
     settings: typing.ClassVar[MMBN3Settings]
     topology_present = False
 
-    data_version = 1
-
     item_name_to_id = {name: data.code for name, data in item_table.items()}
     location_name_to_id = {loc_data.name: loc_data.id for loc_data in all_locations}
     
diff --git a/worlds/musedash/__init__.py b/worlds/musedash/__init__.py
index bfe321b64afe..25bae37cad87 100644
--- a/worlds/musedash/__init__.py
+++ b/worlds/musedash/__init__.py
@@ -49,7 +49,6 @@ class MuseDashWorld(World):
     game = "Muse Dash"
     options_dataclass: ClassVar[Type[PerGameCommonOptions]] = MuseDashOptions
     topology_present = False
-    data_version = 11
     web = MuseDashWebWorld()
 
     # Necessary Data
diff --git a/worlds/noita/__init__.py b/worlds/noita/__init__.py
index 499d202a64f4..b9fc90a40f1b 100644
--- a/worlds/noita/__init__.py
+++ b/worlds/noita/__init__.py
@@ -31,7 +31,6 @@ class NoitaWorld(World):
 
     item_name_groups = Items.item_name_groups
     location_name_groups = Locations.location_name_groups
-    data_version = 2
 
     web = NoitaWeb()
 
diff --git a/worlds/oot/__init__.py b/worlds/oot/__init__.py
index 9466e7c09872..7caff1d1e447 100644
--- a/worlds/oot/__init__.py
+++ b/worlds/oot/__init__.py
@@ -141,8 +141,6 @@ class OOTWorld(World):
     location_name_to_id = location_name_to_id
     web = OOTWeb()
 
-    data_version = 3
-
     required_client_version = (0, 4, 0)
 
     item_name_groups = {
diff --git a/worlds/overcooked2/__init__.py b/worlds/overcooked2/__init__.py
index 0451f32bdd49..87cbd17c1957 100644
--- a/worlds/overcooked2/__init__.py
+++ b/worlds/overcooked2/__init__.py
@@ -48,7 +48,6 @@ class Overcooked2World(World):
     web = Overcooked2Web()
     required_client_version = (0, 3, 8)
     topology_present: bool = False
-    data_version = 3
 
     item_name_to_id = item_name_to_id
     item_id_to_name = item_id_to_name
diff --git a/worlds/pokemon_rb/__init__.py b/worlds/pokemon_rb/__init__.py
index b2ee0702c91e..6e17ea150c61 100644
--- a/worlds/pokemon_rb/__init__.py
+++ b/worlds/pokemon_rb/__init__.py
@@ -79,7 +79,6 @@ class PokemonRedBlueWorld(World):
     option_definitions = pokemon_rb_options
     settings: typing.ClassVar[PokemonSettings]
 
-    data_version = 9
     required_client_version = (0, 4, 2)
 
     topology_present = True
diff --git a/worlds/raft/__init__.py b/worlds/raft/__init__.py
index fec60c3bd51b..a253368b6df5 100644
--- a/worlds/raft/__init__.py
+++ b/worlds/raft/__init__.py
@@ -40,7 +40,6 @@ class RaftWorld(World):
     location_name_to_id = locations_lookup_name_to_id
     option_definitions = raft_options
 
-    data_version = 2
     required_client_version = (0, 3, 4)
 
     def create_items(self):
diff --git a/worlds/rogue_legacy/__init__.py b/worlds/rogue_legacy/__init__.py
index 68a0c856c8ad..42b7f76461a5 100644
--- a/worlds/rogue_legacy/__init__.py
+++ b/worlds/rogue_legacy/__init__.py
@@ -33,7 +33,6 @@ class RLWorld(World):
     game = "Rogue Legacy"
     option_definitions = rl_options
     topology_present = True
-    data_version = 4
     required_client_version = (0, 3, 5)
     web = RLWeb()
 
diff --git a/worlds/ror2/__init__.py b/worlds/ror2/__init__.py
index 22c65dd9deb7..124c513e6bce 100644
--- a/worlds/ror2/__init__.py
+++ b/worlds/ror2/__init__.py
@@ -36,7 +36,6 @@ class RiskOfRainWorld(World):
     item_name_to_id = item_table
     location_name_to_id = item_pickups
 
-    data_version = 7
     required_client_version = (0, 4, 2)
     web = RiskOfWeb()
     total_revivals: int
diff --git a/worlds/sa2b/__init__.py b/worlds/sa2b/__init__.py
index 496d18fa379c..70fb6844b45e 100644
--- a/worlds/sa2b/__init__.py
+++ b/worlds/sa2b/__init__.py
@@ -52,7 +52,6 @@ class SA2BWorld(World):
     game: str = "Sonic Adventure 2 Battle"
     option_definitions = sa2b_options
     topology_present = False
-    data_version = 6
 
     item_name_groups = item_groups
     item_name_to_id = {name: data.code for name, data in item_table.items()}
diff --git a/worlds/sc2wol/__init__.py b/worlds/sc2wol/__init__.py
index 93aebb7ad15a..fd64dd4fa52a 100644
--- a/worlds/sc2wol/__init__.py
+++ b/worlds/sc2wol/__init__.py
@@ -34,7 +34,6 @@ class SC2WoLWorld(World):
 
     game = "Starcraft 2 Wings of Liberty"
     web = Starcraft2WoLWebWorld()
-    data_version = 4
 
     item_name_to_id = {name: data.code for name, data in get_full_item_list().items()}
     location_name_to_id = {location.name: location.code for location in get_locations(None, None)}
diff --git a/worlds/sm/__init__.py b/worlds/sm/__init__.py
index e85d79d3ee33..2a6da00c60f7 100644
--- a/worlds/sm/__init__.py
+++ b/worlds/sm/__init__.py
@@ -99,7 +99,6 @@ class SMWorld(World):
 
     game: str = "Super Metroid"
     topology_present = True
-    data_version = 3
     option_definitions = sm_options
     settings: typing.ClassVar[SMSettings]
 
diff --git a/worlds/sm64ex/__init__.py b/worlds/sm64ex/__init__.py
index 3cc87708e723..2cb1d85b9d1a 100644
--- a/worlds/sm64ex/__init__.py
+++ b/worlds/sm64ex/__init__.py
@@ -35,7 +35,6 @@ class SM64World(World):
     item_name_to_id = item_table
     location_name_to_id = location_table
 
-    data_version = 8
     required_client_version = (0, 3, 5)
 
     area_connections: typing.Dict[int, int]
diff --git a/worlds/smw/__init__.py b/worlds/smw/__init__.py
index 431287c32bef..ebab2c88a783 100644
--- a/worlds/smw/__init__.py
+++ b/worlds/smw/__init__.py
@@ -53,7 +53,6 @@ class SMWWorld(World):
     option_definitions = smw_options
     settings: typing.ClassVar[SMWSettings]
     topology_present = False
-    data_version = 3
     required_client_version = (0, 3, 5)
 
     item_name_to_id = {name: data.code for name, data in item_table.items()}
diff --git a/worlds/smz3/__init__.py b/worlds/smz3/__init__.py
index 2cc2ac97d952..ddf0642c20c8 100644
--- a/worlds/smz3/__init__.py
+++ b/worlds/smz3/__init__.py
@@ -68,7 +68,6 @@ class SMZ3World(World):
     """
     game: str = "SMZ3"
     topology_present = False
-    data_version = 3
     option_definitions = smz3_options
     item_names: Set[str] = frozenset(TotalSMZ3Item.lookup_name_to_id)
     location_names: Set[str]
diff --git a/worlds/soe/__init__.py b/worlds/soe/__init__.py
index d02a8d02ee97..2f173638e57e 100644
--- a/worlds/soe/__init__.py
+++ b/worlds/soe/__init__.py
@@ -162,7 +162,6 @@ class SoEWorld(World):
     option_definitions = soe_options
     settings: typing.ClassVar[SoESettings]
     topology_present = False
-    data_version = 4
     web = SoEWebWorld()
     required_client_version = (0, 3, 5)
 
diff --git a/worlds/spire/__init__.py b/worlds/spire/__init__.py
index 35ef94090656..417b4a7759d7 100644
--- a/worlds/spire/__init__.py
+++ b/worlds/spire/__init__.py
@@ -30,7 +30,6 @@ class SpireWorld(World):
     option_definitions = spire_options
     game = "Slay the Spire"
     topology_present = False
-    data_version = 2
     web = SpireWeb()
     required_client_version = (0, 3, 7)
 
diff --git a/worlds/stardew_valley/__init__.py b/worlds/stardew_valley/__init__.py
index 177b6436ae56..f63320f4fbb5 100644
--- a/worlds/stardew_valley/__init__.py
+++ b/worlds/stardew_valley/__init__.py
@@ -57,7 +57,6 @@ class StardewValleyWorld(World):
     item_name_to_id = {name: data.code for name, data in item_table.items()}
     location_name_to_id = {name: data.code for name, data in location_table.items()}
 
-    data_version = 3
     required_client_version = (0, 4, 0)
 
     options_dataclass = StardewValleyOptions
diff --git a/worlds/subnautica/__init__.py b/worlds/subnautica/__init__.py
index de4f4e33dc87..60b9c412d569 100644
--- a/worlds/subnautica/__init__.py
+++ b/worlds/subnautica/__init__.py
@@ -44,7 +44,6 @@ class SubnauticaWorld(World):
     location_name_to_id = all_locations
     option_definitions = options.option_definitions
 
-    data_version = 10
     required_client_version = (0, 4, 1)
 
     creatures_to_scan: List[str]
diff --git a/worlds/terraria/__init__.py b/worlds/terraria/__init__.py
index 306a65ef9186..2fb434d6d57c 100644
--- a/worlds/terraria/__init__.py
+++ b/worlds/terraria/__init__.py
@@ -51,11 +51,6 @@ class TerrariaWorld(World):
     web = TerrariaWeb()
     option_definitions = options
 
-    # data_version is used to signal that items, locations or their names
-    # changed. Set this to 0 during development so other games' clients do not
-    # cache any texts, then increase by 1 for each release that makes changes.
-    data_version = 2
-
     item_name_to_id = item_name_to_id
     location_name_to_id = location_name_to_id
 
diff --git a/worlds/timespinner/__init__.py b/worlds/timespinner/__init__.py
index 24230862bdf6..91d8bb9c3620 100644
--- a/worlds/timespinner/__init__.py
+++ b/worlds/timespinner/__init__.py
@@ -39,7 +39,6 @@ class TimespinnerWorld(World):
     option_definitions = timespinner_options
     game = "Timespinner"
     topology_present = True
-    data_version = 11
     web = TimespinnerWebWorld()
     required_client_version = (0, 3, 7)
 
diff --git a/worlds/tloz/__init__.py b/worlds/tloz/__init__.py
index 20ab003ead61..5c032c685e75 100644
--- a/worlds/tloz/__init__.py
+++ b/worlds/tloz/__init__.py
@@ -67,7 +67,6 @@ class TLoZWorld(World):
     settings: typing.ClassVar[TLoZSettings]
     game = "The Legend of Zelda"
     topology_present = False
-    data_version = 1
     base_id = 7000
     web = TLoZWeb()
 
diff --git a/worlds/undertale/__init__.py b/worlds/undertale/__init__.py
index 9e784a4a59a0..bd9ea710fcf0 100644
--- a/worlds/undertale/__init__.py
+++ b/worlds/undertale/__init__.py
@@ -52,8 +52,6 @@ class UndertaleWorld(World):
     item_name_to_id = {name: data.code for name, data in item_table.items()}
     location_name_to_id = {name: data.id for name, data in advancement_table.items()}
 
-    data_version = 7
-
     def _get_undertale_data(self):
         return {
             "world_seed": self.multiworld.per_slot_randoms[self.player].getrandbits(32),
diff --git a/worlds/v6/__init__.py b/worlds/v6/__init__.py
index 6ff7fba60c2d..6ddf3a911335 100644
--- a/worlds/v6/__init__.py
+++ b/worlds/v6/__init__.py
@@ -34,8 +34,6 @@ class V6World(World):
     item_name_to_id = item_table
     location_name_to_id = location_table
 
-    data_version = 1
-
     area_connections: typing.Dict[int, int]
     area_cost_map: typing.Dict[int,int]
 
diff --git a/worlds/wargroove/__init__.py b/worlds/wargroove/__init__.py
index ab4a9364fac0..fe1876a13235 100644
--- a/worlds/wargroove/__init__.py
+++ b/worlds/wargroove/__init__.py
@@ -42,7 +42,6 @@ class WargrooveWorld(World):
     settings: typing.ClassVar[WargrooveSettings]
     game = "Wargroove"
     topology_present = True
-    data_version = 1
     web = WargrooveWeb()
 
     item_name_to_id = {name: data.code for name, data in item_table.items()}
diff --git a/worlds/witness/__init__.py b/worlds/witness/__init__.py
index 28eaba6404b6..49507542f48c 100644
--- a/worlds/witness/__init__.py
+++ b/worlds/witness/__init__.py
@@ -38,7 +38,6 @@ class WitnessWorld(World):
     """
     game = "The Witness"
     topology_present = False
-    data_version = 13
 
     StaticWitnessLogic()
     StaticWitnessLocations()
diff --git a/worlds/zillion/__init__.py b/worlds/zillion/__init__.py
index a5e1bfe1ad5f..355f89a5b4b4 100644
--- a/worlds/zillion/__init__.py
+++ b/worlds/zillion/__init__.py
@@ -79,11 +79,6 @@ class ZillionWorld(World):
     item_name_to_id = _item_name_to_id
     location_name_to_id = _loc_name_to_id
 
-    # increment this every time something in your world's names/id mappings changes.
-    # While this is set to 0 in *any* AutoWorld, the entire DataPackage is considered in testing mode and will be
-    # retrieved by clients on every connection.
-    data_version = 1
-
     logger: logging.Logger
 
     class LogStreamInterface: