diff --git a/src/App.js b/src/App.js
index c1085909..bff25fe4 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,16 +1,52 @@
 import React from 'react';
+import { useState } from 'react';
 import './App.css';
+import ChatLog from './components/ChatLog';
 import chatMessages from './data/messages.json';
 
 const App = () => {
+  const chatCopy =[]
+  for (const message of chatMessages){
+    chatCopy.push(message)
+  }
+  const [chatData, setChatData]= useState(chatCopy)
+
+  const updateLikes = (id, updatedLike) => {
+    console.log('updatelikes is being called');
+    const newChatEntries = [];
+    for (const chat of chatData) {
+      if (chat.id !== id) {
+        
+        newChatEntries.push(chat);
+      } else {
+        const newChat = {
+          ...chat,
+          liked: updatedLike
+        };
+      
+      newChatEntries.push(newChat);
+
+      }
+
+    setChatData(newChatEntries);
+      
+    }
+  };
+  const countLikes = () => {
+    return chatData.reduce((accumulator, count) => {
+      return count.liked ? accumulator + 1 : accumulator;
+    }, 0);
+  };
+
+
   return (
     <div id="App">
       <header>
-        <h1>Application title</h1>
+        <h1>Instant Messenger</h1>
+        <h2>{countLikes()} ❤️s</h2>
       </header>
       <main>
-        {/* Wave 01: Render one ChatEntry component
-        Wave 02: Render ChatLog component */}
+        <ChatLog entries={chatData} updateLikes={updateLikes}></ChatLog>
       </main>
     </div>
   );
diff --git a/src/components/ChatEntry.js b/src/components/ChatEntry.js
index b92f0b7b..c7062137 100644
--- a/src/components/ChatEntry.js
+++ b/src/components/ChatEntry.js
@@ -1,22 +1,30 @@
 import React from 'react';
 import './ChatEntry.css';
 import PropTypes from 'prop-types';
+import TimeStamp from './TimeStamp';
 
-const ChatEntry = (props) => {
+const ChatEntry = ({id, sender,body, timeStamp,liked, updateLikes}) => {
+  const myHeart = liked ? '❤️': '🤍' ;
   return (
     <div className="chat-entry local">
-      <h2 className="entry-name">Replace with name of sender</h2>
+      <h2 className="entry-name">{sender}</h2>
       <section className="entry-bubble">
-        <p>Replace with body of ChatEntry</p>
-        <p className="entry-time">Replace with TimeStamp component</p>
-        <button className="like">🤍</button>
+        <p>{body}</p>
+        <p className="entry-time"><TimeStamp time={timeStamp}/></p>
+        <button className="like" onClick={() => updateLikes(id, !liked)}>
+          {myHeart}
+        </button>
       </section>
     </div>
   );
 };
 
 ChatEntry.propTypes = {
-  //Fill with correct proptypes
+  id:PropTypes.number,
+  sender:PropTypes.string.isRequired,
+  body:PropTypes.string.isRequired,
+  timeStamp:PropTypes.string.isRequired,
+  updateLikes:PropTypes.func
 };
 
 export default ChatEntry;
diff --git a/src/components/ChatLog.css b/src/components/ChatLog.css
index 378848d1..a7043e1d 100644
--- a/src/components/ChatLog.css
+++ b/src/components/ChatLog.css
@@ -2,3 +2,4 @@
   margin: auto;
   max-width: 50rem;
 }
+
diff --git a/src/components/ChatLog.js b/src/components/ChatLog.js
new file mode 100644
index 00000000..d90ad3de
--- /dev/null
+++ b/src/components/ChatLog.js
@@ -0,0 +1,38 @@
+import ChatEntry from './ChatEntry';
+import PropTypes from 'prop-types';
+
+const ChatLog = ({entries,updateLikes}) => {
+
+    const chatEntrycomponents = entries.map((chats) =>{
+
+    return (
+        <li key={chats.id}>
+            < ChatEntry id = {chats.id} sender={chats.sender} body={chats.body} timeStamp={chats.timeStamp} liked={chats.liked} updateLikes={updateLikes}/>
+        </li>
+    )
+});
+
+    return (
+        <ul>
+            {chatEntrycomponents}
+        </ul>
+    );
+
+
+};   
+
+ChatLog.propTypes = {
+    entries: PropTypes.arrayOf(
+        PropTypes.shape({
+            id:PropTypes.number,
+            sender:PropTypes.string.isRequired,
+            body:PropTypes.string.isRequired,
+            timeStamp:PropTypes.string.isRequired,
+            liked:PropTypes.bool.isRequired,
+
+})
+    ),
+    updateLikes:PropTypes.func.isRequired,
+};
+
+export default ChatLog;
\ No newline at end of file