diff --git a/src/App.jsx b/src/App.jsx
index 14a7f684d..62a6c626a 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -1,17 +1,34 @@
 import './App.css';
+import ChatLog from './components/ChatLog';
+import { useState } from 'react';
+import messages from './data/messages.json';
 
 const App = () => {
+  const [chatMessages, setChatMessages] = useState(messages);
+
+  const toggleLike = (id) => {
+    const updatedMessages = chatMessages.map((message) => {
+      if (message.id === id) {
+        // message.liked = !message.liked;
+        return {...message, liked:!message.liked};
+      } else {
+        return message;
+      }
+    });
+    setChatMessages(updatedMessages);
+  };
+
+  const totalLikes = chatMessages.filter((message) => message.liked).length;
+
   return (
     <div id="App">
       <header>
-        <h1>Application title</h1>
+        <h1>Vladmir and Estragon</h1>
+        <h2>{totalLikes} ❤️s</h2>
       </header>
-      <main>
-        {/* Wave 01: Render one ChatEntry component
-        Wave 02: Render ChatLog component */}
-      </main>
+      <ChatLog entries={chatMessages} onLike={toggleLike} />
     </div>
   );
 };
 
-export default App;
+export default App;
\ No newline at end of file
diff --git a/src/components/ChatEntry.jsx b/src/components/ChatEntry.jsx
index 15c56f96b..ce121ab26 100644
--- a/src/components/ChatEntry.jsx
+++ b/src/components/ChatEntry.jsx
@@ -1,20 +1,35 @@
 import './ChatEntry.css';
+import TimeStamp from './TimeStamp';
+import PropTypes from 'prop-types';
+
+const ChatEntry = (props) => {
+  const handleLikeClick = () => {
+    props.onLike(props.id);  // Notify the parent component (App) to toggle like state
+  };
 
-const ChatEntry = () => {
   return (
     <div className="chat-entry local">
-      <h2 className="entry-name">Replace with name of sender</h2>
+      <h2 className="entry-name">{props.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>{props.body}</p>
+        <p className="entry-time">
+          <TimeStamp time={props.timeStamp} />
+        </p>
+        <button className="like" onClick={handleLikeClick}>
+          {props.liked ? '❤️' : '🤍'}
+        </button>
       </section>
     </div>
   );
 };
 
 ChatEntry.propTypes = {
-  // Fill with correct proptypes
+  sender: PropTypes.string,
+  id: PropTypes.number,
+  body: PropTypes.string,
+  timeStamp: PropTypes.string,
+  liked: PropTypes.bool,
+  onLike: PropTypes.func, // Ensure the `onLike` prop is passed
 };
 
-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..217936a67
--- /dev/null
+++ b/src/components/ChatLog.jsx
@@ -0,0 +1,35 @@
+import ChatEntry from './ChatEntry';
+import PropTypes from 'prop-types';
+
+const ChatLog = (props) => {
+  const chatEntries = props.entries.map((entry) => {
+    return (
+      <ChatEntry
+        key={entry.id}
+        id={entry.id}
+        sender={entry.sender}
+        timeStamp={entry.timeStamp}
+        body={entry.body}
+        liked={entry.liked}
+        onLike={props.onLike}
+      />
+    );
+  });
+
+  return <main>{chatEntries}</main>;
+};
+
+ChatLog.propTypes = {
+  entries: PropTypes.arrayOf(
+    PropTypes.shape({
+      sender: PropTypes.string,
+      id: PropTypes.number,
+      body: PropTypes.string,
+      timeStamp: PropTypes.string,
+      liked: PropTypes.bool,
+    })
+  ).isRequired,
+  onLike: PropTypes.func.isRequired,
+};
+
+export default ChatLog;
\ No newline at end of file