diff --git a/goonserver b/goonserver
index 23474c1..b73d8de 160000
--- a/goonserver
+++ b/goonserver
@@ -1 +1 @@
-Subproject commit 23474c19dc152d730bb554040a92d0b5a8ec59e9
+Subproject commit b73d8de85149e8f6d6fe1e8d69562a0a26f7df23
diff --git a/main.go b/main.go
index 3520ce5..c42fcfb 100644
--- a/main.go
+++ b/main.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"flag"
 	"log"
 
 	"gitea.boner.be/bdnugget/goonscape/game"
@@ -9,6 +10,13 @@ import (
 )
 
 func main() {
+	local := flag.Bool("local", false, "Use local server instead of remote")
+	flag.Parse()
+
+	if *local {
+		network.SetServerAddr("localhost:6969")
+	}
+
 	rl.InitWindow(1024, 768, "GoonScape")
 	defer rl.CloseWindow()
 	rl.InitAudioDevice()
diff --git a/network/network.go b/network/network.go
index deba00b..02da330 100644
--- a/network/network.go
+++ b/network/network.go
@@ -14,8 +14,14 @@ import (
 	"google.golang.org/protobuf/proto"
 )
 
+var serverAddr = "boner.be:6969"
+
+func SetServerAddr(addr string) {
+	serverAddr = addr
+}
+
 func ConnectToServer() (net.Conn, int32, error) {
-	conn, err := net.Dial("tcp", types.ServerAddr)
+	conn, err := net.Dial("tcp", serverAddr)
 	if err != nil {
 		log.Printf("Failed to dial server: %v", err)
 		return nil, 0, err
diff --git a/types/types.go b/types/types.go
index 9462593..6062703 100644
--- a/types/types.go
+++ b/types/types.go
@@ -58,6 +58,4 @@ const (
 	ServerTickRate = 600 * time.Millisecond
 	ClientTickRate = 50 * time.Millisecond
 	MaxTickDesync  = 5
-	// ServerAddr     = "localhost:6969"
-	ServerAddr = "boner.be:6969"
 )