diff --git a/include/wwfcCommon.h b/include/wwfcCommon.h
index 10a6565..da34a3f 100644
--- a/include/wwfcCommon.h
+++ b/include/wwfcCommon.h
@@ -28,10 +28,10 @@ typedef double f64;
 
 #ifndef WWFC_DOMAIN
 
-#  ifdef USE_TEST_DOMAIN
-#    define WWFC_DOMAIN "nwfc.wiinoma.com" // Points to localhost
-#  else
+#  ifdef PROD
 #    define WWFC_DOMAIN "wiilink24.com"
+#  else
+#    define WWFC_DOMAIN "nwfc.wiinoma.com" // Points to localhost
 #  endif
 
 #endif
diff --git a/include/wwfcPayloadPublicKey.hpp b/include/wwfcPayloadPublicKey.hpp
index aedf80a..19b7c74 100644
--- a/include/wwfcPayloadPublicKey.hpp
+++ b/include/wwfcPayloadPublicKey.hpp
@@ -3,6 +3,9 @@
 namespace wwfc
 {
 
+#ifdef PROD
+
+// Production payload key
 constexpr unsigned char PayloadPublicKey[] = {
     0x7d, 0x18, 0x2b, 0x27, 0x9c, 0xab, 0x6b, 0x69, 0x40, 0x8d, 0x11, 0xb7,
     0x5e, 0x76, 0xb2, 0xda, 0xa6, 0x18, 0xa1, 0x0e, 0x5d, 0x5f, 0xf3, 0xc9,
@@ -49,4 +52,55 @@ constexpr unsigned char PayloadPublicKey[] = {
     0x78, 0x86, 0xc1, 0x70, 0x36, 0x0c, 0xe0, 0xee, 0x24, 0xfe, 0x0f, 0xf3,
 };
 
-}
+#else
+
+// Development payload key
+constexpr unsigned char PayloadPublicKey[] = {
+    0x3f, 0x32, 0xeb, 0x87, 0xb9, 0x75, 0x15, 0xc9, 0x60, 0x17, 0x7c, 0xcf,
+    0x52, 0x18, 0x36, 0x66, 0x8e, 0xe9, 0x26, 0xe8, 0x58, 0x1f, 0xff, 0x84,
+    0xca, 0x63, 0x63, 0x9f, 0x4f, 0xa5, 0x77, 0x41, 0xe4, 0x4e, 0x5c, 0x49,
+    0xb7, 0x54, 0x15, 0xf5, 0x74, 0x70, 0xbc, 0xf4, 0xce, 0x5e, 0x66, 0x78,
+    0xf1, 0xe5, 0xfe, 0x3a, 0x98, 0x18, 0xbd, 0x8f, 0x9a, 0xb7, 0x52, 0x99,
+    0x7c, 0x80, 0x00, 0x81, 0xf3, 0xc0, 0xce, 0xf1, 0x8b, 0xac, 0x43, 0x18,
+    0x44, 0x95, 0x7e, 0xb8, 0x06, 0x41, 0x0e, 0xa7, 0x3e, 0x0e, 0xc0, 0x68,
+    0x01, 0x69, 0x88, 0x86, 0x81, 0x2f, 0xfe, 0x5d, 0xfb, 0x62, 0xcf, 0x0e,
+    0xdf, 0x4b, 0x1c, 0x67, 0x0f, 0x09, 0xaf, 0x37, 0x40, 0x60, 0x06, 0x34,
+    0xe4, 0xc8, 0x98, 0x55, 0xf3, 0xd0, 0xb5, 0xfe, 0x8c, 0x92, 0x92, 0xe0,
+    0x69, 0xd9, 0x02, 0x7d, 0xe5, 0x1e, 0x55, 0x00, 0x1c, 0xdf, 0x44, 0xd6,
+    0x51, 0x4b, 0xd6, 0xd3, 0xe2, 0xbc, 0xc0, 0xca, 0xf8, 0x42, 0x90, 0xee,
+    0x90, 0xf7, 0xc5, 0xce, 0x6d, 0xd2, 0x3d, 0x9e, 0x26, 0x6d, 0x97, 0xe0,
+    0xc0, 0x82, 0x8c, 0x63, 0xdc, 0xd6, 0x80, 0x67, 0xc7, 0x58, 0x72, 0xd2,
+    0xbe, 0x2f, 0xe4, 0x39, 0x5a, 0x6c, 0x0d, 0x8a, 0xb4, 0x88, 0xef, 0x3d,
+    0xd2, 0xde, 0xda, 0x48, 0x62, 0xda, 0x9e, 0x5f, 0xce, 0x3e, 0xd9, 0x09,
+    0x1e, 0xc6, 0x74, 0x4d, 0x74, 0xd2, 0x6f, 0xba, 0x83, 0xc0, 0x4b, 0x7e,
+    0xe0, 0x76, 0x2c, 0x45, 0xa8, 0x32, 0xac, 0xbc, 0x8d, 0x65, 0xdf, 0xdc,
+    0x9d, 0x00, 0x2e, 0x8a, 0xf8, 0x4b, 0x82, 0x35, 0xbd, 0xe3, 0x04, 0x91,
+    0xae, 0x3d, 0x5b, 0xe9, 0xef, 0x85, 0xc2, 0xb1, 0xd5, 0xd4, 0xf6, 0x1d,
+    0x30, 0xbc, 0xcd, 0x3e, 0x38, 0xf8, 0x51, 0x55, 0xfc, 0x5a, 0x1b, 0x64,
+    0x3f, 0x64, 0x37, 0x2e, 0xe5, 0xe7, 0x0d, 0x68, 0x88, 0xfc, 0x55, 0x3d,
+    0x69, 0x5e, 0x4d, 0xcd, 0x18, 0xea, 0xd3, 0xd7, 0x41, 0x4c, 0x64, 0x82,
+    0x9f, 0x4f, 0xc9, 0x97, 0x0a, 0xe9, 0x74, 0x3c, 0x94, 0xf9, 0x82, 0x7f,
+    0x3e, 0x89, 0x9a, 0x4e, 0x62, 0x0e, 0x99, 0xb9, 0x4f, 0xbb, 0xef, 0x05,
+    0x18, 0x1f, 0x61, 0xc7, 0xe1, 0xed, 0xf8, 0x70, 0xbf, 0x81, 0xe6, 0x9c,
+    0x58, 0xb4, 0x9a, 0xdf, 0x30, 0xdc, 0xbe, 0xb3, 0x38, 0x9f, 0x53, 0x57,
+    0x7c, 0xa7, 0x1e, 0xe5, 0xd9, 0x11, 0x67, 0x09, 0x09, 0xc0, 0xc6, 0x20,
+    0x69, 0x60, 0xda, 0xd3, 0x1d, 0x87, 0x0e, 0xed, 0x15, 0xf0, 0x85, 0x2c,
+    0x68, 0xcd, 0x18, 0xa6, 0x07, 0x04, 0xc1, 0xf9, 0xa4, 0xfb, 0x74, 0x56,
+    0x98, 0xd7, 0x46, 0xfc, 0x31, 0x47, 0x6a, 0x09, 0x04, 0xa3, 0x76, 0x3b,
+    0x26, 0x83, 0x34, 0xde, 0xd2, 0x22, 0xf2, 0x3f, 0xd4, 0xd9, 0xbb, 0xf0,
+    0xba, 0x3f, 0xb3, 0x1e, 0x96, 0x44, 0x04, 0xa1, 0xc8, 0x40, 0xb2, 0x0c,
+    0x8a, 0x07, 0xea, 0x16, 0x7d, 0x57, 0x49, 0x9e, 0x6b, 0xec, 0xd3, 0xe1,
+    0x77, 0x29, 0x35, 0x6f, 0x82, 0xd7, 0xb8, 0x5a, 0x2b, 0xf3, 0x1a, 0x79,
+    0xf9, 0x84, 0xaf, 0x7a, 0x35, 0x85, 0x26, 0xb4, 0xfc, 0x58, 0x2f, 0x89,
+    0x2a, 0x97, 0xc8, 0x49, 0xb3, 0x61, 0xbd, 0xf5, 0xda, 0xe9, 0x87, 0x9b,
+    0xea, 0x5c, 0x4c, 0x15, 0x19, 0x1f, 0x76, 0x0c, 0x01, 0x6f, 0x32, 0x80,
+    0x73, 0xd1, 0xc4, 0x4a, 0x87, 0x32, 0x1e, 0xd6, 0xdf, 0xd9, 0x0a, 0x27,
+    0x66, 0xb2, 0x74, 0xc1, 0xca, 0xae, 0x16, 0xca, 0x17, 0x66, 0x09, 0xe9,
+    0x37, 0xca, 0x20, 0xfe, 0xa2, 0xa6, 0x7b, 0x2c, 0xd9, 0x6d, 0x91, 0x26,
+    0xe6, 0x61, 0xdd, 0xbb, 0x11, 0x18, 0x7c, 0xfb, 0x8f, 0x43, 0x71, 0x6b,
+    0x6a, 0xa2, 0x0a, 0xd3, 0xc6, 0x98, 0x94, 0xd8, 0x63, 0xb0, 0x49, 0xf5,
+};
+
+#endif
+
+} // namespace wwfc
diff --git a/misc/private-key-dev.pem b/misc/private-key-dev.pem
new file mode 100644
index 0000000..659c6a1
--- /dev/null
+++ b/misc/private-key-dev.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDl5w1oP2Q3Lvxa
+G2Q4+FFVMLzNPtXU9h3vhcKxrj1b6b3jBJH4S4I1nQAuio1l39yoMqy84HYsRYPA
+S3500m+6HsZ0Tc4+2Qli2p5f0t7aSLSI7z1abA2Kvi/kOcdYctLc1oBnwIKMYyZt
+l+Bt0j2ekPfFzvhCkO7ivMDKUUvW0xzfRNblHlUAadkCfYySkuDz0LX+5MiYVUBg
+BjQPCa8330scZ/tizw6BL/5dAWmIhj4OwGgGQQ6nRJV+uIusQxjzwM7xfIAAgZq3
+UpmYGL2P8eX+Os5eZnh0cLz0t1QV9eROXElPpXdBymNjn1gf/4SO6SboUhg2ZmAX
+fM+5dRXJAgMBAAECggEAAN/WVfdpwOj5ljkk8i+FlaqcCTbMNuVhu0O5uBXGz3bt
+3TNq/7P/0IbilYq623CUxQH+VLCQ2n3AMMbIuhaDzMQpso8KMgR+y+Szdf9WECP3
+Jc8tH08qZQTwpzBOEQjMwwDA18Qsau7EmmWZuakzSUtZWeP93zjwY6XeoNZa0LwW
+du67QsS0ejKAQGn2hRJwDCzUFVcCYQ6Hrlr6Idouf2AVRYyvJT1pfgO5+dhLmv4h
+y6o/ibM8rVUc+izbrqPTjF7fil6lPkCkdps4q1Iw0qXx4ulsNE5k0p90Lyawzubq
+w7uZhFZsUqBG71aIpax4tpLo1KXJbFVXD+epOrwHRQKBgQD9NZdLp3ojBKpI7Efe
+uZjUZZeEHZ/cYu9EDhlcYI3LilM1i3i6nZey4072grWmy3fANE8067GPB5g7DEPJ
+vnSPgfKSSHYlYE8mQrk3Evm6zNlaTc2VN+ugJqUdZ6UimE5SNSN3J0Oz6xap4zbn
+6qZo51pd0ERlhxdImQ08Zv4IBQKBgQDob7QFdq30+PIy928BxohvCh0yu/E/VZaH
+F/1J3OTOTrdT0zoHlq6EhL9nTEe0EENY1H3UaJfXXifMaeUc0908d8q7xNJe1r/4
+b8mhpFWOGNbG5L9FPX0F/embVby7BkgjRs9J4Iw445D/e04BlYPZGri8tdi7COh9
+sY+IpSMV9QKBgQCqAatdbksA7AbxA0OV9QL5yGQcnk9RB1QiW10HuwQ5HtyTXNto
+YJsTzq6bsFMKdB4o/HYZ0A3dPHonWyrAb5GPMO6O7Pv2SF2cELyOj70AgL2GdiqL
+/4nCc2/0+DvVqHEdnPP88m3whO0oj5ezysaENKFlz4m8qSEm6ywJ3BS/iQKBgDfM
+oSXyoL4/iT1NAzwk4hnuDqZgUgEHVfSmgKrbuZ4BbadU/QhXVxv/FkgBGvGSOei4
+UmDMny8Xrmw3O8ZY4jKi+2tqS6py2XEVvQzt+4/6TI1A2t4PbdUjaJJe2cj4MBcv
+55Fvs5nwn52Fh2t/7kAPVywOZ7I26EFMgA2ovyyFAoGAPuH7YNA+QZ0CklkCVdFW
+kK3tcKrj7OD0wg+f0jWhLJBFllz7kSxrx74gNVvEdAtgekdDuq2Dcr8ZaD1TpnpN
+7heXaUYXJQpGwGB2dqnC3TiwFiTxzqnLD4dhMpPt/Q8DQC+JZ9O3qy0oALX0GIkn
+vQOkiErau2+0+ZsaB1IRRZ4=
+-----END PRIVATE KEY-----
diff --git a/stage1/make-stage1.py b/stage1/make-stage1.py
index 89a28ce..9b236b2 100644
--- a/stage1/make-stage1.py
+++ b/stage1/make-stage1.py
@@ -20,11 +20,11 @@
 except:
     pass
 
