diff --git a/docs/IssueTracker.md b/docs/IssueTracker.md
new file mode 100644
index 000000000..f1962b9eb
--- /dev/null
+++ b/docs/IssueTracker.md
@@ -0,0 +1,37 @@
+# Issue tracker (experimental branch)
+
+Upstream issues this branch works on, with the commits and their state. Commit messages on this branch name issues
+as "issue 1234" (no hash), so nothing is linked on GitHub until a change is proposed upstream; this file is the index.
+Some earlier commits still say "Fixes #N"/"Refs #N" (already linked; history not rewritten).
+
+State: **done** = fixed on this branch, needs an in-game check; **partial** = part of it, see notes.
+
+| Issue | Title | State | Commits |
+|---|---|---|---|
+| 159 | BUG: Brick-by-brick models are deleted instead of put away | done | `499fb51a` fix: brick by brick and model placement work the way the client expects |
+| 185 | BUG: Assembly Engineer Fortress Knockback | partial | `46f6d56c` feat: server side knockback for AI moved objects |
+| 225 | ENH: "bind_ip" config option | done | `c4cdf717` feat: bind_ip setting for the server sockets |
+| 257 | EH: Crux Prime shields stun instead of knockback | done | `46f6d56c` feat: server side knockback for AI moved objects |
+| 596 | BUG: Crux Prime Computer does not respawn if it is killed by an Area of Effect attack | done | `46d7e1f0` fix: Crux Prime dropship computer respawns and no longer crashes |
+| 636 | BUG: Reputation system not working correctly on Properties | done | `f402aff6` feat: property reputation from visitors, resistant to farming |
+| 637 | BUG: Today's Top Properties not showing any properties | done | `f402aff6` feat: property reputation from visitors, resistant to farming |
+| 639 | ENH: Implement saving checks to prevent overwriting of saves | done | `5b407b8f` feat: refuse stale character saves with a save generation |
+| 691 | Tracking Issue: Hardcoded Content | partial | `1f9cf3f9` refactor: modular build items and root part come from ModularBuildComponent<br>`3154b300` refactor: power-up statistics come from the power-up's pickup skill<br>`aac8132f` refactor: item set passive abilities come from the CDClient and item scripts |
+| 746 | Tracking Issue: Missing Scripts | partial | `6230cd06` feat: add missing force field, jetpack NPC and Skullkin volume scripts |
+| 943 | ENH: Add config option for charging property rent | done | `52cb2bf3` feat: optional property rent |
+| 1021 | BUG: Crux Prime daily mission objectives for smashables don't always complete | partial | `c274b72b` fix: Skullkin drill credits the player who breaks it |
+| 1113 | ENH: Add data validation to user editable strings in .ini's | partial | `3b40e979` fix: ignore whitespace around config keys and values |
+| 1127 | BUG: Enemies at Cavalry Hill take 1 damage from too far away on spawn | done | `9ed60f7e` fix: filter physics volumes like the client's collision groups |
+| 1179 | BUG: enemies aren't affected by speed alterations | done | `a48c92cc` fix: slows and speed buffs change enemy movement speed |
+| 1332 | ENH: make saving code safer | partial | `d57d4452` fix: read character flags the way they are written again<br>`7bfd793b` fix: character xml load and save no longer crash on bad data |
+| 1428 | BUG: enemies, summons etc stay aggro'd onto other entities that have died | done | `0f35cf44` fix: enemies and summons drop targets that have died |
+| 1563 | ENH: Admin defined "contraband" detection and removal | done | `0285ed9f` feat: contraband list with flagging and optional removal |
+| 1565 | BUG: Removing Brick from Property | done | `499fb51a` fix: brick by brick and model placement work the way the client expects |
+| 1632 | BUG: Getting kicked/disconnected while in Brick-By-Brick building mode causes the currently selected model to be wiped | done | `499fb51a` fix: brick by brick and model placement work the way the client expects<br>`3cb208f5` feat(db): bbb_autosave table for the client's BBB autosave |
+| 1971 | BUG: Avant Gardens Survival boundary incorrectly triggers | partial | `9ed60f7e` fix: filter physics volumes like the client's collision groups |
+| 2035 | BUG: Unbounded AMF3 associative-array entries use predictable hashing (potential HashDoS) | done | `e7068ae6` fix: bound AMF3 decoding and stop hashing client keys |
+
+## Waiting on other work
+
+- Needs the message conversion follow-ups (now unblocked): pets 536, 537, 539, 546, 547, 166; vendor buyback 1129; deletion restrictions 960; wrong-way warp 764.
+- Property behaviors 803, floating models 983: not started.