diff --git a/src/App.js b/src/App.js
index c1085909..a4624b09 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,16 +1,36 @@
-import React from 'react';
+import React, { useState } from 'react';
 import './App.css';
 import chatMessages from './data/messages.json';
+import ChatLog from './components/ChatLog.js';
+import HeartCount from './components/HeartCount.js';
 
 const App = () => {
+  const [heart, setHeart] = useState(chatMessages);
+
+  const toggleHeart = (id) => {
+    // count = 0;
+    console.log({ id });
+    const newHeartCount = heart.map((message) => {
+      if (message.id === id) {
+        return { ...message, liked: !message.liked };
+      }
+      return message;
+    });
+    setHeart(newHeartCount);
+  };
+
   return (
     <div id="App">
       <header>
         <h1>Application title</h1>
+        <h2>{HeartCount(heart)}</h2>
       </header>
       <main>
-        {/* Wave 01: Render one ChatEntry component
-        Wave 02: Render ChatLog component */}
+        {
+          /* Wave 01: Render one ChatEntry component
+        Wave 02: Render ChatLog component */
+          <ChatLog entries={heart} toggleHeartCallback={toggleHeart}></ChatLog>
+        }
       </main>
     </div>
   );
diff --git a/src/App.test.js b/src/App.test.js
index ca75c71d..87814890 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 b92f0b7b..7e5b2c4a 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.js';
 
 const ChatEntry = (props) => {
+  const heartType = props.liked ? '❤️' : '🤍';
+  const handleToggleHeart = () => {
+    props.toggleHeartCallback(props.id);
+  };
+
   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}></TimeStamp>
+        </p>
+        <button className="like" onClick={handleToggleHeart}>
+          {heartType}
+        </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.isRequired,
 };
 
 export default ChatEntry;
diff --git a/src/components/ChatLog.js b/src/components/ChatLog.js
new file mode 100644
index 00000000..2b22844a
--- /dev/null
+++ b/src/components/ChatLog.js
@@ -0,0 +1,35 @@
+import React from 'react';
+import './ChatLog.css';
+import PropTypes from 'prop-types';
+import ChatEntry from './ChatEntry.js';
+
+const ChatLog = (props) => {
+  const chitChats = props.entries.map((message, index) => {
+    return (
+      <ChatEntry
+        key={index}
+        id={message.id}
+        sender={message.sender}
+        body={message.body}
+        timeStamp={message.timeStamp}
+        liked={message.liked}
+        toggleHeartCallback={props.toggleHeartCallback}
+      ></ChatEntry>
+    );
+  });
+  return <div className="chat-log">{chitChats}</div>;
+};
+
+ChatLog.propTypes = {
+  entries: PropTypes.arrayOf(
+    PropTypes.shape({
+      id: PropTypes.number,
+      sender: PropTypes.string.isRequired,
+      body: PropTypes.string.isRequired,
+      timeStamp: PropTypes.string.isRequired,
+      liked: PropTypes.bool,
+    })
+  ).isRequired,
+  toggleHeartCallback: PropTypes.func,
+};
+export default ChatLog;
diff --git a/src/components/HeartCount.js b/src/components/HeartCount.js
new file mode 100644
index 00000000..373a5464
--- /dev/null
+++ b/src/components/HeartCount.js
@@ -0,0 +1,6 @@
+const HeartCount = (messages) => {
+  let count = 0;
+  messages.forEach((m) => (m.liked ? count++ : m));
+  return <div>{count} ❤️s</div>;
+};
+export default HeartCount;