diff --git a/src/App.jsx b/src/App.jsx
index 14a7f684..b968a810 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -1,17 +1,37 @@
 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 toggleLike = (id) => {
+    setEntries(entries.map(entry =>
+      entry.id === id
+        ? { ...entry, liked: !entry.liked }
+        : entry
+    ));
+  };
+
+  const totalLikes = entries.filter(entry => entry.liked).length;
+
   return (
     <div id="App">
       <header>
         <h1>Application title</h1>
+        <section>
+          <h2>{totalLikes} ❤️s</h2>
+        </section>
       </header>
       <main>
-        {/* Wave 01: Render one ChatEntry component
-        Wave 02: Render ChatLog component */}
+        <ChatLog
+          entries={entries}
+          onLikeToggle={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 fe05efa0..6aa2484a 100644
--- a/src/components/ChatEntry.jsx
+++ b/src/components/ChatEntry.jsx
@@ -1,21 +1,32 @@
+import PropTypes from 'prop-types';
 import './ChatEntry.css';
+import TimeStamp from './TimeStamp';
 
-const ChatEntry = () => {
+const ChatEntry = (props) => {
   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">{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={() => props.onLikeToggle(props.id)}
+        >
+          {props.liked ? '❤️' : '🤍'}
+        </button>
       </section>
-    </replace-with-relevant-semantic-element>
+    </article>
   );
 };
 
 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,
+  onLikeToggle: 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 00000000..badedebd
--- /dev/null
+++ b/src/components/ChatLog.jsx
@@ -0,0 +1,35 @@
+import PropTypes from 'prop-types';
+import ChatEntry from './ChatEntry';
+
+const ChatLog = (props) => {
+  return (
+    <section>
+      {props.entries.map(message => (
+        <ChatEntry
+          key={message.id}
+          id={message.id}
+          sender={message.sender}
+          body={message.body}
+          timeStamp={message.timeStamp}
+          liked={message.liked}
+          onLikeToggle={props.onLikeToggle}
+        />
+      ))}
+    </section>
+  );
+};
+
+ChatLog.propTypes = {
+  entries: PropTypes.arrayOf(
+    PropTypes.shape({
+      id: PropTypes.oneOfType([PropTypes.number, PropTypes.string]).isRequired,
+      sender: PropTypes.string.isRequired,
+      body: PropTypes.string.isRequired,
+      timeStamp: PropTypes.string.isRequired,
+      liked: PropTypes.bool.isRequired,
+    })
+  ).isRequired,
+  onLikeToggle: PropTypes.func.isRequired
+};
+
+export default ChatLog;
\ No newline at end of file