diff --git a/src/App.jsx b/src/App.jsx
index 14a7f684..798ee262 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -1,17 +1,50 @@
 import './App.css';
+import messages from './data/messages.json';
+import ChatLog from './components/ChatLog';
+import { useState } from 'react';
+
+const countTotalLikes = (chatData) =>{
+  return chatData.reduce((total, chat) => {
+    return total + (chat.liked ? 1 : 0);
+  }, 0);
+};
 
 const App = () => {
+  const[chatData, setChatData] = useState(messages);
+  const totalLikes = countTotalLikes(chatData);
+
+  const handleToggleLike = id =>{
+    setChatData(chatData => {
+      return chatData.map(chat => {
+        if(chat.id === id) {
+          return ({ ...chat, liked: !chat.liked});
+        } else {
+          return chat;
+        }
+      });
+    });
+  };
+
   return (
     <div id="App">
       <header>
-        <h1>Application title</h1>
+        <h1>Chat between Vladimir and Estragon</h1>
+        <h2>{totalLikes} ❤️s</h2>
       </header>
       <main>
-        {/* Wave 01: Render one ChatEntry component
-        Wave 02: Render ChatLog component */}
+        {
+          // <ChatEntry sender = {message1.sender} body = {message1.body} timeStamp = '2018-05-29T22:49:06+00:00' >
+          // </ChatEntry>
+        /* Wave 01: Render one ChatEntry component
+          messages*/
+        }
+        <ChatLog
+          entries = {chatData}
+          toggleLike={handleToggleLike}> </ChatLog>
       </main>
     </div>
   );
 };
 
 export default App;
+
diff --git a/src/components/ChatEntry.css b/src/components/ChatEntry.css
index 05c3baa4..ece5ad73 100644
--- a/src/components/ChatEntry.css
+++ b/src/components/ChatEntry.css
@@ -97,4 +97,4 @@ button {
 
 .chat-entry.remote .entry-bubble:hover::before {
   background-color: #a9f6f6;
-}
\ No newline at end of file
+}
diff --git a/src/components/ChatEntry.jsx b/src/components/ChatEntry.jsx
index fe05efa0..413463d0 100644
--- a/src/components/ChatEntry.jsx
+++ b/src/components/ChatEntry.jsx
@@ -1,21 +1,28 @@
 import './ChatEntry.css';
+import TimeStamp from './TimeStamp.jsx';
+import PropTypes from 'prop-types';
 
-const ChatEntry = () => {
+const ChatEntry = ({ id, sender, body, timeStamp, liked, toggleLike }) => {
+  const heartColor = liked ? '❤️' : '🤍';
   return (
-    // Replace the outer tag name with a semantic element that fits our use case
-    <replace-with-relevant-semantic-element className="chat-entry local">
-      <h2 className="entry-name">Replace with name of sender</h2>
+    <article className="chat-entry local">
+      <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}></TimeStamp></p>
+        <button className="like" onClick={()=>toggleLike(id)}>{heartColor}</button>
       </section>
-    </replace-with-relevant-semantic-element>
+    </article>
   );
 };
 
 ChatEntry.propTypes = {
-  // Fill with correct proptypes
+  id: PropTypes.number.isRequired,
+  sender: PropTypes.string.isRequired,
+  body: PropTypes.string.isRequired,
+  timeStamp: PropTypes.string.isRequired,
+  liked: PropTypes.bool.isRequired,
+  toggleLike: PropTypes.func,
 };
 
 export default ChatEntry;
diff --git a/src/components/ChatLog.jsx b/src/components/ChatLog.jsx
new file mode 100644
index 00000000..6a17bf53
--- /dev/null
+++ b/src/components/ChatLog.jsx
@@ -0,0 +1,38 @@
+import ChatEntry from './ChatEntry.jsx';
+import './ChatLog.css';
+import PropTypes from 'prop-types';
+
+const ChatLog = ({ entries, toggleLike }) => {
+  const chatComponents = entries.map(entry => {
+    return (<ChatEntry
+      key={entry.id}
+      id={entry.id}
+      sender={entry.sender}
+      body={entry.body}
+      timeStamp={entry.timeStamp}
+      liked={entry.liked}
+      toggleLike={toggleLike}>
+    </ChatEntry>
+    );
+  });
+  return (
+    <>
+      {chatComponents}
+    </>
+
+  );
+};
+
+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,
+  toggleLike: PropTypes.func,
+
+};
+
+export default ChatLog;
\ No newline at end of file