diff --git a/src/App.css b/src/App.css
index d97beb4e..5a148386 100644
--- a/src/App.css
+++ b/src/App.css
@@ -1,21 +1,25 @@
 #App {
-  background-color: #87cefa;
+  background-color: white;
 }
 
 #App header {
   background-color: #222;
   color: #fff;
-  padding-bottom: 0.5rem;
+  /* padding-bottom: 0.5rem; */
   position: fixed;
-  width: 100%;
+  width: 34.05%;
   z-index: 100;
   text-align: center;
   align-items: center;
+  left: 33.05%;
+  border-top-left-radius: 1em;
+  border-top-right-radius: 1em;
 }
 
+
 #App main {
-  padding-left: 2em;
-  padding-right: 2em;
+  padding-left: 3em;
+  padding-right: 3em;
   padding-bottom: 5rem;
   padding-top: 10rem;
 }
@@ -24,25 +28,30 @@
   font-size: 1.5em;
   text-align: center;
   display: inline-block;
+  
 }
 
-#App header section {
+#App header h2 {
   background-color: #e0ffff;
+  color: black;
 }
 
 #App .widget {
+  position: absolute;
   display: inline-block;
-  line-height: 0.5em;
-  border-radius: 10px;
   color: black;
   font-size:0.8em;
-  padding-left: 1em;
-  padding-right: 1em;
+  margin-left: 33.05%;
+  width: 30%;
+  background-color: #87cefa;
+  border-top-left-radius: 1em;
+  border-top-right-radius: 1em;
 }
 
 #App #heartWidget {
   font-size: 1.5em;
-  margin: 1em
+  margin: 1em;
+  justify-content: right;
 }
 
 #App span {
diff --git a/src/App.js b/src/App.js
index c1085909..ed2ae0fe 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,16 +1,46 @@
 import React from 'react';
 import './App.css';
-import chatMessages from './data/messages.json';
+import messages from './data/messages.json';
+import { useState } from 'react';
+import ChatLog from './components/ChatLog';
 
 const App = () => {
+  const [entries, setEntries] = useState(messages);
+
+  const getLikedMessages = (id) => {
+    console.log('Update heart icon if liked')
+
+    const newEntries = entries.map((chatEntry) => {
+      const newChatMessage = {...chatEntry};
+      if (newChatMessage.id === id) {
+        newChatMessage.liked = !newChatMessage.liked;
+      }
+      return newChatMessage;
+    })
+    setEntries(newEntries);
+  }
+
+  const numberOfLikes = () => {
+    let numberMessagesLiked = 0;
+    for (const chatEntry of entries) {
+      if (chatEntry.liked) {
+        numberMessagesLiked += 1;
+      }
+    }
+    return numberMessagesLiked;
+  }
+
   return (
-    <div id="App">
-      <header>
-        <h1>Application title</h1>
+    <div id='App'>
+      <header className = 'header'>
+        <h1>Chat between Vladimir and Estragon</h1>
+        <h2>{numberOfLikes()} ❤️s</h2>
       </header>
-      <main>
-        {/* Wave 01: Render one ChatEntry component
-        Wave 02: Render ChatLog component */}
+      <main className = 'widget'>
+        <ChatLog
+          entries={entries}
+          likeCallback={getLikedMessages}
+        />
       </main>
     </div>
   );
diff --git a/src/components/ChatEntry.css b/src/components/ChatEntry.css
index 05c3baa4..fd36c046 100644
--- a/src/components/ChatEntry.css
+++ b/src/components/ChatEntry.css
@@ -10,6 +10,7 @@ button {
 
 .chat-entry {
   margin: 1rem;
+  font-family: Georgia, 'Times New Roman', Times, serif;
 }
 
 .chat-entry:last-child {
@@ -62,8 +63,12 @@ button {
   text-align: right;
 }
 
+.chat-entry.local .like {
+  text-align: left;
+}
+
 .chat-entry.local .entry-bubble::before {
-  background-color: #ffffe0;
+  background-color: #ffffe0; 
   left: -18px;
 }
 
@@ -90,6 +95,10 @@ button {
   text-align: left;
 }
 
+.chat-entry.remote #like {
+  text-align: right;
+}
+
 .chat-entry.remote .entry-bubble::before {
   background-color: #e0ffff;
   right: -18px;
diff --git a/src/components/ChatEntry.js b/src/components/ChatEntry.js
index b92f0b7b..6a45d1ab 100644
--- a/src/components/ChatEntry.js
+++ b/src/components/ChatEntry.js
@@ -1,22 +1,37 @@
 import React from 'react';
 import './ChatEntry.css';
 import PropTypes from 'prop-types';
+import TimeStamp from './TimeStamp';
 
 const ChatEntry = (props) => {
+
+  const chatEntryClassType = props.sender === 'Vladimir' ? 'local' : 'remote';
+  
+  const likeMessage = () => {
+    props.likeCallback(props.id);
+  };
+
   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>
+    <div className = {`chat-entry ${chatEntryClassType}`}>
+      <p className = 'entry-name'>{props.sender}</p>
+      <section className = 'entry-bubble'>
+        <p>{props.body}</p>
+        <p className = 'entry-time'>
+          <TimeStamp
+            time={props.timeStamp}
+          />
+        </p>
+        <button className = 'like' onClick={likeMessage}>{props.liked ? '❤️': '🤍'}</button>
       </section>
     </div>
   );
 };
 
 ChatEntry.propTypes = {
-  //Fill with correct proptypes
+  sender: PropTypes.string.isRequired,
+  body: PropTypes.string.isRequired,
+  timeStamp: PropTypes.string.isRequired,
+  liked: PropTypes.bool.isRequired,
 };
 
 export default ChatEntry;
diff --git a/src/components/ChatEntry.test.js b/src/components/ChatEntry.test.js
index b69270c0..4a9a2b09 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 00000000..27404772
--- /dev/null
+++ b/src/components/ChatLog.js
@@ -0,0 +1,31 @@
+import './ChatLog.css';
+import ChatEntry from './ChatEntry'
+import PropTypes from 'prop-types';
+import React from 'react';
+
+const ChatLog = (props) => {
+    const chatEntryComponents = props.entries.map((chatEntry) => {
+        return (
+            <ChatEntry
+                key={chatEntry.id}
+                id={chatEntry.id}
+                sender={chatEntry.sender}
+                body={chatEntry.body}
+                timeStamp={chatEntry.timeStamp}
+                liked={chatEntry.liked}
+                likeCallback={props.likeCallback}
+            />
+        );
+    });
+    return (
+    <div>
+        {chatEntryComponents}
+    </div>
+    );
+};
+
+ChatLog.propTypes = {
+    entries: PropTypes.array.isRequired,
+};
+
+export default ChatLog;
\ No newline at end of file
diff --git a/src/components/ChatLog.test.js b/src/components/ChatLog.test.js
index 96f89ebc..5bafee29 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();
   });
diff --git a/src/components/TimeStamp.js b/src/components/TimeStamp.js
index 51232778..069882c2 100644
--- a/src/components/TimeStamp.js
+++ b/src/components/TimeStamp.js
@@ -1,6 +1,7 @@
 import { DateTime } from 'luxon';
 
 const TimeStamp = (props) => {
+
   const time = DateTime.fromISO(props.time);
   const absolute = time.toFormat('MMMM Do YYYY, h:mm:ss a');
   const relative = time.toRelative();
@@ -9,3 +10,4 @@ const TimeStamp = (props) => {
 };
 
 export default TimeStamp;
+