diff --git a/src/App.jsx b/src/App.jsx
index 14a7f684d..b0d2c7d5d 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -1,17 +1,44 @@
+import React, { useState } from 'react';
 import './App.css';
+import ChatEntry from './components/ChatEntry';
+import ChatLog from './components/ChatLog';
+import chatMessages from './data/messages.json';
 
 const App = () => {
+  // const [entries, setEntries] = useState(chatMessages);
+  const [entries, setEntries] = useState(
+  chatMessages.map((msg) => ({ ...msg, liked: msg.liked ?? false }))
+);
+
+  const toggleLike = (id) => {
+    const updatedEntries = entries.map((entry) => {
+      if (entry.id === id) {
+        return { ...entry, liked: !entry.liked };
+      }
+      return entry;
+    });
+    setEntries(updatedEntries);
+  };
+
+  const totalLikes = entries.filter((entry) => entry.liked).length;
+  const localSender = "Vladimir";
+
   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={entries} onToggleLike={toggleLike} localSender={localSender}
+/>
       </main>
     </div>
   );
 };
 
+
 export default App;
+
+
+
diff --git a/src/components/ChatEntry.jsx b/src/components/ChatEntry.jsx
index 15c56f96b..c85a1920b 100644
--- a/src/components/ChatEntry.jsx
+++ b/src/components/ChatEntry.jsx
@@ -1,20 +1,26 @@
+import TimeStamp from './TimeStamp';
 import './ChatEntry.css';
 
-const ChatEntry = () => {
-  return (
-    <div 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>
-    </div>
-  );
+const ChatEntry = ({ id, sender, body, timeStamp, liked, onToggleLike, isLocal }) => {
+  const heart = liked ? '❤️' : '🤍';
+  const entryClass = isLocal ? 'chat-entry local' : 'chat-entry remote';
+return (
+  <div className={entryClass}>
+    <h2 className="entry-name">{sender}</h2>
+    <section className="entry-bubble">
+      <p>{body}</p>
+      <p className="entry-time"><TimeStamp time={timeStamp} /></p>
+      {/* <button className="like-button" onClick={() => onToggleLike(id)}> */}
+       <button
+          className="like"
+          data-testid={`like-button-${id}`}
+          onClick={() => onToggleLike(id)}
+        >
+        {heart}
+      </button>
+    </section>
+  </div>
+);
 };
 
-ChatEntry.propTypes = {
-  // Fill with correct proptypes
-};
-
-export default ChatEntry;
+export default ChatEntry;
\ No newline at end of file
diff --git a/src/components/ChatLog.jsx b/src/components/ChatLog.jsx
new file mode 100644
index 000000000..07f9f885b
--- /dev/null
+++ b/src/components/ChatLog.jsx
@@ -0,0 +1,23 @@
+import ChatEntry from './ChatEntry';
+import './ChatLog.css';
+
+const ChatLog = ({ entries, onToggleLike, localSender }) => {
+  return (
+    <div 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}
+          isLocal={entry.sender === localSender}
+        />
+      ))}
+    </div>
+  );
+};
+
+export default ChatLog;
\ No newline at end of file