-ccflags = "-Os -std=c++20 -fno-rtti -ffreestanding -nodefaultlibs -nostdlib -fno-unwind-tables -fno-exceptions -fmerge-all-constants -ffunction-sections -fdata-sections -fshort-enums -nodefaultlibs -nostdlib -lgcc -Wl,--gc-sections "
+ccflags = "-g -Os -std=c++20 -fno-rtti -ffreestanding -nodefaultlibs -nostdlib -fno-unwind-tables -fno-exceptions -fmerge-all-constants -ffunction-sections -fdata-sections -fshort-enums -nodefaultlibs -nostdlib -lgcc -Wl,--gc-sections -n "
 ccflags += "-I" + os.path.join("..", "include")
 
-subprocess.run([path_cc, "wwfcStage1.cpp"] + ccflags.split(" ") + ["-S", "-o" + os.path.join(path_build, "build.s")] + extra_build_flags).check_returncode()
+subprocess.run([path_cc, "wwfcStage1.cpp"] + ccflags.split(" ") + ["-S", "-o" + os.path.join(path_build, "stage1.s")] + extra_build_flags).check_returncode()
 
-subprocess.run([path_cc, os.path.join(path_build, "build.s")] + ccflags.split(" ") + ['-o' + os.path.join(path_build, "build.elf"), "-Tstage1.ld"]).check_returncode()
+subprocess.run([path_cc, os.path.join(path_build, "stage1.s")] + ccflags.split(" ") + ['-o' + os.path.join(path_build, "stage1.elf"), "-Tstage1.ld"]).check_returncode()
 
-subprocess.run([path_objcopy, os.path.join(path_build, "build.elf"), os.path.join(path_build, "stage1.bin"), "-O", "binary"]).check_returncode()
+subprocess.run([path_objcopy, os.path.join(path_build, "stage1.elf"), os.path.join(path_build, "stage1.bin"), "-O", "binary"]).check_returncode()