diff --git a/.idea/php-test-framework.xml b/.idea/php-test-framework.xml
new file mode 100644
index 0000000..c20ee25
--- /dev/null
+++ b/.idea/php-test-framework.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PhpTestFrameworkVersionCache">
+    <tools_cache>
+      <tool tool_name="PHPUnit">
+        <cache>
+          <versions>
+            <info id="Local" version="6.5.13" />
+          </versions>
+        </cache>
+      </tool>
+    </tools_cache>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/php.xml b/.idea/php.xml
new file mode 100644
index 0000000..4ca683a
--- /dev/null
+++ b/.idea/php.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PhpProjectSharedConfiguration" php_language_level="7.1" />
+  <component name="PhpUnit">
+    <phpunit_settings>
+      <PhpUnitSettings load_method="PHPUNIT_PHAR" custom_loader_path="" phpunit_phar_path="$PROJECT_DIR$/../php-7.3.0-Win32-VC15-x64/phpunit-6.5.13.phar" />
+    </phpunit_settings>
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/entryPoint.php b/src/entryPoint.php
index c1d1184..dbf9e89 100644
--- a/src/entryPoint.php
+++ b/src/entryPoint.php
@@ -1,16 +1,16 @@
-<?php
-
-// Placeholder Globals
-$userid = 0;
-$room_lang = "th";
-$is_admin = false;
-define("BLUE_ROOM", 12345);
-define("RED_ROOM", 67890);
-define("INTER_ROOM", 111213);
-
-// randomorg($start,$end);
-
-function reply_user($room_id, $msgid, $message)
-{
-    return $msgid;
+<?php
+
+// Placeholder Globals
+$userid = 0;
+$room_lang = "th";
+$is_admin = false;
+define("BLUE_ROOM", 12345);
+define("RED_ROOM", 67890);
+define("INTER_ROOM", 111213);
+
+// randomorg($start,$end);
+
+function reply_user($room_id, $msgid, $message) : string
+{
+    return $msgid;
 }
\ No newline at end of file
diff --git a/src/repl.php b/src/repl.php
index 240634a..2b4d142 100644
--- a/src/repl.php
+++ b/src/repl.php
@@ -1,17 +1,17 @@
-<?php
-require 'entryPoint.php';
-if(!defined("STDIN")) {
-    define("STDIN", fopen('php://stdin','r'));
-}
-
-$room_id = BLUE_ROOM;
-$msg_id = 0;
-
-echo "Starting test REPL\n";
-do {
-    $input = fread(STDIN, 80); // Read up to 80 characters or a newline
-    $trimmed = trim($input);
-
-    echo '> ' , reply_user($room_id, $msg_id, $trimmed) , "\n";
-    $msg_id++;
+<?php
+require 'entryPoint.php';
+if(!defined("STDIN")) {
+    define("STDIN", fopen('php://stdin','r'));
+}
+
+$room_id = BLUE_ROOM;
+$msg_id = 0;
+
+echo "Starting test REPL\n";
+do {
+    $input = fread(STDIN, 80); // Read up to 80 characters or a newline
+    $trimmed = trim($input);
+
+    echo '> ' , reply_user($room_id, $msg_id, $trimmed) , "\n";
+    $msg_id++;
 } while($trimmed !== "exit");
\ No newline at end of file
diff --git a/test/Test.php b/test/Test.php
new file mode 100644
index 0000000..92f65fe
--- /dev/null
+++ b/test/Test.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Brian
+ * Date: 19/12/2018
+ * Time: 21:00
+ */
+
+use PHPUnit\Framework\TestCase;
+require '../src/entryPoint.php';
+
+class Test extends TestCase
+{
+    public function testShouldReturnMessageID(): void
+    {
+        $this->assertEquals(
+            '0',
+            reply_user('whatever', 0, 'whatever')
+        );
+    }
+}