diff --git a/mpq/arr/units.txt b/mpq/arr/units.txt
index c7ee9621..9bdee495 100644
--- a/mpq/arr/units.txt
+++ b/mpq/arr/units.txt
@@ -386,13 +386,13 @@ Terran Lodestone
 Floor Hatch
 Terran Treasury
 Terran Lodestone (Standalone)
-Extended Unit #161
-Extended Unit #162
-Extended Unit #163
-Extended Unit #164
-Extended Unit #165
-Extended Unit #166
-Extended Unit #167
+Faction Selection
+Select Faction 1
+Select Faction 2
+Select Faction 3
+Select Faction 4
+Select Faction 5
+Select Faction 6
 Extended Unit #168
 Extended Unit #169
 Extended Unit #170
diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft
index 08991265..2ec4393a 100644
Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ
diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl
index 5684ad21..03faf517 100644
Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ
diff --git a/mpq/templates/Debug(1).got b/mpq/templates/Debug(1).got
index 33e01544..d13c0cdc 100644
Binary files a/mpq/templates/Debug(1).got and b/mpq/templates/Debug(1).got differ
diff --git a/mpq/templates/Faction Wars(1).got b/mpq/templates/Faction Wars(1).got
new file mode 100644
index 00000000..73f1bed4
Binary files /dev/null and b/mpq/templates/Faction Wars(1).got differ
diff --git a/mpq/templates/templates.lst b/mpq/templates/templates.lst
index b387e07e..9d98363d 100644
--- a/mpq/templates/templates.lst
+++ b/mpq/templates/templates.lst
@@ -1,4 +1,5 @@
 "Competitive(1).got"
 "Scenario(1).got"
 "Omnipresence(1).got"
+"Faction Wars(1).got"
 "Debug(1).got"
\ No newline at end of file
diff --git a/patchnotes.md b/patchnotes.md
index bf129b70..fb72ea62 100644
--- a/patchnotes.md
+++ b/patchnotes.md
@@ -9,6 +9,7 @@ Patch goals include:
 
 ## Latest content
 - [Ascension #6 - The New Horizon](https://www.youtube.com/playlist?list=PLACFHAM2MlxNIdDY8v4PpOKA9y5GrR0z6)
+- [Pr0totype #31 - A Qualifying Statement](https://youtu.be/31_kKGo5VlE):
 
 ## Patch summary (so far...)
 - Cut top speeds of several air units across all races and tiers
@@ -21,6 +22,10 @@ Patch goals include:
 - Shuffled Protoss structure buttons in construction submenus to improve organization
 - Added more debug info to help investigate desyncs, c. DF. Please screenshot and report if you encounter them!
 
+## Game Modes
+- Added Faction Wars (a Btyb bounty!), allowing players to select a subfaction.
+	- This mode is very much in a "minimum viable product" stage, and only Terran factions exist right now, with very few changes compared to stock Terrans... but it should still be neat!
+
 ## AI
 - Mappers can now set Mineral Field type 1 deaths to control the faction of AI. This is preliminary support as factions continue to receive development.
 	- See [this page](https://www.fraudsclub.com/cosmonarchy-bw/sites/scenario-setup/#gameplay-commands) for specific info.
@@ -32,6 +37,7 @@ Patch goals include:
 	- Fixed Sentinel and Sevenstop dealing double damage when not piercing
 	- Improved consistency of Kinetic Penetration attacks with Ancile Providence
 	- Improved reliability of Legionnaire and Cabalist teleportation (c. Veeq7)
+	- Corrected duration of Carapace Swarm (r. fagguto)
 	- Solarions that are preplaced or created with the `spawn` console command now start with 12 Stewards
 - Audiovisual:
 	- Multiselecting Terran workers now correctly hides the building submenus
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index 71bc1c58..f993c652 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