diff --git a/images/react-chatlog-demo.png b/images/react-chatlog-demo.png
index 6b7a83446..8b8d15050 100644
Binary files a/images/react-chatlog-demo.png and b/images/react-chatlog-demo.png differ
diff --git a/src/App.jsx b/src/App.jsx
index 14a7f684d..5ebd018bd 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -1,17 +1,54 @@
 import './App.css';
+import messagesData from './data/messages.json';
+import ChatLog from './components/ChatLog';
+import { useState } from 'react';
 
-const App = () => {
-  return (
-    <div id="App">
-      <header>
-        <h1>Application title</h1>
-      </header>
-      <main>
-        {/* Wave 01: Render one ChatEntry component
-        Wave 02: Render ChatLog component */}
-      </main>
-    </div>
+const toggleLikes = entry => {
+  return {...entry, liked: !entry.liked};
+};
+
+const countTotalLikes = messages => {
+  let total = 0;
+  for ( const entry of messages){
+    if (entry.liked) {
+      total += 1;
+    }
+  }
+  return total;
+};
+
+function App() {
+  const[messages, setMessages] = useState(messagesData);
+
+  const handleLikes = id => {
+    setMessages(prevMessages=>{
+      return prevMessages.map(entry => {
+        if(entry.id === id){
+          return toggleLikes(entry);
+        } else {
+          return entry;
+        }
+      });
+    });
+
+  };
+
+  const totalLikes = countTotalLikes(messages);
+    return (
+      <div id="App">
+        <header>
+          <h1>Chat between Vladimir and Estragon</h1>
+          <h2>{`${totalLikes} ❤️s`}</h2>
+        </header>
+        <main>
+          <ChatLog entries={messages}
+          onLikeEntry={handleLikes}
+         />
+        </main>
+      </div>
   );
 };
 
+
 export default App;
+
diff --git a/src/components/ChatEntry.jsx b/src/components/ChatEntry.jsx
index fe05efa0f..f7bb14d6f 100644
--- a/src/components/ChatEntry.jsx
+++ b/src/components/ChatEntry.jsx
@@ -1,21 +1,32 @@
 import './ChatEntry.css';
+import PropTypes from 'prop-types';
+import TimeStamp from './TimeStamp';
+import { DateTime } from 'luxon';
 
-const ChatEntry = () => {
+const ChatEntry = ({id,sender,body,timeStamp,onLikes, liked}) => {
+  const buttonClass = liked ? 'like__item__toggle--liked' : '';
   return (
     // Replace the outer tag name with a semantic element that fits our use case
-    <replace-with-relevant-semantic-element 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>
-      </section>
-    </replace-with-relevant-semantic-element>
+    <section className="chat-entry local">
+      <h2 className="entry-name">{sender}</h2>
+      <div className="entry-bubble">
+        <p className="entry-body">{body}</p>
+        <p className="entry-time"><TimeStamp time={timeStamp}/></p>
+        <button className={`like like__item__toggle ${buttonClass}`} onClick= {() => {onLikes(id);
+        }}>
+          {liked ? '❤️' : '🤍'}
+        </button>
+      </div>
+    </section>
   );
 };
-
 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,
+  onLikes:PropTypes.func,
 };
 
 export default ChatEntry;
diff --git a/src/components/ChatLog.jsx b/src/components/ChatLog.jsx
new file mode 100644
index 000000000..51e8a708c
--- /dev/null
+++ b/src/components/ChatLog.jsx
@@ -0,0 +1,37 @@
+import './ChatLog.css';
+import ChatEntry from './ChatEntry';
+import PropTypes from 'prop-types';
+
+const ChatLog =({entries, onLikeEntry }) => {
+  const ChatEntryLogs = entries.map(entry=> {
+    return (
+        <ChatEntry
+        key={entry.id}
+        id={entry.id}
+        sender= {entry.sender}
+        body={entry.body}
+        timeStamp={entry.timeStamp}
+        liked={entry.liked}
+        onLikes={onLikeEntry}
+
+        />
+    );
+  });
+  return(
+    <div className="chat-log">{ChatEntryLogs} </div>
+  //rename tag
+  );
+};
+
+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,
+
+};
+export default ChatLog;
\ No newline at end of file