diff --git a/src/App.jsx b/src/App.jsx
index 14a7f684d..a4a4b74cc 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -1,14 +1,46 @@
 import './App.css';
+import ChatLog from './components/ChatLog';
+import DATA from './data/messages.json';
+import { useState } from 'react';
+
+const calculateLikedCount = (entries) => {
+  let likedCount = 0;
+  for (const entry of entries) {
+    if (entry.liked) {
+      likedCount++;
+    }
+  }
+  return likedCount;
+};
 
 const App = () => {
+  const [entries, setEntries] = useState(DATA);
+  const likedCount = calculateLikedCount(entries);
+
+  const likeEntry = (id) => {
+    setEntries((entries) => {
+      return entries.map((entry) => {
+        if (entry.id === id) {
+          return {...entry, liked: !entry.liked};
+        } else {
+          return entry;
+        }
+      });
+    });
+  };
+
   return (
     <div id="App">
       <header>
-        <h1>Application title</h1>
+        <h1>Chat Between Vladimir and Estragon</h1>
+        <section>
+          <h2 className="widget" id="heartWidget">{likedCount} ❤️s</h2>
+        </section>
       </header>
       <main>
         {/* Wave 01: Render one ChatEntry component
         Wave 02: Render ChatLog component */}
+        <ChatLog entries={entries} onLikeEntry={likeEntry}/>
       </main>
     </div>
   );
diff --git a/src/components/ChatEntry.jsx b/src/components/ChatEntry.jsx
index 15c56f96b..c1eeacb1b 100644
--- a/src/components/ChatEntry.jsx
+++ b/src/components/ChatEntry.jsx
@@ -1,13 +1,18 @@
 import './ChatEntry.css';
+import PropTypes from 'prop-types';
+import TimeStamp from './TimeStamp';
+
+const ChatEntry = ({id, sender, body, timeStamp, liked, onLikeEntry}) => {
+  const emoji = liked ? '❤️' : '🤍';
+  const entrySender = sender === 'Vladimir' ? 'local' : 'remote';
 
-const ChatEntry = () => {
   return (
-    <div className="chat-entry local">
-      <h2 className="entry-name">Replace with name of sender</h2>
+    <div className={`chat-entry ${entrySender}`}>
+      <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}/></p>
+        <button className="like" onClick={() => onLikeEntry(id)}>{emoji}</button>
       </section>
     </div>
   );
@@ -15,6 +20,12 @@ const ChatEntry = () => {
 
 ChatEntry.propTypes = {
   // Fill with correct proptypes
+  id: PropTypes.number.isRequired,
+  sender: PropTypes.string.isRequired,
+  body: PropTypes.string.isRequired,
+  timeStamp: PropTypes.string.isRequired,
+  liked: PropTypes.bool.isRequired,
+  onLikeEntry: PropTypes.func.isRequired,
 };
 
 export default ChatEntry;
diff --git a/src/components/ChatLog.jsx b/src/components/ChatLog.jsx
new file mode 100644
index 000000000..8c385f868
--- /dev/null
+++ b/src/components/ChatLog.jsx
@@ -0,0 +1,37 @@
+import './ChatLog.css';
+import PropTypes from 'prop-types';
+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}
+        onLikeEntry={props.onLikeEntry}
+      />
+    );
+  });
+  return (
+    <div className="chat-log">
+      {chatEntryComponents}
+    </div>
+  );
+};
+
+ChatLog.propTypes = {
+  entries: PropTypes.arrayOf(PropTypes.shape({
+    id: PropTypes.number.isRequired,
+    sender: PropTypes.string.isRequired,
+    body: PropTypes.string.isRequired,
+    timeStamp: PropTypes.string.isRequired,
+    liked: PropTypes.bool.isRequired
+  })).isRequired,
+  onLikeEntry: PropTypes.func.isRequired,
+};
+
+export default ChatLog;