diff --git a/src/App.js b/src/App.js
index c10859093..21623c901 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,16 +1,46 @@
-import React from 'react';
+import React, { useState } from 'react';
 import './App.css';
+// import ChatEntry from './components/ChatEntry';
 import chatMessages from './data/messages.json';
+import ChatLog from './components/ChatLog';
 
 const App = () => {
+  // brain
+  const [ChatData, setChatData] = useState(chatMessages);
+  const [likeCount, setLikeCount] = useState(0);
+  const updateLike = (id, like) => {
+    // console.log(id, ChatData);
+    // console.log(like);
+    // console.log(id.liked);
+
+    const newMessage = ChatData.find((entry) => entry.id === id);
+    // console.log('newMessage');
+    // console.log(newMessage);
+    // console.log(like);
+    newMessage.liked = like;
+    setChatData([...ChatData]);
+    if (like) {
+      setLikeCount(likeCount + 1);
+      console.log('setLikeCount');
+    }
+    if (!like) {
+      setLikeCount(likeCount - 1);
+      console.log('setLikeCount2');
+    }
+  };
+  // beauty
   return (
     <div id="App">
       <header>
-        <h1>Application title</h1>
+        <h1>Chat between Vladmir and Estrogen</h1>
+        <section>
+          <h2>{likeCount} ❤️s</h2>
+        </section>
       </header>
       <main>
         {/* Wave 01: Render one ChatEntry component
-        Wave 02: Render ChatLog component */}
+        // Wave 02: Render ChatLog component */}
+        <ChatLog entries={ChatData} updateMessage={updateLike}></ChatLog>
       </main>
     </div>
   );
diff --git a/src/components/ChatEntry.js b/src/components/ChatEntry.js
index b92f0b7b2..cba4a174a 100644
--- a/src/components/ChatEntry.js
+++ b/src/components/ChatEntry.js
@@ -1,22 +1,51 @@
 import React from 'react';
 import './ChatEntry.css';
 import PropTypes from 'prop-types';
+import TimeStamp from './TimeStamp';
 
-const ChatEntry = (props) => {
+const ChatEntry = ({ id, body, sender, timeStamp, liked, updateMessage }) => {
+  // console.log('ChatEntry');
+  const onLikeButtonClick = () => {
+    // console.log('onLikeButtonClick');
+    // console.log(liked);
+
+    const updatedMessage = {
+      id: id,
+      body: body,
+      sender: sender,
+      timeStamp: timeStamp,
+      liked: !liked,
+    };
+    updateMessage(updatedMessage.id, updatedMessage.liked);
+  };
+
+  const likeColor = liked ? '❤️' : '🤍';
+  // console.log(likeColor);
+  // console.log(onLikeButtonClick);
   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}></TimeStamp>
+        </p>
+        <button className="like" onClick={onLikeButtonClick}>
+          {likeColor}
+        </button>
       </section>
     </div>
   );
 };
 
 ChatEntry.propTypes = {
-  //Fill with correct proptypes
+  //   //Fill with correct proptypes
+  id: PropTypes.number,
+  sender: PropTypes.string.isRequired,
+  body: PropTypes.string.isRequired,
+  timeStamp: PropTypes.string.isRequired,
+  liked: PropTypes.bool.isRequired,
+  updateMessage: PropTypes.func.isRequired,
 };
 
 export default ChatEntry;
diff --git a/src/components/ChatLog.js b/src/components/ChatLog.js
new file mode 100644
index 000000000..23b8a1afe
--- /dev/null
+++ b/src/components/ChatLog.js
@@ -0,0 +1,32 @@
+import React from 'react';
+import ChatEntry from './ChatEntry';
+import PropTypes from 'prop-types';
+
+const ChatLog = (props) => {
+  const entries = props.entries;
+  return (
+    <div>
+      {entries.map((message) => (
+        <ChatEntry
+          id={message.id}
+          key={message.id}
+          body={message.body}
+          sender={message.sender}
+          timeStamp={message.timeStamp}
+          liked={message.liked}
+          updateMessage={props.updateMessage}
+        ></ChatEntry>
+      ))}
+      ;
+    </div>
+  );
+};
+// return requires an argument
+// return <div>{entries}</div>;
+
+ChatLog.propTypes = {
+  entries: PropTypes.arrayOf(PropTypes.object),
+  updateMessage: PropTypes.func.isRequired,
+};
+
+export default ChatLog;
diff --git a/src/components/ChatLog.test.js b/src/components/ChatLog.test.js
index 96f89ebc3..5bafee291 100644
--- a/src/components/ChatLog.test.js
+++ b/src/components/ChatLog.test.js
@@ -1,49 +1,49 @@
-import React from "react";
-import "@testing-library/jest-dom/extend-expect";
-import ChatLog from "./ChatLog";
-import { render, screen } from "@testing-library/react";
+import React from 'react';
+import '@testing-library/jest-dom/extend-expect';
+import ChatLog from './ChatLog';
+import { render, screen } from '@testing-library/react';
 
 const LOG = [
   {
-    sender: "Vladimir",
-    body: "why are you arguing with me",
-    timeStamp: "2018-05-29T22:49:06+00:00",
+    sender: 'Vladimir',
+    body: 'why are you arguing with me',
+    timeStamp: '2018-05-29T22:49:06+00:00',
   },
   {
-    sender: "Estragon",
-    body: "Because you are wrong.",
-    timeStamp: "2018-05-29T22:49:33+00:00",
+    sender: 'Estragon',
+    body: 'Because you are wrong.',
+    timeStamp: '2018-05-29T22:49:33+00:00',
   },
   {
-    sender: "Vladimir",
-    body: "because I am what",
-    timeStamp: "2018-05-29T22:50:22+00:00",
+    sender: 'Vladimir',
+    body: 'because I am what',
+    timeStamp: '2018-05-29T22:50:22+00:00',
   },
   {
-    sender: "Estragon",
-    body: "A robot.",
-    timeStamp: "2018-05-29T22:52:21+00:00",
+    sender: 'Estragon',
+    body: 'A robot.',
+    timeStamp: '2018-05-29T22:52:21+00:00',
   },
   {
-    sender: "Vladimir",
-    body: "Notabot",
-    timeStamp: "2019-07-23T22:52:21+00:00",
+    sender: 'Vladimir',
+    body: 'Notabot',
+    timeStamp: '2019-07-23T22:52:21+00:00',
   },
 ];
 
-describe("Wave 02: ChatLog", () => {
+describe('Wave 02: ChatLog', () => {
   beforeEach(() => {
     render(<ChatLog entries={LOG} />);
   });
 
-  test("renders without crashing and shows all the names", () => {
+  test('renders without crashing and shows all the names', () => {
     [
       {
-        name: "Vladimir",
+        name: 'Vladimir',
         numChats: 3,
       },
       {
-        name: "Estragon",
+        name: 'Estragon',
         numChats: 2,
       },
     ].forEach((person) => {
@@ -56,7 +56,7 @@ describe("Wave 02: ChatLog", () => {
     });
   });
 
-  test("renders an empty list without crashing", () => {
+  test('renders an empty list without crashing', () => {
     const element = render(<ChatLog entries={[]} />);
     expect(element).not.toBeNull();
   });