diff --git a/src/App.js b/src/App.js
index c10859093..083c73ccd 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,19 +1,43 @@
-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 [totalLikes, setTotalLikes] = useState(0);
+  const [messages, setMessages] = useState(chatMessages); 
+
+  const handleLikeCount = (id) => {
+    const copyMessages = [...messages];
+    let newLiked;
+    for (let i = 0; i < copyMessages.length; i++){
+      if (copyMessages[i].id === id){
+        const oneMessage = {...copyMessages[i]}
+        oneMessage.liked = ! oneMessage.liked; 
+        copyMessages[i] = oneMessage;
+        newLiked = oneMessage.liked;
+      }
+    }
+
+    
+    setMessages(copyMessages); 
+    setTotalLikes((prevLikes) => (newLiked ? prevLikes + 1 : prevLikes - 1));
+  };
+
+  
+
   return (
     <div id="App">
       <header>
-        <h1>Application title</h1>
+        <h1>Vladimir and Estragon</h1>
+        <p>{totalLikes} {totalLikes === 1 ? '❤️' : '❤️s'}</p>
       </header>
       <main>
-        {/* Wave 01: Render one ChatEntry component
-        Wave 02: Render ChatLog component */}
+        <ChatLog entries={messages} onLikeChange={handleLikeCount} />
       </main>
     </div>
   );
 };
 
 export default App;
+
diff --git a/src/components/ChatEntry.js b/src/components/ChatEntry.js
index b92f0b7b2..460b0f5c2 100644
--- a/src/components/ChatEntry.js
+++ b/src/components/ChatEntry.js
@@ -1,22 +1,39 @@
-import React from 'react';
+import React, { useState } from 'react';
 import './ChatEntry.css';
 import PropTypes from 'prop-types';
+import TimeStamp from './TimeStamp';
+
+const ChatEntry = ({ id, sender, body, timeStamp, onLikeChange, liked }) => {
+
+  const handleLike = () => {
+
+    onLikeChange(id);
+  };
 
-const ChatEntry = (props) => {
   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={handleLike}>
+          {liked ? '❤️' : '🤍'}
+        </button>
       </section>
     </div>
   );
 };
 
 ChatEntry.propTypes = {
-  //Fill with correct proptypes
+  id: PropTypes.number.isRequired,
+  sender: PropTypes.string.isRequired,
+  body: PropTypes.string.isRequired,
+  timeStamp: PropTypes.string.isRequired,
+  onLikeChange: PropTypes.func.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..4a367bd26
--- /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, onLikeChange }) => {
+  return (
+    <div className="chat-log">
+      {entries.map((entry) => (
+        <ChatEntry
+          key={entry.id}
+          id={entry.id}
+          sender={entry.sender}
+          body={entry.body}
+          timeStamp={entry.timeStamp}
+          onLikeChange={onLikeChange}
+          liked={entry.liked}
+        />
+      ))}
+    </div>
+  );
+};
+
+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,
+  onLikeChange: PropTypes.func.isRequired,
+};
+
+export default ChatLog;
+