diff --git a/main.go b/main.go
index 4849776..16cdbc7 100644
--- a/main.go
+++ b/main.go
@@ -172,7 +172,7 @@ var dj = mumbledj{
 	cache:         NewSongCache(),
 }
 
-var web WebServer
+var web *WebServer
 
 // main primarily performs startup tasks. Grabs and parses commandline
 // args, sets up the gumble client and its listeners, and then connects to the server.
diff --git a/web.go b/web.go
index cd192db..ba151eb 100644
--- a/web.go
+++ b/web.go
@@ -27,8 +27,8 @@ type Page struct {
 
 var external_ip = ""
 
-func makeWebserver(port int) WebServer {
-	webserver := WebServer{port, make(map[*gumble.User]string), make(map[string]*gumble.User)}
+func makeWebserver(port int) *WebServer {
+	webserver := &WebServer{port, make(map[*gumble.User]string), make(map[string]*gumble.User)}
 
 	http.HandleFunc("/", webserver.homepage)
 	http.HandleFunc("/add", webserver.add)