diff --git a/src/App.jsx b/src/App.jsx
index 14a7f684..5f195920 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -1,14 +1,31 @@
 import './App.css';
+import ChatLog from './components/ChatLog';
+import messages from './data/messages.json';
+import { useState} from 'react';
 
 const App = () => {
+  const [entries, setEntries] = useState(messages);
+
+  const handleLike = (id) => {
+    setEntries((prevEntries) =>
+      prevEntries.map((entry) =>
+        entry.id === id ? { ...entry, liked: !entry.liked } : entry
+      )
+    );
+  };
+
+  const totalLikes = entries.reduce((acc, entry) => acc + Number(entry.liked), 0);
+  
   return (
     <div id="App">
       <header>
         <h1>Application title</h1>
+        <section className='widget'>
+        <p>{totalLikes} ❤️s</p>
+        </section>
       </header>
       <main>
-        {/* Wave 01: Render one ChatEntry component
-        Wave 02: Render ChatLog component */}
+        <ChatLog entries = {entries} onHandleLike={handleLike} />
       </main>
     </div>
   );
diff --git a/src/components/ChatEntry.jsx b/src/components/ChatEntry.jsx
index fe05efa0..37e93724 100644
--- a/src/components/ChatEntry.jsx
+++ b/src/components/ChatEntry.jsx
@@ -1,21 +1,33 @@
+import PropTypes from 'prop-types';
 import './ChatEntry.css';
+import TimeStamp from './TimeStamp';
 
-const ChatEntry = () => {
+
+const ChatEntry = ({ sender, body, timeStamp, liked, onHandleLike }) => {
+  const heart = liked ? '❤️' : '🤍';
   return (
     // Replace the outer tag name with a semantic element that fits our use case
-    <replace-with-relevant-semantic-element className="chat-entry local">
-      <h2 className="entry-name">Replace with name of sender</h2>
+    <article className="chat-entry local">
+      <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={onHandleLike}>
+          {heart}
+        </button>
       </section>
-    </replace-with-relevant-semantic-element>
+    </article>
   );
 };
 
 ChatEntry.propTypes = {
-  // Fill with correct proptypes
+  sender: PropTypes.string.isRequired,
+  body: PropTypes.string.isRequired,
+  timeStamp: PropTypes.string.isRequired,
+  liked: PropTypes.bool.isRequired,
+  onHandleLike: PropTypes.func,
 };
 
 export default ChatEntry;
diff --git a/src/components/ChatLog.jsx b/src/components/ChatLog.jsx
new file mode 100644
index 00000000..51f6a7a6
--- /dev/null
+++ b/src/components/ChatLog.jsx
@@ -0,0 +1,48 @@
+import PropTypes from 'prop-types';
+import './ChatLog.css';
+import ChatEntry from './ChatEntry';
+
+
+const ChatLog = ({ entries, onHandleLike }) => {
+  const messageList = entries.map((message) => {
+    const handleLikeClick =
+      typeof onHandleLike === 'function'
+        ? () => onHandleLike(message.id)
+        : undefined;
+
+    return (
+      <li key={message.id}>
+        <ChatEntry
+          sender={message.sender}
+          body={message.body}
+          timeStamp={message.timeStamp}
+          liked={message.liked}
+          onHandleLike={handleLikeClick}
+        />
+      </li>
+    );
+  });
+
+  return (
+    <ul className="chat-log">
+      {messageList}
+    </ul>
+  );
+};
+    
+
+ChatLog.propTypes = {
+    entries: PropTypes.arrayOf(PropTypes.shape({
+        sender: PropTypes.string.isRequired,
+        body: PropTypes.string.isRequired,
+        timeStamp: PropTypes.string.isRequired,
+        liked: PropTypes.bool.isRequired,
+    })).isRequired,
+    onHandleLike: PropTypes.func,
+};
+
+export default ChatLog;
+
+
+
+