diff --git a/src/main/java/org/ntlab/tampoposerver/models/ChatRooms.java b/src/main/java/org/ntlab/tampoposerver/models/ChatRooms.java
index ad04de2..ea63b32 100644
--- a/src/main/java/org/ntlab/tampoposerver/models/ChatRooms.java
+++ b/src/main/java/org/ntlab/tampoposerver/models/ChatRooms.java
@@ -1,6 +1,10 @@
 package org.ntlab.tampoposerver.models;
 
+import org.apache.logging.log4j.message.Message;
+
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 
 public class ChatRooms {
     private Integer chatRoomId;
@@ -8,8 +12,9 @@
     private String user1Id;
     private String newContent;
     private String chatRoomNumber;
+    private List<Message> messages = new ArrayList<>();
 
-    public ChatRooms(Integer chatRoomId, String user0Id, String user1Id) {
+    public ChatRooms(Integer chatRoomId) {
         this.chatRoomId = chatRoomId;
     }
 
@@ -37,11 +42,24 @@
     return this;}
 
     public ChatRooms addMessage(String senderId, String content) {
-        return null;
+        messages.add(new Message(senderId, content));
+        return this;
     }
 
-    public ChatRooms getMessages() {
-        return null;
+    public List<Message> getMessages() {
+        return messages;
+    }
+    public List<Message> getMessage() { return messages; }
+
+    public static class Message {
+        private String senderId;
+        private String content;
+
+        public Message(String senderId, String content) {
+            this.senderId = senderId;
+            this.content = content;
+        }
+        public String getSenderId() { return senderId;}
+        public String getContent() { return content;}
     }
 }
-