diff --git a/src/App.js b/src/App.js
index c10859093..9108a8b7d 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,15 +1,35 @@
-import React from 'react';
+import React, { useState } from 'react';
 import './App.css';
 import chatMessages from './data/messages.json';
+// import ChatEntry from './components/ChatEntry';
+import ChatLog from './components/ChatLog';
 
+//<ChatEntry
+          //sender={chatMessages[0].sender}
+          //body={chatMessages[0].body}
+          //timeStamp={chatMessages[0].timeStamp}
+        ///>
 const App = () => {
+  const[likesCount,setLikeCount]=useState(0);
+  const updateLikes=(isLike)=>{
+    if (isLike){
+      setLikeCount(likesCount+1);
+    } else {
+        setLikeCount(likesCount-1)
+
+    }
+}
   return (
     <div id="App">
       <header>
-        <h1>Application title</h1>
+        <h1>Chat between Vladmir and Estragon</h1>
+        <h2>{likesCount}🤍s</h2>
+        <h3>ChatLog</h3>
       </header>
       <main>
-        {/* Wave 01: Render one ChatEntry component
+        <ChatLog entries={chatMessages}updateLikes={updateLikes}
+        />
+        {/* Chatlog
         Wave 02: Render ChatLog component */}
       </main>
     </div>
diff --git a/src/components/ChatEntry.js b/src/components/ChatEntry.js
index b92f0b7b2..b0e939a41 100644
--- a/src/components/ChatEntry.js
+++ b/src/components/ChatEntry.js
@@ -1,22 +1,52 @@
-import React from 'react';
+//import React, { useState } from 'react';
 import './ChatEntry.css';
 import PropTypes from 'prop-types';
+import TimeStamp from './TimeStamp';
+import {useState} from 'react';
+
 
 const ChatEntry = (props) => {
+  const[likeButton,setLikeButton]=useState('🤍');
+    const clickedToggle=()=>{
+
+    if(likeButton==='🤍'){
+      setLikeButton('❤️')
+      props.updateLikes(true)
+    }else{
+      setLikeButton('🤍')
+      props.updateLikes(false)
+    }
+  }
+  
+  
   return (
     <div className="chat-entry local">
-      <h2 className="entry-name">Replace with name of 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>
+      <h2 className="entry-name">{props.sender}</h2>
+      <section className="entry-bubble">{props.body}
+        <p></p>
+        <p className="entry-time">
+          <TimeStamp time={props.timeStamp}/>
+        </p>
+        <button className="like" onClick={clickedToggle}>{likeButton}</button>
+        
       </section>
     </div>
   );
 };
+//eventhandler (on click)====
+//for
+// const likeTotal(props)=>
+//setlikeCount,Likecount)
+//
 
 ChatEntry.propTypes = {
-  //Fill with correct proptypes
+  id:PropTypes.number.isRequired,
+  sender:PropTypes.string.isRequired,
+  body:PropTypes.string.isRequired,
+  timeStamp:PropTypes.string.isRequired,
+  likes:PropTypes.bool.isRequired,
+  
 };
+//`ChatEntry` with props `sender`, `body`,  and `timeStamp`.
 
 export default ChatEntry;
diff --git a/src/components/ChatEntry.test.js b/src/components/ChatEntry.test.js
index b69270c03..4a9a2b09f 100644
--- a/src/components/ChatEntry.test.js
+++ b/src/components/ChatEntry.test.js
@@ -1,9 +1,9 @@
-import React from "react";
-import "@testing-library/jest-dom/extend-expect";
-import ChatEntry from "./ChatEntry";
-import { render, screen, fireEvent, waitFor } from "@testing-library/react";
+import React from 'react';
+import '@testing-library/jest-dom/extend-expect';
+import ChatEntry from './ChatEntry';
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
 
-describe("Wave 01: ChatEntry", () => {
+describe('Wave 01: ChatEntry', () => {
   beforeEach(() => {
     render(
       <ChatEntry
@@ -14,15 +14,15 @@ describe("Wave 01: ChatEntry", () => {
     );
   });
 
-  test("renders without crashing and shows the sender", () => {
+  test('renders without crashing and shows the sender', () => {
     expect(screen.getByText(/Joe Biden/)).toBeInTheDocument();
   });
 
-  test("that it will display the body", () => {
+  test('that it will display the body', () => {
     expect(screen.getByText(/Get out by 8am/)).toBeInTheDocument();
   });
 
-  test("that it will display the time", () => {
+  test('that it will display the time', () => {
     expect(screen.getByText(/\d+ years ago/)).toBeInTheDocument();
   });
 });
diff --git a/src/components/ChatLog.js b/src/components/ChatLog.js
new file mode 100644
index 000000000..efeec3838
--- /dev/null
+++ b/src/components/ChatLog.js
@@ -0,0 +1,30 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ChatEntry from './ChatEntry';
+import './ChatLog.css';
+
+
+
+const ChatLog=(props)=>{
+        const entries =props.entries;
+    return(
+        <ul className='chat-log'>
+            {entries.map((entry,id)=>(
+            <ChatEntry
+            key={entry.id}
+            id={entry.id}
+            sender={entry.sender}
+            body={entry.body}
+            timeStamp={entry.timeStamp}
+            updateLikes={props.updateLikes}
+            liked={entry.liked}
+
+            ></ChatEntry>
+        ))}
+        </ul>
+        
+        ); 
+};
+
+
+export default ChatLog;
\ No newline at end of file
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();
   });