diff --git a/src/App.js b/src/App.js
index c1085909..d2ac9ac4 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,16 +1,39 @@
-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 = () => {
+  console.log(chatMessages);
+  const [chatsMessages, setChatState] = useState(chatMessages);
+  const changeLike = (id) => {
+    const newData = chatsMessages.map((chat) => {
+      if (chat.id === id) {
+        chat.liked = !chat.liked;
+        return chat;
+      }
+      return chat;
+    });
+    return setChatState(newData);
+  };
+  const sumLikes = () => {
+    const likedTrue = chatsMessages.filter((chat) => {
+      return chat.liked === true;
+    });
+    return likedTrue.length;
+  };
+
   return (
     <div id="App">
       <header>
-        <h1>Application title</h1>
+        <h1>Chats</h1>
+        <h3>{sumLikes()} ❤️'s</h3>
       </header>
       <main>
-        {/* Wave 01: Render one ChatEntry component
-        Wave 02: Render ChatLog component */}
+        <ChatLog
+          chatsMessages={chatsMessages}
+          onChangeLike={changeLike}
+        ></ChatLog>
       </main>
     </div>
   );
diff --git a/src/components/ChatEntry.js b/src/components/ChatEntry.js
index b92f0b7b..5294137e 100644
--- a/src/components/ChatEntry.js
+++ b/src/components/ChatEntry.js
@@ -1,15 +1,34 @@
-import React from 'react';
+import React, { useState } from 'react';
 import './ChatEntry.css';
 import PropTypes from 'prop-types';
+import TimeStamp from './TimeStamp';
 
 const ChatEntry = (props) => {
+  const [liked, setLike] = useState(false);
+  const changeHeart = !liked ? '🤍' : '❤️';
+  const changeLike = (id) => {
+    const likeState = setLike(!liked);
+    props.onChangeLike(id);
+
+    return likeState;
+  };
+
   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}> years ago</TimeStamp>
+        </p>
+        <button
+          onClick={() => {
+            changeLike(props.id);
+          }}
+          className="like"
+        >
+          {changeHeart}
+        </button>
       </section>
     </div>
   );
@@ -17,6 +36,12 @@ const ChatEntry = (props) => {
 
 ChatEntry.propTypes = {
   //Fill with correct proptypes
+  sender: PropTypes.string.isRequired,
+  body: PropTypes.string.isRequired,
+  timeStamp: PropTypes.string.isRequired,
+  id: PropTypes.number.isRequired,
+  liked: PropTypes.bool.isRequired,
+  onChangeLike: PropTypes.func.isRequired,
 };
 
 export default ChatEntry;
diff --git a/src/components/ChatLog.js b/src/components/ChatLog.js
new file mode 100644
index 00000000..0e8a96ef
--- /dev/null
+++ b/src/components/ChatLog.js
@@ -0,0 +1,27 @@
+import { React } from 'react';
+import ChatEntry from './ChatEntry';
+import PropTypes from 'prop-types';
+
+const ChatLog = (props) => {
+  const chatMessageArray = props.chatsMessages.map((chat) => {
+    return (
+      <ChatEntry
+        sender={chat.sender}
+        body={chat.body}
+        timeStamp={chat.timeStamp}
+        id={chat.id}
+        key={chat.id}
+        liked={chat.liked}
+        onChangeLike={props.onChangeLike}
+      />
+    );
+  });
+  return chatMessageArray;
+};
+
+ChatLog.propTypes = {
+  chatsMessages: PropTypes.arrayOf(PropTypes.object).isRequired,
+  onChangeLike: PropTypes.func.isRequired,
+};
+
+export default ChatLog;