diff --git a/.efrocachemap b/.efrocachemap
index e87d9c38..12023520 100644
--- a/.efrocachemap
+++ b/.efrocachemap
@@ -3971,50 +3971,50 @@
   "assets/src/ba_data/python/ba/_generated/__init__.py": "https://files.ballistica.net/cache/ba1/ee/e8/cad05aa531c7faf7ff7b96db7f6e",
   "assets/src/ba_data/python/ba/_generated/enums.py": "https://files.ballistica.net/cache/ba1/b2/e5/0ee0561e16257a32830645239f34",
   "ballisticacore-windows/Generic/BallisticaCore.ico": "https://files.ballistica.net/cache/ba1/89/c0/e32c7d2a35dc9aef57cc73b0911a",
-  "build/prefab/full/linux_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/b1/2b/b08dc398c29d5024681618a1d2d8",
-  "build/prefab/full/linux_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/d8/88/9464948c30cea889e76b083bb760",
-  "build/prefab/full/linux_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/e4/16/f82a8b3619e68545defaae208926",
-  "build/prefab/full/linux_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/da/ef/7752b634470bd8ab63b28298cbc6",
-  "build/prefab/full/linux_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/ae/1b/1dbb45d9bcfe1858336f8b6b4577",
-  "build/prefab/full/linux_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/f2/a0/068303fd1d6c54aae4b51be7dc54",
-  "build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/17/52/72fd9ca052ff59127dda66c81550",
-  "build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/5a/68/cc591bf303b5fadd77fd0c019cd3",
-  "build/prefab/full/mac_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/00/00/5eb4736f2ec9244733c9f00d3b89",
-  "build/prefab/full/mac_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/cb/f6/e83c8b2cea074ae1633eaf360a40",
-  "build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/1b/6c/0ea8c0cd58ea4217fda22f58a049",
-  "build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/fc/3b/29cefdfa6e9db08bf1420a8fa73c",
-  "build/prefab/full/mac_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/0e/d5/0b61532a686c2f602fb27e1afa5a",
-  "build/prefab/full/mac_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/ea/ff/c3705f531a48f06b40fe34ad743c",
-  "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/7f/8b/3e896f5edc78242e72898f362130",
-  "build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/1d/09/2cd2f288276b42f1e574e39b965e",
-  "build/prefab/full/windows_x86_gui/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/80/0f/69e743c19a94085ce0e07c2f88cc",
-  "build/prefab/full/windows_x86_gui/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/72/cf/af396a9c003e180bbb4c60602b26",
-  "build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/ee/30/f0dc4b22077d53ffec9dddec0288",
-  "build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/0f/84/02735a1389e3c2591aa6735f781d",
-  "build/prefab/lib/linux_arm64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/47/82/77ec49a1d1d5b2ea617c2cc04685",
-  "build/prefab/lib/linux_arm64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/21/b4/f005c9ca382f6fa93ae3a2b55901",
-  "build/prefab/lib/linux_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/21/b0/04a40d5692c48b4d688429fe56ba",
-  "build/prefab/lib/linux_arm64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/c4/f3/145c5841e94c4c3d98587ab181f8",
-  "build/prefab/lib/linux_x86_64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/03/c3/4f1ec44c17ce63f718185b51dd1d",
-  "build/prefab/lib/linux_x86_64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/0c/1d/49f30685edbf73fe166574692129",
-  "build/prefab/lib/linux_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/48/05/59458308186e259ec1b73fcd09fe",
-  "build/prefab/lib/linux_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/f0/f1/d5b78aac73a26c2a91473a3c7c30",
-  "build/prefab/lib/mac_arm64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/a7/92/fd2224576bc4404ce7ab55f5dcfd",
-  "build/prefab/lib/mac_arm64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/9d/e1/5a270c9315e7b9ba639380e1cce0",
-  "build/prefab/lib/mac_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/a5/0d/dc99916313b77360404fb8dd43ab",
-  "build/prefab/lib/mac_arm64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/64/c7/b8f5454fe17557eb0fce63e8bc88",
-  "build/prefab/lib/mac_x86_64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/74/3e/304742abfbaacd54bf9f3e18c365",
-  "build/prefab/lib/mac_x86_64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/6b/d6/4ca4a7b8d4e39a4bae9cc0d53521",
-  "build/prefab/lib/mac_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/f1/f7/16acbb515fb5475af0bd27aa2892",
-  "build/prefab/lib/mac_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/93/94/8bc6d04efae6cd32add3c215f694",
-  "build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/38/de/eb05e64d4d384f9b62cffc385614",
-  "build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/04/1b/365aa5ccad6261a4e0d811bf0a0e",
-  "build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/27/79/70c9affabe2e779a3b89850eeac7",
-  "build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/bf/b7/0fa7b6fc2028f7c506aeabb89a4b",
-  "build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/b5/fc/ef6ac4ceb33ffb3b303ffa021b18",
-  "build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/0d/c5/87eba7cfb210cb96ce5c35c2c83a",
-  "build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/5f/86/9f97fba09d749414243197e4a81a",
-  "build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/f6/2e/5ae987804637e08ca3a160dae167",
+  "build/prefab/full/linux_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/6a/69/2c6b0ff6d371121664eb109af5d6",
+  "build/prefab/full/linux_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/e7/ff/f16ccc252f7d0aebd43fd37c593c",
+  "build/prefab/full/linux_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/c9/d1/254eba56a938cdbed1ec38b84168",
+  "build/prefab/full/linux_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/81/7d/ca296c036d6cb5db18da0882e276",
+  "build/prefab/full/linux_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/d3/25/a6c231afecba0abbe6cc53383523",
+  "build/prefab/full/linux_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/78/da/cd0f90527eff2d1ef232bf18b2d9",
+  "build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/2d/e3/594efb1e9fceeaea341af1f124d9",
+  "build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/70/b3/b1fc59b4d8e19d19450c50259286",
+  "build/prefab/full/mac_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/60/e0/a275130816efc34519ad7b643145",
+  "build/prefab/full/mac_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/41/57/39520619258ee4617e8c3eb04d92",
+  "build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/cd/0b/40fa469c1ba9c7e51b0817260ec6",
+  "build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/a1/6e/41fdc25aa2b8ab7299b21f7755d5",
+  "build/prefab/full/mac_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/c5/5c/da319a804d7ccfc8264f7d73c973",
+  "build/prefab/full/mac_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/38/b8/ae69d9ae6dac03db0703c81799a1",
+  "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/be/76/c57641fbb3e5b00ae6e16be0beab",
+  "build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/6e/80/07e43a7b79ddae5b5b75e698df76",
+  "build/prefab/full/windows_x86_gui/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/25/09/95d58c93d837133ebf11f3f40bc1",
+  "build/prefab/full/windows_x86_gui/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/4c/70/473151d4424e08e8b2680725287f",
+  "build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/fb/74/ab8c8a08f6a363150f5d39efcd0d",
+  "build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/99/4c/1096f4a174e3ab6a6c87428e92d6",
+  "build/prefab/lib/linux_arm64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/85/b7/265dfa889cc5e140eb2879990265",
+  "build/prefab/lib/linux_arm64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/11/c5/639acccff26d32b5ae24773a1a4c",
+  "build/prefab/lib/linux_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/63/51/54d8cd9c37f89d51a5ccf816a0e2",
+  "build/prefab/lib/linux_arm64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/e2/74/cdb11d68f254dbe82f0b3b1a45fc",
+  "build/prefab/lib/linux_x86_64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/4c/22/e47a3d6d7739864cc0dd2212776f",
+  "build/prefab/lib/linux_x86_64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/25/e0/dd19a2f6633c3797a1708d632cb4",
+  "build/prefab/lib/linux_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/95/4a/4e4bf885d51aeb49456106374494",
+  "build/prefab/lib/linux_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/d5/b5/a1c88d31b05806c206d875f1ae41",
+  "build/prefab/lib/mac_arm64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/03/66/73f87c0951ab1a82a7e5baddd71f",
+  "build/prefab/lib/mac_arm64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/33/e8/3354ff2e0e9ef2cbc50fafef772c",
+  "build/prefab/lib/mac_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/53/39/d403ce838cf9687020ed6b922596",
+  "build/prefab/lib/mac_arm64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/c8/c8/119730066e07d167d3f6630c2a9c",
+  "build/prefab/lib/mac_x86_64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/dd/17/f9c1188c7b7882b01d74a58fe748",
+  "build/prefab/lib/mac_x86_64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/06/ce/860e36599b96a23066480be50886",
+  "build/prefab/lib/mac_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/b2/a1/65fd150a910a3a25606c3403fc0a",
+  "build/prefab/lib/mac_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/35/2e/d9efd863b4fd75e562d7b71d7ea9",
+  "build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/72/69/d837b124c3d07c19af12e895408d",
+  "build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/4b/cf/76ce544675caa44f3cbd066c650b",
+  "build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/db/f1/2b07f22d301c45b674b636ffb763",
+  "build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/f8/5f/0d67330ee61a2481b6d318db7546",
+  "build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/52/14/cfa8d8d193ceac0badc9cac4e00e",
+  "build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/1a/f1/2d59926e5c57a2fd328262c47a25",
+  "build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/9c/db/6763dc5f3b6f69f44b71d194a20d",
+  "build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/40/da/e23d3bd4408e523bd342a0e25cdb",
   "src/ballistica/generated/python_embedded/binding.inc": "https://files.ballistica.net/cache/ba1/6e/6f/004b696e9a13b083069374e4bb6a",
   "src/ballistica/generated/python_embedded/bootstrap.inc": "https://files.ballistica.net/cache/ba1/d3/db/e73d4dcf1280d5f677c3cf8b47c3"
 }
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61a9e9c1..249545e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-### 1.7.0 (20584, 2022-05-31)
+### 1.7.0 (20586, 2022-05-31)
 - V2 accounts are now available (woohoo!). These are called 'BombSquad Accounts' in the account section. V2 accounts communicate with a completely new server and will be the foundation for lots of new functionality in the future. However they also function as a V1 account so existing functionality should still work. Note that the new 'workspaces' feature for V2-accounts is not yet enabled in this build, but it will be in the next few builds. Also note that account types such as GameCenter and Google-Play will be 'upgraded' to V2 accounts in the future so there is no need to try this out if you use one of those. But if you use device-accounts you might want to create yourself a V2 account, since device-accounts will remain V1-only (though you can link an old device-account to a v2-enabled account if you want to keep your progress). Getting a V2 account now also gives you a chance to reserve a nice account-tag before all the good ones are taken.
 - Legacy account subsystem has been renamed from `ba.app.accounts` to `ba.app.accounts_v1`
 - Added `ba.app.accounts_v2` subsystem for working with V2 accounts.
