diff --git a/src/App.js b/src/App.js
index c10859093..f9291064e 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,16 +1,44 @@
 import React from 'react';
 import './App.css';
+import { useState } from 'react';
 import chatMessages from './data/messages.json';
+import ChatLog from './components/ChatLog';
 
 const App = () => {
+  const [entries, setEntries] = useState(chatMessages);
+
+  const updateLike = () => {
+    let likeCount = 0;
+
+    for (const entry of entries) {
+      if (entry.liked === true) {
+        likeCount += 1;
+      }
+    }
+    return likeCount;
+  };
+
+  const toggleHeart = (id) => {
+    const newEntries = [];
+
+    for (const entry of entries) {
+      const newEntry = { ...entry };
+      if (newEntry.id === id) {
+        newEntry.liked = !newEntry.liked;
+      }
+      newEntries.push(newEntry);
+    }
+    setEntries(newEntries);
+  };
+
   return (
     <div id="App">
       <header>
-        <h1>Application title</h1>
+        <h1>Chat with Estragon and Vladimir</h1>
+        <div> {updateLike()}❤️s</div>
       </header>
       <main>
-        {/* Wave 01: Render one ChatEntry component
-        Wave 02: Render ChatLog component */}
+        <ChatLog entries={entries} toggleHeartCallback={toggleHeart} />
       </main>
     </div>
   );
diff --git a/src/App.test.js b/src/App.test.js
index ca75c71dd..878148902 100644
--- a/src/App.test.js
+++ b/src/App.test.js
@@ -1,53 +1,53 @@
-import React from 'react'
-import App from './App'
-import { render, screen, fireEvent } from '@testing-library/react'
+import React from 'react';
+import App from './App';
+import { render, screen, fireEvent } from '@testing-library/react';
 
 describe('Wave 03: clicking like button and rendering App', () => {
   test('that the correct number of likes is printed at the top', () => {
     // Arrange
-    const { container } = render(<App />)
-    let buttons = container.querySelectorAll('button.like')
+    const { container } = render(<App />);
+    let buttons = container.querySelectorAll('button.like');
 
     // Act
-    fireEvent.click(buttons[0])
-    fireEvent.click(buttons[1])
-    fireEvent.click(buttons[10])
+    fireEvent.click(buttons[0]);
+    fireEvent.click(buttons[1]);
+    fireEvent.click(buttons[10]);
 
     // Assert
-    const countScreen = screen.getByText(/3 ❤️s/)
-    expect(countScreen).not.toBeNull()
-  })
+    const countScreen = screen.getByText(/3 ❤️s/);
+    expect(countScreen).not.toBeNull();
+  });
 
   test('clicking button toggles heart and does not affect other buttons', () => {
     // Arrange
-    const { container } = render(<App />)
-    const buttons = container.querySelectorAll('button.like')
-    const firstButton = buttons[0]
-    const lastButton = buttons[buttons.length - 1]
+    const { container } = render(<App />);
+    const buttons = container.querySelectorAll('button.like');
+    const firstButton = buttons[0];
+    const lastButton = buttons[buttons.length - 1];
 
     // Act-Assert
 
     // click the first button
-    fireEvent.click(firstButton)
-    expect(firstButton.innerHTML).toEqual('❤️')
+    fireEvent.click(firstButton);
+    expect(firstButton.innerHTML).toEqual('❤️');
 
     // check that all other buttons haven't changed
     for (let i = 1; i < buttons.length; i++) {
-      expect(buttons[i].innerHTML).toEqual('🤍')
+      expect(buttons[i].innerHTML).toEqual('🤍');
     }
 
     // click the first button a few more times
-    fireEvent.click(firstButton)
-    expect(firstButton.innerHTML).toEqual('🤍')
-    fireEvent.click(firstButton)
-    expect(firstButton.innerHTML).toEqual('❤️')
-    fireEvent.click(firstButton)
-    expect(firstButton.innerHTML).toEqual('🤍')
+    fireEvent.click(firstButton);
+    expect(firstButton.innerHTML).toEqual('🤍');
+    fireEvent.click(firstButton);
+    expect(firstButton.innerHTML).toEqual('❤️');
+    fireEvent.click(firstButton);
+    expect(firstButton.innerHTML).toEqual('🤍');
 
     // click the last button a couple times
-    fireEvent.click(lastButton)
-    expect(lastButton.innerHTML).toEqual('❤️')
-    fireEvent.click(lastButton)
-    expect(lastButton.innerHTML).toEqual('🤍')
-  })
-})
+    fireEvent.click(lastButton);
+    expect(lastButton.innerHTML).toEqual('❤️');
+    fireEvent.click(lastButton);
+    expect(lastButton.innerHTML).toEqual('🤍');
+  });
+});
diff --git a/src/components/ChatEntry.js b/src/components/ChatEntry.js
index b92f0b7b2..54e80441b 100644
--- a/src/components/ChatEntry.js
+++ b/src/components/ChatEntry.js
@@ -1,22 +1,44 @@
 import React from 'react';
 import './ChatEntry.css';
 import PropTypes from 'prop-types';
+import TimeStamp from './TimeStamp';
 
 const ChatEntry = (props) => {
+  const flipHeart = () => {
+    props.toggleHeartCallback(props.id);
+  };
+
   return (
-    <div className="chat-entry local">
-      <h2 className="entry-name">Replace with name of sender</h2>
+    <div
+      className={`chat-entry ${
+        props.sender === 'Estragon' ? 'remote' : 'local'
+      } `}
+    >
+      <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 className="like" onClick={flipHeart}>
+          {props.liked ? '❤️' : '🤍'}
+        </button>
       </section>
     </div>
   );
 };
 
 ChatEntry.propTypes = {
-  //Fill with correct proptypes
+  id: PropTypes.number,
+  sender: PropTypes.string.isRequired,
+  body: PropTypes.string.isRequired,
+  timeStamp: PropTypes.string.isRequired,
+  liked: PropTypes.bool,
+  toggleHeartCallback: PropTypes.func,
+};
+
+ChatEntry.defaultProps = {
+  toggleHeartCallback: () => {},
 };
 
 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..ed118dab3
--- /dev/null
+++ b/src/components/ChatLog.js
@@ -0,0 +1,28 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import './ChatLog.css';
+import ChatEntry from './ChatEntry';
+
+const ChatLog = (props) => {
+  const chatEntryComponents = props.entries.map((entry) => {
+    return (
+      <ChatEntry
+        key={entry.id}
+        id={entry.id}
+        sender={entry.sender}
+        body={entry.body}
+        timeStamp={entry.timeStamp}
+        liked={entry.liked}
+        toggleHeartCallback={props.toggleHeartCallback}
+      ></ChatEntry>
+    );
+  });
+
+  return <div>{chatEntryComponents}</div>;
+};
+
+ChatLog.propTypes = {
+  entries: PropTypes.array.isRequired,
+};
+
+export default ChatLog;
diff --git a/src/index.js b/src/index.js
index fae3e3500..8f598c9db 100644
--- a/src/index.js
+++ b/src/index.js
@@ -6,3 +6,10 @@ import registerServiceWorker from './registerServiceWorker';
 
 ReactDOM.render(<App />, document.getElementById('root'));
 registerServiceWorker();
+// root.render(
+//   <React.StrictMode>
+//     <App />
+//   </React.StrictMode>
+// );
+// Not sure if I need this code but it was in the live code, code gets sent into render method and once its rendered its injected
+// directly into html inside the anchor div