diff --git a/src/server.js b/src/server.js
index a63b0a8..1e2bc15 100644
--- a/src/server.js
+++ b/src/server.js
@@ -15,7 +15,7 @@ let server = {}
 let registeredUserlist = require("../src/userlist.js")
 
 server.create = function create() {
-    return net.createServer((socket) => {
+    let server = net.createServer((socket) => {
         const user = new User(socket)
         socket.on('data', function (data) {
             let tokenized = data.toString("ascii").split("\r\n")[0].split(" ")
@@ -54,6 +54,12 @@ server.create = function create() {
         console.error(err);
         throw err;
     });
+
+    server.getUserlist = function() {
+      return registeredUserlist
+    }
+
+    return server
 }
 
 
diff --git a/test/command_create.js b/test/command_create.js
index b3afce3..4a1c752 100644
--- a/test/command_create.js
+++ b/test/command_create.js
@@ -9,4 +9,12 @@ describe('IRC server', function () {
             assert.equal(server.eventNames().toString(), ["connection", "error"].toString())
         })
     })
+
+    describe('#getUserlist()', function () {
+        it("should return a socket server", function () {
+            const server = IRCServer.create()
+
+            assert.equal(server.getUserlist().toString(), {}.toString())
+        })
+    })
 })