diff --git a/client/src/constants.ts b/client/src/constants.ts
index fdf49447..40133772 100644
--- a/client/src/constants.ts
+++ b/client/src/constants.ts
@@ -1,4 +1,4 @@
-export const CLIENT_VERSION = '3.0.0'
+export const CLIENT_VERSION = '3.1.0'
 export const SPEC_VERSION = '1'
 export const BATTLECODE_YEAR: number = 2025
 export const MAP_SIZE_RANGE = {
@@ -63,7 +63,49 @@ export const ENGINE_BUILTIN_MAP_NAMES: string[] = [
     'Snowglobe',
     'Barcode',
     'Flower',
-    'Piglets2'
+    'Piglets2',
+
+    // HS
+    'lighthouse',
+    'shell',
+    'walalilongla',
+    'mit',
+    'defensetower',
+    'maze',
+    'box',
+    'roads',
+    'Paintball',
+    'FourCorners',
+    'Snowman',
+    'Crab',
+    'Oasis',
+    'TheBest',
+    'starburst',
+    'Portal',
+    'Jail',
+    'PlumberGame',
+
+    // Quals
+    'boxofchocolates',
+    'sunrise',
+    'yearofthesnake',
+    'Circuit',
+    'headphones',
+    'Brat',
+    'Parking_lot',
+    'Rose',
+    'HungerGames',
+    'Castle',
+    'Bunny',
+    'Terminal',
+    'Leaf',
+    'BatSignal',
+    'CastleDefense',
+    'AlarmClock',
+    'DonkeyKong',
+    'rain',
+    'Dominoes',
+    'SandyBeach'
 ]
 
 export const TEAM_COLOR_NAMES = ['Silver', 'Gold']
diff --git a/engine/src/main/battlecode/world/resources/AlarmClock.map25 b/engine/src/main/battlecode/world/resources/AlarmClock.map25
new file mode 100644
index 00000000..4323b2ad
Binary files /dev/null and b/engine/src/main/battlecode/world/resources/AlarmClock.map25 differ
diff --git a/engine/src/main/battlecode/world/resources/BatSignal.map25 b/engine/src/main/battlecode/world/resources/BatSignal.map25
new file mode 100644
index 00000000..2719294e
Binary files /dev/null and b/engine/src/main/battlecode/world/resources/BatSignal.map25 differ
diff --git a/engine/src/main/battlecode/world/resources/Brat.map25 b/engine/src/main/battlecode/world/resources/Brat.map25
new file mode 100644
index 00000000..9cd3c9c4
Binary files /dev/null and b/engine/src/main/battlecode/world/resources/Brat.map25 differ
diff --git a/engine/src/main/battlecode/world/resources/Bunny.map25 b/engine/src/main/battlecode/world/resources/Bunny.map25
new file mode 100644
index 00000000..3828e750
Binary files /dev/null and b/engine/src/main/battlecode/world/resources/Bunny.map25 differ
diff --git a/engine/src/main/battlecode/world/resources/Castle.map25 b/engine/src/main/battlecode/world/resources/Castle.map25
new file mode 100644
index 00000000..aef0f720
Binary files /dev/null and b/engine/src/main/battlecode/world/resources/Castle.map25 differ
diff --git a/engine/src/main/battlecode/world/resources/CastleDefense.map25 b/engine/src/main/battlecode/world/resources/CastleDefense.map25
new file mode 100644
index 00000000..28a16b19
Binary files /dev/null and b/engine/src/main/battlecode/world/resources/CastleDefense.map25 differ
diff --git a/engine/src/main/battlecode/world/resources/Circuit.map25 b/engine/src/main/battlecode/world/resources/Circuit.map25
new file mode 100644
index 00000000..bd952587
Binary files /dev/null and b/engine/src/main/battlecode/world/resources/Circuit.map25 differ
diff --git a/engine/src/main/battlecode/world/resources/Crab.map25 b/engine/src/main/battlecode/world/resources/Crab.map25
new file mode 100644
index 00000000..48237d7e
Binary files /dev/null and b/engine/src/main/battlecode/world/resources/Crab.map25 differ
diff --git a/engine/src/main/battlecode/world/resources/Dominoes.map25 b/engine/src/main/battlecode/world/resources/Dominoes.map25
new file mode 100644
index 00000000..3ca4e925
Binary files /dev/null and b/engine/src/main/battlecode/world/resources/Dominoes.map25 differ
diff --git a/engine/src/main/battlecode/world/resources/DonkeyKong.map25 b/engine/src/main/battlecode/world/resources/DonkeyKong.map25
new file mode 100644
index 00000000..c416d5a6
Binary files /dev/null and b/engine/src/main/battlecode/world/resources/DonkeyKong.map25 differ
diff --git a/engine/src/main/battlecode/world/resources/FourCorners.map25 b/engine/src/main/battlecode/world/resources/FourCorners.map25
new file mode 100644
index 00000000..798e07cc
Binary files /dev/null and b/engine/src/main/battlecode/world/resources/FourCorners.map25 differ
diff --git a/engine/src/main/battlecode/world/resources/HungerGames.map25 b/engine/src/main/battlecode/world/resources/HungerGames.map25
new file mode 100644
index 00000000..5ac3078c
Binary files /dev/null and b/engine/src/main/battlecode/world/resources/HungerGames.map25 differ
diff --git a/engine/src/main/battlecode/world/resources/Jail.map25 b/engine/src/main/battlecode/world/resources/Jail.map25
new file mode 100644
index 00000000..93150a0f
Binary files /dev/null and b/engine/src/main/battlecode/world/resources/Jail.map25 differ
diff --git a/engine/src/main/battlecode/world/resources/Leaf.map25 b/engine/src/main/battlecode/world/resources/Leaf.map25
new file mode 100644
index 00000000..e1147e84
Binary files /dev/null and b/engine/src/main/battlecode/world/resources/Leaf.map25 differ
diff --git a/engine/src/main/battlecode/world/resources/Oasis.map25 b/engine/src/main/battlecode/world/resources/Oasis.map25
new file mode 100644
index 00000000..b70eac20
Binary files /dev/null and b/engine/src/main/battlecode/world/resources/Oasis.map25 differ
diff --git a/engine/src/main/battlecode/world/resources/Paintball.map25 b/engine/src/main/battlecode/world/resources/Paintball.map25
new file mode 100644
index 00000000..bb8f3b04
Binary files /dev/null and b/engine/src/main/battlecode/world/resources/Paintball.map25 differ
diff --git a/engine/src/main/battlecode/world/resources/Parking_lot.map25 b/engine/src/main/battlecode/world/resources/Parking_lot.map25
new file mode 100644
index 00000000..1f31e6df
Binary files /dev/null and b/engine/src/main/battlecode/world/resources/Parking_lot.map25 differ
diff --git a/engine/src/main/battlecode/world/resources/PlumberGame.map25 b/engine/src/main/battlecode/world/resources/PlumberGame.map25
new file mode 100644
index 00000000..82b6fa3e
Binary files /dev/null and b/engine/src/main/battlecode/world/resources/PlumberGame.map25 differ
diff --git a/engine/src/main/battlecode/world/resources/Portal.map25 b/engine/src/main/battlecode/world/resources/Portal.map25
new file mode 100644
index 00000000..8b07fd96
Binary files /dev/null and b/engine/src/main/battlecode/world/resources/Portal.map25 differ
diff --git a/engine/src/main/battlecode/world/resources/Rose.map25 b/engine/src/main/battlecode/world/resources/Rose.map25
new file mode 100644
index 00000000..88eae8c0
Binary files /dev/null and b/engine/src/main/battlecode/world/resources/Rose.map25 differ
diff --git a/engine/src/main/battlecode/world/resources/SandyBeach.map25 b/engine/src/main/battlecode/world/resources/SandyBeach.map25
new file mode 100644
index 00000000..791ec666
Binary files /dev/null and b/engine/src/main/battlecode/world/resources/SandyBeach.map25 differ
diff --git a/engine/src/main/battlecode/world/resources/Snowman.map25 b/engine/src/main/battlecode/world/resources/Snowman.map25
new file mode 100644
index 00000000..7d938672
Binary files /dev/null and b/engine/src/main/battlecode/world/resources/Snowman.map25 differ
diff --git a/engine/src/main/battlecode/world/resources/Terminal.map25 b/engine/src/main/battlecode/world/resources/Terminal.map25
new file mode 100644
index 00000000..4a937629
Binary files /dev/null and b/engine/src/main/battlecode/world/resources/Terminal.map25 differ
diff --git a/engine/src/main/battlecode/world/resources/TheBest.map25 b/engine/src/main/battlecode/world/resources/TheBest.map25
new file mode 100644
index 00000000..965ef8d9
Binary files /dev/null and b/engine/src/main/battlecode/world/resources/TheBest.map25 differ
diff --git a/engine/src/main/battlecode/world/resources/box.map25 b/engine/src/main/battlecode/world/resources/box.map25
new file mode 100644
index 00000000..9e0f7a87
Binary files /dev/null and b/engine/src/main/battlecode/world/resources/box.map25 differ
diff --git a/engine/src/main/battlecode/world/resources/boxofchocolates.map25 b/engine/src/main/battlecode/world/resources/boxofchocolates.map25
new file mode 100644
index 00000000..815ae889
Binary files /dev/null and b/engine/src/main/battlecode/world/resources/boxofchocolates.map25 differ
diff --git a/engine/src/main/battlecode/world/resources/defensetower.map25 b/engine/src/main/battlecode/world/resources/defensetower.map25
new file mode 100644
index 00000000..eec83424
Binary files /dev/null and b/engine/src/main/battlecode/world/resources/defensetower.map25 differ
diff --git a/engine/src/main/battlecode/world/resources/headphones.map25 b/engine/src/main/battlecode/world/resources/headphones.map25
new file mode 100644
index 00000000..c538f341
Binary files /dev/null and b/engine/src/main/battlecode/world/resources/headphones.map25 differ
diff --git a/engine/src/main/battlecode/world/resources/lighthouse.map25 b/engine/src/main/battlecode/world/resources/lighthouse.map25
new file mode 100644
index 00000000..db7b2aae
Binary files /dev/null and b/engine/src/main/battlecode/world/resources/lighthouse.map25 differ
diff --git a/engine/src/main/battlecode/world/resources/maze.map25 b/engine/src/main/battlecode/world/resources/maze.map25
new file mode 100644
index 00000000..66302d73
Binary files /dev/null and b/engine/src/main/battlecode/world/resources/maze.map25 differ
diff --git a/engine/src/main/battlecode/world/resources/mit.map25 b/engine/src/main/battlecode/world/resources/mit.map25
new file mode 100644
index 00000000..6550ca25
Binary files /dev/null and b/engine/src/main/battlecode/world/resources/mit.map25 differ
diff --git a/engine/src/main/battlecode/world/resources/rain.map25 b/engine/src/main/battlecode/world/resources/rain.map25
new file mode 100644
index 00000000..be7e0be6
Binary files /dev/null and b/engine/src/main/battlecode/world/resources/rain.map25 differ
diff --git a/engine/src/main/battlecode/world/resources/roads.map25 b/engine/src/main/battlecode/world/resources/roads.map25
new file mode 100644
index 00000000..ca3df75d
Binary files /dev/null and b/engine/src/main/battlecode/world/resources/roads.map25 differ
diff --git a/engine/src/main/battlecode/world/resources/shell.map25 b/engine/src/main/battlecode/world/resources/shell.map25
new file mode 100644
index 00000000..4880b532
Binary files /dev/null and b/engine/src/main/battlecode/world/resources/shell.map25 differ
diff --git a/engine/src/main/battlecode/world/resources/starburst.map25 b/engine/src/main/battlecode/world/resources/starburst.map25
new file mode 100644
index 00000000..d9acd297
Binary files /dev/null and b/engine/src/main/battlecode/world/resources/starburst.map25 differ
diff --git a/engine/src/main/battlecode/world/resources/sunrise.map25 b/engine/src/main/battlecode/world/resources/sunrise.map25
new file mode 100644
index 00000000..beb8160d
Binary files /dev/null and b/engine/src/main/battlecode/world/resources/sunrise.map25 differ
diff --git a/engine/src/main/battlecode/world/resources/walalilongla.map25 b/engine/src/main/battlecode/world/resources/walalilongla.map25
new file mode 100644
index 00000000..929903f2
Binary files /dev/null and b/engine/src/main/battlecode/world/resources/walalilongla.map25 differ
diff --git a/engine/src/main/battlecode/world/resources/yearofthesnake.map25 b/engine/src/main/battlecode/world/resources/yearofthesnake.map25
new file mode 100644
index 00000000..d811d54d
Binary files /dev/null and b/engine/src/main/battlecode/world/resources/yearofthesnake.map25 differ
diff --git a/specs/specs.pdf b/specs/specs.pdf
index 66cb57ce..19c2472c 100644
Binary files a/specs/specs.pdf and b/specs/specs.pdf differ