diff --git a/source/debug.c b/source/debug.c
new file mode 100644
index 0000000..e90429c
--- /dev/null
+++ b/source/debug.c
@@ -0,0 +1,17 @@
+// debug features for libreshop_client
+#include <stdio.h>
+#include <gccore.h>
+#include <wiiuse/wpad.h>
+
+void debug_pause() {
+	while(1) {
+		WPAD_ScanPads();
+		if (WPAD_ButtonsDown(0)) break;
+	}
+}
+
+void debug_npause() {
+	printf("Press any button to continue...\n");
+	VIDEO_WaitVSync();
+	debug_pause();
+}
diff --git a/source/debug.h b/source/debug.h
new file mode 100644
index 0000000..4ba7dba
--- /dev/null
+++ b/source/debug.h
@@ -0,0 +1,7 @@
+#ifndef DEBUG_H
+#define DEBUG_H
+
+void debug_pause();
+void debug_npause();
+
+#endif
diff --git a/source/main.c b/source/main.c
index 2547f5a..cf9e66d 100644
--- a/source/main.c
+++ b/source/main.c
@@ -6,6 +6,9 @@
 
 #include "sandia/sandia.h"
 
+// Uncomment if this is a development build
+//#include "debug.h"
+
 static void *xfb = NULL;
 static GXRModeObj *rmode = NULL;
 
@@ -26,8 +29,10 @@ void logprint(int type, char *message) {
 			break;
 		case 2:
 			printf("\x1b[34m[\x1b[31m--\x1b[34m]");
+			break;
 		case 3:
 			printf("\x1b[31m!!\x1b[34m]");
+			break;
 		default:
 			printf("    ");
 	}
@@ -68,6 +73,9 @@ int main(int argc, char **argv) {
 
 	printheader();
 	logprint(0, "Welcome to LibreShop!\n");
+#ifdef DEBUG_H
+	logprint(2, "Warning! You are running a DEBUG build.\n");
+#endif
 	logprint(0, "Initializing network.\n");
 
 	ret = if_config(localip, netmask, gateway, TRUE, 20);