diff --git a/src/App.js b/src/App.js
index c10859093..5711460b3 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,16 +1,39 @@
 import React from 'react';
 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);
+  let [likeCount, setLikes] = useState(0);
+
+  const changeHeartColor = (id) => {
+    const newEntries = entries.map((entry) => ({...entry}));
+    for (const entry of newEntries) {
+      if (entry.id === id) {
+        entry.liked = !entry.liked;
+        if (entry.liked) {
+          likeCount += 1;
+        }
+      } 
+    } 
+    setEntries(newEntries);
+    setLikes(likeCount);
+  };
+
   return (
     <div id="App">
       <header>
-        <h1>Application title</h1>
+        <h1>Chat Log</h1>
+        <h2>{likeCount} ❤️s</h2>
       </header>
       <main>
-        {/* Wave 01: Render one ChatEntry component
-        Wave 02: Render ChatLog component */}
+        <ChatLog
+        entries={entries}
+        heartCallback={changeHeartColor}
+        />
       </main>
     </div>
   );
diff --git a/src/components/ChatEntry.js b/src/components/ChatEntry.js
index b92f0b7b2..bd9b0c18e 100644
--- a/src/components/ChatEntry.js
+++ b/src/components/ChatEntry.js
@@ -1,22 +1,30 @@
-import React from 'react';
 import './ChatEntry.css';
 import PropTypes from 'prop-types';
+import TimeStamp from './TimeStamp';
 
 const ChatEntry = (props) => {
+  const heartToggle = () => {
+    props.heartCallback(props.id);
+  };
+
   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>
+        <TimeStamp className="entry-time" time={props.timeStamp}></TimeStamp>
+        <button className="like" onClick={heartToggle}>{props.liked ? '❤️' : '🤍' }</button>
       </section>
     </div>
   );
-};
+}
 
 ChatEntry.propTypes = {
-  //Fill with correct proptypes
+  id: PropTypes.number,
+  sender: PropTypes.string.isRequired,
+  body: PropTypes.string.isRequired,
+  timeStamp: PropTypes.string.isRequired,
+  liked: PropTypes.bool,
 };
 
 export default ChatEntry;
diff --git a/src/components/ChatLog.js b/src/components/ChatLog.js
new file mode 100644
index 000000000..403bdd2df
--- /dev/null
+++ b/src/components/ChatLog.js
@@ -0,0 +1,34 @@
+import React from 'react';
+import './ChatLog.css';
+import ChatEntry from './ChatEntry';
+import PropTypes from 'prop-types';
+
+
+const ChatLog = (props) => {
+    const chatComponents = props.entries.map((entry) => {
+        return (
+        <div key={entry.id}>    
+            <ChatEntry
+            id={entry.id}
+            sender={entry.sender}
+            body={entry.body}
+            timeStamp={entry.timeStamp}
+            liked={entry.liked}
+            heartCallback={props.heartCallback}
+            />
+        </div>
+        );
+    });
+    return (
+        <div>
+            {chatComponents}
+        </div>
+    )
+}
+
+ChatLog.propTypes = {
+    entries: PropTypes.array.isRequired,
+};
+
+export default ChatLog;
+
diff --git a/src/components/ChatLog.test.js b/src/components/ChatLog.test.js
index 96f89ebc3..3c19b4e5a 100644
--- a/src/components/ChatLog.test.js
+++ b/src/components/ChatLog.test.js
@@ -5,26 +5,31 @@ import { render, screen } from "@testing-library/react";
 
 const LOG = [
   {
+    id: 0,
     sender: "Vladimir",
     body: "why are you arguing with me",
     timeStamp: "2018-05-29T22:49:06+00:00",
   },
   {
+    id: 1,
     sender: "Estragon",
     body: "Because you are wrong.",
     timeStamp: "2018-05-29T22:49:33+00:00",
   },
   {
+    id: 2,
     sender: "Vladimir",
     body: "because I am what",
     timeStamp: "2018-05-29T22:50:22+00:00",
   },
   {
+    id: 3,
     sender: "Estragon",
     body: "A robot.",
     timeStamp: "2018-05-29T22:52:21+00:00",
   },
   {
+    id: 4,
     sender: "Vladimir",
     body: "Notabot",
     timeStamp: "2019-07-23T22:52:21+00:00",