@@ -16,6 +16,7 @@
 - `_ba.get_account_misc_read_val_2()` is now `_ba.get_v1_account_misc_read_val_2()`
 - `_ba.get_account_ticket_count()` is now `_ba.get_v1_account_ticket_count()`
 - Exposing more sources in the public repo; namely networking stuff. I realize this probably opens up some attack vectors for hackers but also opens up options for server-owners to add their own defenses without having to wait on me. Hopefully this won't prove to be a bad idea.
+- V2 master server addr is now simply https://ballistica.net. If you had saved links to the previous address, https://tools.ballistica.net, please update them, as the old address may stop working at some point.
 
 
 ### 1.6.12 (20567, 2022-05-04)
diff --git a/src/ballistica/ballistica.cc b/src/ballistica/ballistica.cc
index 37a8a858..425ce5e7 100644
--- a/src/ballistica/ballistica.cc
+++ b/src/ballistica/ballistica.cc
@@ -21,7 +21,7 @@
 namespace ballistica {
 
 // These are set automatically via script; don't modify them here.
-const int kAppBuildNumber = 20584;
+const int kAppBuildNumber = 20586;
 const char* kAppVersion = "1.7.0";
 
 // Our standalone globals.
diff --git a/tools/efrotools/efrocache.py b/tools/efrotools/efrocache.py
index 9cfd932d..7b38c52b 100644
--- a/tools/efrotools/efrocache.py
+++ b/tools/efrotools/efrocache.py
@@ -275,13 +275,14 @@ def _upload_cache(fnames1: list[str], fnames2: list[str], hashes_str: str,
     print(f'{Clr.SBLU}Pushing cache to staging...{Clr.RST}', flush=True)
     subprocess.run(
         'rsync --progress --recursive --human-readable build/efrocache/'
-        ' ubuntu@ballistica.net:files.ballistica.net/cache/ba1/',
+        ' ubuntu@staging.ballistica.net:files.ballistica.net/cache/ba1/',
         shell=True,
         check=True)
 
     # Now generate the starter cache on the server..
     subprocess.run(
-        'ssh -oBatchMode=yes -oStrictHostKeyChecking=yes ubuntu@ballistica.net'
+        'ssh -oBatchMode=yes -oStrictHostKeyChecking=yes '
+        'ubuntu@staging.ballistica.net'
         ' "cd files.ballistica.net/cache/ba1 && python3 genstartercache.py"',
         shell=True,
         check=True)