diff --git a/nginx/public/index.html b/nginx/public/index.html
index 5443216..92584d0 100644
--- a/nginx/public/index.html
+++ b/nginx/public/index.html
@@ -21,7 +21,10 @@ <h3 id="message">Welcome!</h3>
 <br/>
 
 <div id="queue"></div>
-
+<br/><br/><br/>
+<p>Comment</p>
+<input type="text" id="comment"/><button onclick="feedback();">Submit</button>
+<script src="officeHours.js"></script>
 <script src="officeHours.js"></script>
 
 
diff --git a/nginx/public/officeHours.js b/nginx/public/officeHours.js
index 3514c14..81e7609 100644
--- a/nginx/public/officeHours.js
+++ b/nginx/public/officeHours.js
@@ -26,3 +26,8 @@ function enterQueue() {
 function readyToHelp() {
     socket.emit("ready_for_student");
 }
+function feedback() {
+    let comment = "comment_" + document.getElementById("comment").value;
+    socket.emit("enter_queue", comment);
+    document.getElementById("comment").value = "";
+}
\ No newline at end of file
diff --git a/src/main/scala/model/OfficeHoursServer.scala b/src/main/scala/model/OfficeHoursServer.scala
index 09ef61b..444c1ec 100644
--- a/src/main/scala/model/OfficeHoursServer.scala
+++ b/src/main/scala/model/OfficeHoursServer.scala
@@ -7,7 +7,8 @@ import play.api.libs.json.{JsValue, Json}
 
 
 class OfficeHoursServer() {
-
+  var list:List[String]=List()
+  var feedBackList:List[String]=List()
   val database: DatabaseAPI = if(Configuration.DEV_MODE){
     new TestingDatabase
   }else{
@@ -49,7 +50,7 @@ class DisconnectionListener(server: OfficeHoursServer) extends DisconnectListene
   override def onDisconnect(socket: SocketIOClient): Unit = {
     if (server.socketToUsername.contains(socket)) {
       val username = server.socketToUsername(socket)
-        server.socketToUsername -= socket
+      server.socketToUsername -= socket
       if (server.usernameToSocket.contains(username)) {
         server.usernameToSocket -= username
       }
@@ -58,12 +59,23 @@ class DisconnectionListener(server: OfficeHoursServer) extends DisconnectListene
 }
 
 
+
 class EnterQueueListener(server: OfficeHoursServer) extends DataListener[String] {
   override def onData(socket: SocketIOClient, username: String, ackRequest: AckRequest): Unit = {
-    server.database.addStudentToQueue(StudentInQueue(username, System.nanoTime()))
-    server.socketToUsername += (socket -> username)
-    server.usernameToSocket += (username -> socket)
-    server.server.getBroadcastOperations.sendEvent("queue", server.queueJSON())
+    if(username.slice(0,8)=="comment_"){
+      server.feedBackList=server.feedBackList:+username
+      println(server.feedBackList)
+    }
+    else{
+      if(server.list.contains(username)){}
+      else{
+        server.list=server.list:+username
+        server.database.addStudentToQueue(StudentInQueue(username, System.nanoTime()))
+        server.socketToUsername += (socket -> username)
+        server.usernameToSocket += (username -> socket)
+        server.server.getBroadcastOperations.sendEvent("queue", server.queueJSON())
+      }
+    }
   }
 }