diff --git a/src/App.jsx b/src/App.jsx
index 14a7f684d..598e8249c 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -1,14 +1,28 @@
 import './App.css';
+import ChatLog from './components/ChatLog';
+import message from './data/messages.json';
+import {useState} from 'react';
 
 const App = () => {
+  const [chatData, setChatData] = useState(message);
+  const togglelikes = (id) => {
+    setChatData( chatData => chatData.map(chat => {
+      if (chat.id === id){
+        return {...chat, liked: !chat.liked};
+      }else {
+        return chat;
+      }
+    }));
+  };
+  const totalLikes = chatData.filter((chat) => chat.liked).length;
   return (
     <div id="App">
       <header>
-        <h1>Application title</h1>
+        <h1>Chat Log</h1>
+        <p>{totalLikes} ❤️s </p>
       </header>
       <main>
-        {/* Wave 01: Render one ChatEntry component
-        Wave 02: Render ChatLog component */}
+        <ChatLog entries={chatData} chatClicked={togglelikes}/>
       </main>
     </div>
   );
diff --git a/src/components/ChatEntry.jsx b/src/components/ChatEntry.jsx
index 15c56f96b..c34aeb64f 100644
--- a/src/components/ChatEntry.jsx
+++ b/src/components/ChatEntry.jsx
@@ -1,20 +1,30 @@
 import './ChatEntry.css';
+import TimeStamp from './TimeStamp';
+import PropTypes from 'prop-types';
 
-const ChatEntry = () => {
+const ChatEntry = ({id,sender,body,timeStamp,liked,chatClicked}) => {
+  const heartColor = 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={() => chatClicked(id)}>{heartColor}</button>
       </section>
     </div>
   );
 };
-
 ChatEntry.propTypes = {
   // Fill with correct proptypes
+  id:  PropTypes.number.isRequired,
+  sender: PropTypes.string.isRequired,
+  body: PropTypes.string.isRequired,
+  timeStamp: PropTypes.string.isRequired,
+  liked: PropTypes.string.isRequired,
+  chatClicked: PropTypes.func.isRequired,
 };
 
 export default ChatEntry;
diff --git a/src/components/ChatLog.jsx b/src/components/ChatLog.jsx
new file mode 100644
index 000000000..babae8605
--- /dev/null
+++ b/src/components/ChatLog.jsx
@@ -0,0 +1,37 @@
+import ChatEntry from './ChatEntry';
+import PropTypes from 'prop-types';
+import './ChatLog.css';
+
+const ChatLog = ({entries, chatClicked}) => {
+  const chatComponents = entries.map((chat) => {
+    return (
+      <li key={chat.id}>
+	  <ChatEntry
+		  id={chat.id}
+		  sender={chat.sender}
+		  body={chat.body}
+		  timeStamp={chat.timeStamp}
+      chatClicked={chatClicked}
+      liked={chat.liked}
+		 />
+      </li>
+    );
+  });
+  return (
+    <>
+      {chatComponents}
+    </>
+  );
+};
+
+ChatLog.propTypes = {
+  entries: PropTypes.arrayOf(PropTypes.shape({
+    id: PropTypes.number.isRequired,
+    sender: PropTypes.string.isRequired,
+    body: PropTypes.string.isRequired,
+    timeStamp: PropTypes.string.isRequired,
+  })).isRequired,
+  chatClicked: PropTypes.func.isRequired,
+};
+
+export default ChatLog;
\ No newline at end of file