diff --git a/src/App.js b/src/App.js
index c10859093..759f71605 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,16 +1,44 @@
-import React from 'react';
+import React, { useState } from 'react';
 import './App.css';
+import ChatLog from './components/ChatLog';
 import chatMessages from './data/messages.json';
 
 const App = () => {
+  const [chatData, updateChatData] = useState(chatMessages);
+  const updateLikes = (id) => {
+    const chats = chatData.map((chat) => {
+      if (chat.id === id) {
+        const newChat = { ...chat };
+        newChat.liked = !newChat.liked;
+        return newChat;
+      }
+      return chat;
+    });
+    updateChatData(chats);
+  };
+  const totalLikes = () => {
+    let total = 0;
+    for (let chat of chatData) {
+      if (chat.liked === true) {
+        total += 1;
+      }
+    }
+    return total;
+  };
   return (
     <div id="App">
-      <header>
-        <h1>Application title</h1>
+      <header id="App header">
+        <h1 id="App h1">
+          Chat between {chatData[0].sender} and {chatData[1].sender}
+        </h1>
+        <section id="App header section">
+          <h2 id="heartWidget" className="widget">
+            <span id="App span">{totalLikes()} ❤️s</span>
+          </h2>
+        </section>
       </header>
-      <main>
-        {/* Wave 01: Render one ChatEntry component
-        Wave 02: Render ChatLog component */}
+      <main id="App main">
+        <div>{<ChatLog entries={chatData} onUpdateLikes={updateLikes} />}</div>
       </main>
     </div>
   );
diff --git a/src/components/ChatEntry.js b/src/components/ChatEntry.js
index b92f0b7b2..80e84669e 100644
--- a/src/components/ChatEntry.js
+++ b/src/components/ChatEntry.js
@@ -1,22 +1,42 @@
 import React from 'react';
 import './ChatEntry.css';
 import PropTypes from 'prop-types';
+import TimeStamp from './TimeStamp';
+
+const ChatEntry = ({ id, sender, body, timeStamp, liked, onUpdateLikes }) => {
+  const chatTime = <TimeStamp time={timeStamp} />;
+  const localOrRemote = id % 2 === 0 ? 'remote' : 'local';
+  const updateLikes = (id) => {
+    onUpdateLikes(id);
+  };
+  const heartLiked = liked ? '❤️' : '🤍';
 
-const ChatEntry = (props) => {
   return (
-    <div className="chat-entry local">
-      <h2 className="entry-name">Replace with name of sender</h2>
+    <div key={id} className={`chat-entry ${localOrRemote}`}>
+      <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">{chatTime}</p>
+        <button
+          onClick={() => {
+            updateLikes(id);
+          }}
+          className="like"
+        >
+          {heartLiked}
+        </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,
+  onUpdateLikes: PropTypes.func,
 };
 
 export default ChatEntry;
diff --git a/src/components/ChatLog.js b/src/components/ChatLog.js
new file mode 100644
index 000000000..7e029a2d8
--- /dev/null
+++ b/src/components/ChatLog.js
@@ -0,0 +1,38 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ChatEntry from './ChatEntry';
+import './ChatLog.css';
+
+const ChatLog = ({ entries, onUpdateLikes }) => {
+  const getChatLogJSX = (entries, onUpdateLikes) => {
+    return entries.map((chat) => {
+      return (
+        <ChatEntry
+          key={chat.id}
+          id={chat.id}
+          sender={chat.sender}
+          body={chat.body}
+          timeStamp={chat.timeStamp}
+          liked={chat.liked}
+          onUpdateLikes={onUpdateLikes}
+        />
+      );
+    });
+  };
+  return <ul className="chat-log">{getChatLogJSX(entries, onUpdateLikes)}</ul>;
+};
+
+ChatLog.propTypes = {
+  entries: PropTypes.arrayOf(
+    PropTypes.shape({
+      id: PropTypes.number,
+      sender: PropTypes.string.isRequired,
+      body: PropTypes.string.isRequired,
+      timeStamp: PropTypes.string.isRequired,
+      liked: PropTypes.bool,
+    })
+  ).isRequired,
+  onUpdateLikes: PropTypes.func,
+};
+
+export default ChatLog;