diff --git a/src/App.jsx b/src/App.jsx
index 14a7f684..630782a1 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -1,14 +1,36 @@
 import './App.css';
+import ChatLog from './components/ChatLog';
+import chatMessages from './data/messages.json';
+import {useState} from 'react';
+
 
 const App = () => {
+  const [chatData, setChatData] = useState(chatMessages);
+  const toggleLiked = (id) => {
+    const data = chatData.map(chat => {
+      if (chat.id === id) {
+        return {...chat, liked: !chat.liked};
+      }else {
+        return chat;
+      };
+    });
+    setChatData(data);
+  };
+  let likeCount = 0;
+  for (const chat of chatData) {
+    if (chat.liked){likeCount += 1};
+  };
   return (
     <div id="App">
       <header>
-        <h1>Application title</h1>
+        <h1>Chat between {chatData[0].sender} and {chatData[1].sender} </h1>
+        <h2>{likeCount} ❤️s</h2>
       </header>
       <main>
-        {/* Wave 01: Render one ChatEntry component
-        Wave 02: Render ChatLog component */}
+        {
+          <ChatLog entries={chatData} toggleLiked={toggleLiked}/>
+        /* Wave 01: Render one ChatEntry component
+       Wave 02: Render ChatLog component */}
       </main>
     </div>
   );
diff --git a/src/components/ChatEntry.jsx b/src/components/ChatEntry.jsx
index 15c56f96..f1eef3c0 100644
--- a/src/components/ChatEntry.jsx
+++ b/src/components/ChatEntry.jsx
@@ -1,13 +1,21 @@
 import './ChatEntry.css';
+import TimeStamp from './TimeStamp';
+import PropTypes from 'prop-types';
+
+const ChatEntry = (props) => {
+  const toggleLikeButton = () => {
+    props.toggleLiked(props.id);
+  };
+
+  const heartButton= props.liked ? '❤️' : '🤍';
 
-const ChatEntry = () => {
   return (
     <div className="chat-entry local">
-      <h2 className="entry-name">Replace with name of sender</h2>
+      <h2 className="entry-name">{props.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>{props.body}</p>
+        <p className="entry-time"><TimeStamp time={props.timeStamp} /></p>
+        <button onClick={toggleLikeButton} className="like">{heartButton}</button>
       </section>
     </div>
   );
@@ -15,6 +23,12 @@ const ChatEntry = () => {
 
 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,
+  toggleLiked: PropTypes.func.isRequired,
 };
 
 export default ChatEntry;
diff --git a/src/components/ChatLog.jsx b/src/components/ChatLog.jsx
new file mode 100644
index 00000000..228ba568
--- /dev/null
+++ b/src/components/ChatLog.jsx
@@ -0,0 +1,38 @@
+import './ChatLog.css';
+import ChatEntry from './ChatEntry';
+import PropTypes from 'prop-types';
+
+const ChatLog = ({entries, toggleLiked}) => {
+  const entryComponents = entries.map((entry) => {
+    return (
+      <ChatEntry
+        id={entry.id}
+        sender={entry.sender}
+        body={entry.body}
+        timeStamp={entry.timeStamp}
+        liked={entry.liked}
+        toggleLiked={toggleLiked}
+        key={entry.id}
+      />);
+  });
+  return (
+    <>
+      <h2>Chat Log</h2>
+      <ul>
+        {entryComponents}
+      </ul>
+    </>
+  );
+};
+
+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,
+  toggleLiked: PropTypes.func.isRequired,
+};
+export default ChatLog;
\ No newline at end of file