diff --git a/src/App.css b/src/App.css
index d97beb4e..fdb1208c 100644
--- a/src/App.css
+++ b/src/App.css
@@ -13,6 +13,10 @@
   align-items: center;
 }
 
+header section p {
+  color: black;
+}
+
 #App main {
   padding-left: 2em;
   padding-right: 2em;
diff --git a/src/App.jsx b/src/App.jsx
index 14a7f684..c717ca31 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -1,14 +1,33 @@
 import './App.css';
+import ChatLog from './components/ChatLog';
+import { useState } from 'react';
+import messagesData from './data/messages.json';
+
 
 const App = () => {
+  const [messages, setMessages] = useState(messagesData);
+  const totalLikes = messages.filter(message => message.liked).length;
+
+  // Function to toggle like status of a message
+  const toggleLike = (id) => {
+    setMessages(messages.map(message => {
+      if (message.id === id) {
+        return { ...message, liked: !message.liked };
+      }
+      return message;
+    }));
+  };
+
   return (
     <div id="App">
       <header>
-        <h1>Application title</h1>
+        <h1>Chat between Vladimir and Estragon</h1>
+        <section>
+          <p>{totalLikes} ❤️s</p>
+        </section>
       </header>
       <main>
-        {/* Wave 01: Render one ChatEntry component
-        Wave 02: Render ChatLog component */}
+        <ChatLog entries={messages} onToggleLike={toggleLike} />
       </main>
     </div>
   );
diff --git a/src/components/ChatEntry.jsx b/src/components/ChatEntry.jsx
index fe05efa0..8bbd7175 100644
--- a/src/components/ChatEntry.jsx
+++ b/src/components/ChatEntry.jsx
@@ -1,21 +1,38 @@
 import './ChatEntry.css';
+import PropTypes from 'prop-types';
+import TimeStamp from './TimeStamp';
+
+const ChatEntry = ({id, sender, body, timeStamp, liked, onToggleLike }) => {
+
+  const handleLikeClick = () => {
+    onToggleLike(id);
+  };
+
 
-const ChatEntry = () => {
   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>
-      <section className="entry-bubble">
-        <p>Replace with body of ChatEntry</p>
-        <p className="entry-time">Replace with TimeStamp component</p>
-        <button className="like">🤍</button>
-      </section>
-    </replace-with-relevant-semantic-element>
+    <section className="chat-entry local">
+      <h2 className="entry-name">{sender}</h2>
+      <div className="entry-bubble">
+        <p>{body}</p>
+        <p className="entry-time">
+          <TimeStamp time={timeStamp} />
+        </p>
+        <button className="like" onClick={handleLikeClick}>
+          {liked ? '❤️' : '🤍'}
+
+        </button>
+      </div>
+    </section>
   );
 };
 
 ChatEntry.propTypes = {
-  // Fill with correct proptypes
+  id: PropTypes.number.isRequired,
+  sender: PropTypes.string.isRequired,
+  body: PropTypes.string.isRequired,
+  timeStamp: PropTypes.string.isRequired,
+  liked: PropTypes.bool.isRequired,
+  onToggleLike: PropTypes.func.isRequired,
 };
 
 export default ChatEntry;
diff --git a/src/components/ChatLog.jsx b/src/components/ChatLog.jsx
new file mode 100644
index 00000000..19c967f2
--- /dev/null
+++ b/src/components/ChatLog.jsx
@@ -0,0 +1,38 @@
+import ChatEntry from './ChatEntry';
+import PropTypes from 'prop-types';
+import './ChatLog.css';
+
+// ChatLog component to render a list of ChatEntry components
+const ChatLog = ({ entries, onToggleLike }) => {
+  return (
+    <ul className="chat-log">
+      {entries.map((entry) => (
+        <ChatEntry
+          key={entry.id}  
+          id={entry.id}
+          sender={entry.sender}
+          body={entry.body}
+          timeStamp={entry.timeStamp}
+          liked={entry.liked}
+          onToggleLike={onToggleLike}
+        />
+      ))}
+    </ul>
+  );
+};
+
+// Prop type validation for ChatLog component
+ChatLog.propTypes = {
+  entries: PropTypes.arrayOf(
+    PropTypes.shape({
+      id: PropTypes.number.isRequired,
+      sender: PropTypes.string.isRequired,
+      body: PropTypes.string.isRequired,
+      timeStamp: PropTypes.string.isRequired,
+      liked: PropTypes.bool.isRequired,
+    })
+  ).isRequired,
+  onToggleLike: PropTypes.func.isRequired,
+};
+
+export default ChatLog;
\ No newline at end of file