diff --git a/src/App.jsx b/src/App.jsx
index 14a7f684d..4b5be39fd 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -1,14 +1,32 @@
 import './App.css';
+import chatMessages from './data/messages.json'
+import ChatLog from './components/ChatLog';
+import { useState } from 'react';
 
 const App = () => {
+  const [entries, setEntries] = useState(chatMessages);
+
+  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;
+
   return (
     <div id="App">
       <header>
-        <h1>Application title</h1>
+        <h1>{totalLikes} ❤️s</h1>
       </header>
       <main>
-        {/* Wave 01: Render one ChatEntry component
-        Wave 02: Render ChatLog component */}
+        <div className='App'>
+          <ChatLog entries={entries} onLikeToggle={toggleLike} />
+        </div>
       </main>
     </div>
   );
diff --git a/src/components/ChatEntry.jsx b/src/components/ChatEntry.jsx
index 15c56f96b..67f540755 100644
--- a/src/components/ChatEntry.jsx
+++ b/src/components/ChatEntry.jsx
@@ -1,20 +1,32 @@
 import './ChatEntry.css';
+import PropTypes from 'prop-types';
+import TimeStamp from './TimeStamp';
+
+const ChatEntry = ({ id, sender, body, timeStamp, isLocal, liked, onLikeToggle }) => {
+  const entryClass = isLocal ? 'chat-entry local' : 'chat-entry remote';
 
-const ChatEntry = () => {
   return (
-    <div className="chat-entry local">
-      <h2 className="entry-name">Replace with name of sender</h2>
+    <div className={entryClass}>
+      <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}></TimeStamp> </p>
+        <button className="like" onClick={() => onLikeToggle(id)}>
+          {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,
+  isLocal: PropTypes.bool.isRequired,
+  liked: PropTypes.bool.isRequired,
+  onLikeToggle: PropTypes.func.isRequired,
 };
 
 export default ChatEntry;
diff --git a/src/components/ChatLog.jsx b/src/components/ChatLog.jsx
new file mode 100644
index 000000000..cfd0e8e28
--- /dev/null
+++ b/src/components/ChatLog.jsx
@@ -0,0 +1,45 @@
+import './ChatLog.css';
+import PropTypes from 'prop-types';
+import ChatEntry from './ChatEntry';
+
+const LOCAL_SENDER = 'Vladimir';
+
+const ChatLog = ({ entries, onLikeToggle }) => {
+    const getChatListJSX = (entries) => {
+        return entries.map((entry) => {
+            return (
+                <ChatEntry
+                    key={entry.id}
+                    id={entry.id}
+                    sender={entry.sender}
+                    body={entry.body}
+                    timeStamp={entry.timeStamp}
+                    isLocal={entry.sender === LOCAL_SENDER}
+                    liked={entry.liked}
+                    onLikeToggle={onLikeToggle}
+                />
+            );
+        });
+    };
+
+    return (
+        <div className='chat-log'>
+            {getChatListJSX(entries)}
+        </div>
+    );
+};
+
+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,
+    onLikeToggle: PropTypes.func.isRequired,
+};
+
+export default ChatLog;
\ No newline at end of file