diff --git a/src/App.js b/src/App.js
index c1085909..094309c6 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,16 +1,26 @@
-import React from 'react';
+import React, { useState } from 'react';
 import './App.css';
 import chatMessages from './data/messages.json';
+import ChatLog from './components/ChatLog';
 
 const App = () => {
+  const [likeCount, setLikeCount] = useState(0);
+  const updateLikeCount = (increment) => {
+    setLikeCount(likeCount + increment);
+  };
   return (
     <div id="App">
       <header>
-        <h1>Application title</h1>
+        <h1>Vladimir and Estragon's Conversation</h1>
+        <h2>{`${likeCount} ❤️s`}</h2>
       </header>
       <main>
         {/* Wave 01: Render one ChatEntry component
         Wave 02: Render ChatLog component */}
+        <ChatLog
+          entries={chatMessages}
+          onUpdateLikeCount={updateLikeCount}
+        ></ChatLog>
       </main>
     </div>
   );
diff --git a/src/components/ChatEntry.css b/src/components/ChatEntry.css
index 05c3baa4..8064252b 100644
--- a/src/components/ChatEntry.css
+++ b/src/components/ChatEntry.css
@@ -8,6 +8,9 @@ button {
 	outline: inherit;
 }
 
+button.liked {
+}
+
 .chat-entry {
   margin: 1rem;
 }
@@ -97,4 +100,4 @@ button {
 
 .chat-entry.remote .entry-bubble:hover::before {
   background-color: #a9f6f6;
-}
\ No newline at end of file
+}
diff --git a/src/components/ChatEntry.js b/src/components/ChatEntry.js
index b92f0b7b..b53a215f 100644
--- a/src/components/ChatEntry.js
+++ b/src/components/ChatEntry.js
@@ -1,22 +1,45 @@
-import React from 'react';
+import React, { useState } from 'react';
 import './ChatEntry.css';
 import PropTypes from 'prop-types';
+import TimeStamp from './TimeStamp';
 
 const ChatEntry = (props) => {
+  const source = props.sender === 'Vladimir' ? 'local' : 'remote';
+  const [liked, setLiked] = useState(props.liked);
+  const toggleLikeButton = () => {
+    const heart = document.getElementById(props.id);
+    setLiked(!liked);
+    if (liked) {
+      heart.textContent = '🤍';
+      props.onUpdate(-1);
+    } else {
+      heart.textContent = '❤️';
+      props.onUpdate(1);
+    }
+    setLiked(!liked);
+  };
   return (
-    <div className="chat-entry local">
-      <h2 className="entry-name">Replace with name of sender</h2>
+    <div className={`chat-entry ${source}`}>
+      <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}></TimeStamp>
+        </p>
+        <button className="like" id={props.id} onClick={toggleLikeButton}>
+          🤍
+        </button>
       </section>
     </div>
   );
 };
 
 ChatEntry.propTypes = {
-  //Fill with correct proptypes
+  id: PropTypes.number,
+  sender: PropTypes.string,
+  body: PropTypes.string,
+  timeStamp: PropTypes.string,
+  liked: PropTypes.bool,
 };
 
 export default ChatEntry;
diff --git a/src/components/ChatLog.js b/src/components/ChatLog.js
new file mode 100644
index 00000000..63fcc0e2
--- /dev/null
+++ b/src/components/ChatLog.js
@@ -0,0 +1,35 @@
+import React from 'react';
+import './ChatLog.css';
+import PropTypes from 'prop-types';
+import ChatEntry from './ChatEntry.js';
+
+const ChatLog = (props) => {
+  const chatEntryComponents = props.entries.map((entry) => {
+    return (
+      <ChatEntry
+        key={entry.id}
+        id={entry.id}
+        sender={entry.sender}
+        body={entry.body}
+        timeStamp={entry.timeStamp}
+        liked={entry.liked}
+        onUpdate={props.onUpdateLikeCount}
+      />
+    );
+  });
+  return <ul class-name="chat-log">{chatEntryComponents}</ul>;
+};
+
+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,
+};
+
+export default ChatLog;