diff --git a/onionr/static-data/www/chat/css/convos.css b/onionr/static-data/www/chat/css/convos.css
index d174c192..3606ea18 100644
--- a/onionr/static-data/www/chat/css/convos.css
+++ b/onionr/static-data/www/chat/css/convos.css
@@ -60,3 +60,7 @@
     transform: rotate(180deg);
     direction: ltr;
 }
+
+#messageEntryTemplate{
+    display: none;
+}
\ No newline at end of file
diff --git a/onionr/static-data/www/chat/index.html b/onionr/static-data/www/chat/index.html
index 35de8648..e2ee745d 100755
--- a/onionr/static-data/www/chat/index.html
+++ b/onionr/static-data/www/chat/index.html
@@ -81,6 +81,10 @@
         </div>
     </section>
 
+    <div class="messageEntry" id="messageEntryTemplate">
+            <span class="from has-text-primary">Jenny</span>
+            <div class="messageContent">I'll stay right here</div>
+    </div>
     <br>
 
     <div class="columns chatContent">
@@ -91,10 +95,6 @@
         </div>
         <div class="column chatBox has-text-light has-background-dark is-four-fifths">
             <span class="chatFeed">
-                <div class="messageEntry">
-                    <span class="from has-text-primary">Jenny</span>
-                    <div class="messageContent">I'll stay right here</div>
-                </div>
             </span>
             <div class="field has-addons">
                 <p class="control chatInput">
diff --git a/onionr/static-data/www/chat/js/messages.js b/onionr/static-data/www/chat/js/messages.js
index 41329b7b..a5a7a596 100644
--- a/onionr/static-data/www/chat/js/messages.js
+++ b/onionr/static-data/www/chat/js/messages.js
@@ -16,16 +16,21 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>
 */
-chatMessages = []
+chatMessages = {}
 let Message = class {
     constructor(text, peer, outgoing){
         this.text = text // raw message string
         this.peer = peer // peer by public key
         this.outgoing = outgoing // boolean. false = outgoing message
-        this.time = new Date().toISOString()
-        //this.tempIdentifier = Math.floor(Math.random() * 100000000000000000);
-        chatMessages.push(this)
+        this.time = new Date().toISOString() // store message time
+        this.tempIdentifier = Math.floor(Math.random() * 100000000000000000) // assign a random id, doesnt need to be secure
+
+        // Add the message to the peer message feed object chatMessages
+        if (chatMessages.hasOwnProperty(peer)){
+            chatMessages[peer].push(this)
+        }
+        else{
+            chatMessages[peer] = [this]
+        }
     }
 }
-
-//let addMessage = function(){}
\ No newline at end of file