diff --git a/src/App.jsx b/src/App.jsx
index 14a7f684d..435772bf6 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -1,14 +1,47 @@
 import './App.css';
+import DATA from './data/messages.json';
+// import ChatEntry from './components/ChatEntry';
+import ChatLog from './components/ChatLog';
+import { useState } from 'react';
+import './App.css';
+
+
 
 const App = () => {
+  const [messagesData, setMessagesData] = useState(DATA);
+  const toggleLike = (Id) => {
+    const updatedMessages = messagesData.map((msg) => {
+      if (msg.id === Id) {
+        return { ...msg, liked: !msg.liked };
+      } else {
+        return msg;
+      }
+    });
+    setMessagesData(updatedMessages);
+  };
+  const likedMessages = messagesData.filter((message) => {
+    return message.liked === true;
+  });
+  const totalLikes = likedMessages.length;
   return (
     <div id="App">
       <header>
-        <h1>Application title</h1>
+        <h1>Chat Between Vladimer and Estragon</h1>
+        <h2 id="heartWidget">{totalLikes} ❤️s</h2>
       </header>
       <main>
-        {/* Wave 01: Render one ChatEntry component
-        Wave 02: Render ChatLog component */}
+        <div>
+          {
+          /* Wave 01: Render one ChatEntry component
+          <ChatEntry 
+            sender={firstMessagesData.sender}
+            body={firstMessagesData.body}
+            timeStamp={firstMessagesData.timeStamp}
+          ></ChatEntry> */}
+
+          {/* {Wave 02: Render ChatLog component  */}
+          <ChatLog entries = {messagesData} onLikeToggle={toggleLike}></ChatLog>
+        </div>
       </main>
     </div>
   );
diff --git a/src/components/ChatEntry.jsx b/src/components/ChatEntry.jsx
index 15c56f96b..61cae5a90 100644
--- a/src/components/ChatEntry.jsx
+++ b/src/components/ChatEntry.jsx
@@ -1,20 +1,31 @@
 import './ChatEntry.css';
+import PropTypes from 'prop-types';
+import TimeStamp from './TimeStamp';
 
-const ChatEntry = () => {
+const ChatEntry = ({ id, sender, body, timeStamp, liked, onLikeToggle}) => {
   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={() => onLikeToggle(id)}>
+          {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,
+  liked: PropTypes.bool.isRequired,
+  onLikeToggle: PropTypes.func.isRequired,
 };
 
 export default ChatEntry;
diff --git a/src/components/ChatLog.jsx b/src/components/ChatLog.jsx
new file mode 100644
index 000000000..86e69feee
--- /dev/null
+++ b/src/components/ChatLog.jsx
@@ -0,0 +1,39 @@
+import ChatEntry from './ChatEntry';
+import PropTypes from 'prop-types';
+import './ChatLog.css';
+
+const ChatLog = ({entries, onLikeToggle }) =>{
+  const ChatEntries = entries.map( (entry) => {
+    return(
+      <ChatEntry
+        key={entry.id}
+        id={entry.id}
+        sender={entry.sender}
+        body={entry.body}
+        timeStamp={entry.timeStamp}
+        liked = {entry.liked}
+        onLikeToggle = {onLikeToggle}
+      ></ChatEntry>
+    );
+  });
+  return (
+    <div className="chat-log">
+      {ChatEntries}
+    </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,
+  onLikeToggle: PropTypes.func.isRequired,
+};
+
+export default ChatLog
\ No newline at end of file