diff --git a/src/App.jsx b/src/App.jsx
index 14a7f684d..381296bba 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -1,17 +1,45 @@
 import './App.css';
+import ChatLog from './components/ChatLog';
+import messagesData from './data/messages.json';
+import { useState } from 'react';
 
 const App = () => {
+  const [messages, setMessages] = useState(messagesData);
+
+  const toggleLike = (messageId) => {
+    setMessages(prevMessages =>
+      prevMessages.map(message =>
+        message.id === messageId
+          ? { ...message, liked: !message.liked }
+          : message
+      )
+    );
+  };
+
+  const getTotalLikes = () => {
+    return messages.filter(message => message.liked).length;
+  };
+
+  const totalLikes = getTotalLikes();
+
   return (
     <div id="App">
       <header>
-        <h1>Application title</h1>
+        <h1>Ada Chat Log</h1>
+        <section>
+          <span className="widget">
+            {totalLikes} ❤️s
+          </span>
+        </section>
       </header>
       <main>
-        {/* Wave 01: Render one ChatEntry component
-        Wave 02: Render ChatLog component */}
+        <ChatLog 
+          entries={messages} 
+          onToggleLike={toggleLike}
+        />
       </main>
     </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..a6b8ca159 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 = ({ id, sender, body, timeStamp, liked, onToggleLike }) => {
+  const handleLikeClick = () => {
+    onToggleLike(id);
+  };
 
-const ChatEntry = () => {
   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={handleLikeClick}>
+          {liked ? '❤️' : '🤍'}
+        </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.bool.isRequired,
+  onToggleLike: PropTypes.func.isRequired,
 };
 
-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..cd22373c6
--- /dev/null
+++ b/src/components/ChatLog.jsx
@@ -0,0 +1,28 @@
+import './ChatLog.css';
+import ChatEntry from './ChatEntry';
+import PropTypes from 'prop-types';
+
+const ChatLog = ({ entries, onToggleLike }) => {
+  return (
+    <section 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}
+        />
+      ))}
+    </section>
+  );
+};
+
+ChatLog.propTypes = {
+  entries: PropTypes.array.isRequired,
+  onToggleLike: PropTypes.func.isRequired,
+};
+
+export default ChatLog;
\ No newline at end of file