diff --git a/src/App.js b/src/App.js
index c10859093..e427c5fce 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,16 +1,51 @@
-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 [chatMessagesData, setChatData] = useState(chatMessages);
+
+  const updateChatData = (updatedMessage) => {
+    const messages = chatMessagesData.map((message) => {
+      if (message.id === updatedMessage.id) {
+        return updatedMessage;
+      } else {
+        return message;
+      }
+
+    });
+    setChatData(messages);
+  };
+
+
+  const countLikes = (messages) => {
+    let likes = 0;
+    messages.forEach((message) => {
+      if (message.liked) {
+        likes++;
+      }
+    });
+    return likes;
+  };
+
+  const likes = countLikes(chatMessagesData);
+
   return (
     <div id="App">
+
       <header>
-        <h1>Application title</h1>
+        <h1>A tale of two cities</h1>
+        <section><span id="heartWidget" className="widget"> {likes} 💚s</span></section>
       </header>
+
       <main>
-        {/* Wave 01: Render one ChatEntry component
-        Wave 02: Render ChatLog component */}
+        {<div>
+          { <ChatLog
+            entries={ chatMessagesData }
+            onUpdateMessage={ updateChatData }
+        /> }
+        </div>}
       </main>
     </div>
   );
diff --git a/src/components/ChatEntry.js b/src/components/ChatEntry.js
index b92f0b7b2..a4b76c377 100644
--- a/src/components/ChatEntry.js
+++ b/src/components/ChatEntry.js
@@ -1,22 +1,44 @@
 import React from 'react';
 import './ChatEntry.css';
 import PropTypes from 'prop-types';
+import TimeStamp from './TimeStamp';
 
 const ChatEntry = (props) => {
+  const onLikeButtonClick = () => {
+    const updatedMessage = {
+      id: props.id,
+      sender: props.sender,
+      body: props.body,
+      timeStamp: props.timeStamp,
+      liked: !props.liked,
+    };
+    props.onUpdate(updatedMessage);
+  }
+
+  const likeButton = props.liked ? '💚' : '🤍';
+
   return (
-    <div className="chat-entry local">
-      <h2 className="entry-name">Replace with name of 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>
+    <div className="chat-entry local" key={props.id}>
+      <h2 className="entry-name"> { props.sender } </h2>
+      <section className="chat-entry.remote entry-bubble" >
+        <p> { props.body } </p>
+        <p className="entry-time"> <TimeStamp time={props.timeStamp} />  
+        </p>
+        <button className="like" onClick={onLikeButtonClick}> 
+        {likeButton} 
+        </button>
       </section>
     </div>
   );
 };
 
 ChatEntry.propTypes = {
-  //Fill with correct proptypes
+  id: PropTypes.number,
+  sender: PropTypes.string,
+  body: PropTypes.string,
+  timeStamp: PropTypes.string,
+  liked: PropTypes.bool,
+  onUpdate: PropTypes.func,
 };
 
 export default ChatEntry;
diff --git a/src/components/ChatLog.js b/src/components/ChatLog.js
new file mode 100644
index 000000000..4276f3dc7
--- /dev/null
+++ b/src/components/ChatLog.js
@@ -0,0 +1,46 @@
+
+import React from 'react';
+import './ChatLog.css';
+import PropTypes from 'prop-types';
+import ChatEntry from './ChatEntry';
+
+const ChatLog = ({ entries, onUpdateMessage }) => {
+  const getMessageLog = (entries) => {
+      
+    return entries.map((entry, index) => {
+      return (
+        <div key={index}>
+          <ChatEntry
+            id={entry.id}
+            sender={entry.sender}
+            body={entry.body}
+            timeStamp={entry.timeStamp}
+            liked={entry.liked}
+            onUpdate={onUpdateMessage}
+          />
+        </div>
+      );
+    });
+  };
+
+
+  return getMessageLog(entries);
+
+};
+
+ChatLog.propTypes = {
+  entries: PropTypes.arrayOf(
+    PropTypes.shape({
+      id: PropTypes.number,
+      sender: PropTypes.string,
+      body: PropTypes.string,
+      timeStamp: PropTypes.string,
+      liked: PropTypes.bool,
+    })
+  ).isRequired,
+  onUpdateMessage: PropTypes.func,
+};
+
+
+
+export default ChatLog;
\ No newline at end of file