diff --git a/src/App.js b/src/App.js
index c10859093..8482be6fd 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,16 +1,31 @@
-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 [likedMessages, setLikedMessages] = useState(0);
+
+  const likeMessage = () => {
+    setLikedMessages(likedMessages => likedMessages + 1);
+  };
+
+  const unlikeMessage = () => {
+    setLikedMessages(likedMessages => likedMessages - 1);
+  };
+  
   return (
     <div id="App">
       <header>
-        <h1>Application title</h1>
+        <h1>Chat Messages</h1>
+        <h2>{likedMessages} ❤️s</h2>
       </header>
       <main>
-        {/* Wave 01: Render one ChatEntry component
-        Wave 02: Render ChatLog component */}
+        <ChatLog
+          entries={chatMessages}
+          likeMessage={likeMessage}
+          unlikeMessage={unlikeMessage}
+        />
       </main>
     </div>
   );
diff --git a/src/components/ChatEntry.js b/src/components/ChatEntry.js
index b92f0b7b2..a7736b49c 100644
--- a/src/components/ChatEntry.js
+++ b/src/components/ChatEntry.js
@@ -1,22 +1,40 @@
-import React from 'react';
+import React, { useState } from 'react';
 import './ChatEntry.css';
+import TimeStamp from './TimeStamp';
 import PropTypes from 'prop-types';
 
-const ChatEntry = (props) => {
+const ChatEntry = ( { sender, body, timeStamp, likeMessage, unlikeMessage } ) => {
+  const [hearted, setHearted] = useState(false);
+
+  const toggleHeart = () => {
+    setHearted(hearted => !hearted);
+    hearted ? unlikeMessage(): likeMessage();
+  };
+
+  const heartedIcon = hearted ? '❤️' : '🤍';
+
   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={() => toggleHeart()}>
+          {heartedIcon}
+        </button>
       </section>
     </div>
   );
 };
 
 ChatEntry.propTypes = {
-  //Fill with correct proptypes
+  id: PropTypes.number.isRequired,
+  sender: PropTypes.string.isRequired,
+  body: PropTypes.number.isRequired,
+  timeStamp: PropTypes.string.isRequired,
+  liked: PropTypes.bool.isRequired
 };
 
 export default ChatEntry;
diff --git a/src/components/ChatLog.js b/src/components/ChatLog.js
new file mode 100644
index 000000000..6329f1431
--- /dev/null
+++ b/src/components/ChatLog.js
@@ -0,0 +1,32 @@
+import React from 'react';
+import './ChatLog.css';
+import PropTypes from 'prop-types';
+import ChatEntry from './ChatEntry';
+
+const ChatLog = ( { entries, likeMessage, unlikeMessage } ) => {
+    const chatEntries = entries.map(entry => {
+        return (
+            <ChatEntry
+                id={entry.id}
+                sender={entry.sender}
+                body={entry.body}
+                timeStamp={entry.timeStamp}
+                liked={entry.liked}
+                likeMessage={likeMessage}
+                unlikeMessage={unlikeMessage}
+            />
+        )
+    })
+
+    return (
+        <>
+        {chatEntries}
+        </>
+    )
+};
+
+ChatLog.propTypes = {
+    entries: PropTypes.array.isRequired
+  };
+
+export default ChatLog;
\ No newline at end of file