diff --git a/src/App.js b/src/App.js
index c10859093..7aa414e4c 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,16 +1,30 @@
-import React from 'react';
+import React, { useState } from 'react';
 import './App.css';
 import chatMessages from './data/messages.json';
+import ChatEntry from './components/ChatEntry.js';
+import ChatLog from './components/ChatLog.js';
+
+
 
 const App = () => {
+const [likesCount, setLikesCount] = useState(0);
+const updateLikes = (isLike) => {
+  if (isLike) {
+  setLikesCount(likesCount + 1);
+  } else {
+    setLikesCount(likesCount - 1)
+  }
+}
+
+
   return (
     <div id="App">
       <header>
         <h1>Application title</h1>
+        <h2>{likesCount} ❤️s</h2>
       </header>
       <main>
-        {/* Wave 01: Render one ChatEntry component
-        Wave 02: Render ChatLog component */}
+        <ChatLog entries={chatMessages} updateLikes={updateLikes}/>
       </main>
     </div>
   );
diff --git a/src/components/ChatEntry.js b/src/components/ChatEntry.js
index b92f0b7b2..f84ffae92 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.js';
+import { useState } from 'react';
+
+
+
 
 const ChatEntry = (props) => {
+  const [likeButton, setLikeButton] = useState('🤍') 
+  const toggleClicked = () => {
+    if (likeButton === '🤍' ) {
+      setLikeButton('❤️')
+      props.updateLikes(true)
+    } else {
+      setLikeButton('🤍');
+      props.updateLikes(false)
+    }
+    
+  }
+  
+  
+
   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}/> </p>
+        <button className="like" onClick= {toggleClicked}>{likeButton}</button>
       </section>
     </div>
   );
 };
 
+// {props.updateLikes}
 ChatEntry.propTypes = {
-  //Fill with correct proptypes
+  sender: PropTypes.string.isRequired,
+  body: PropTypes.string.isRequired,
+  timeStamp: PropTypes.string.isRequired,
 };
 
 export default ChatEntry;
diff --git a/src/components/ChatLog.js b/src/components/ChatLog.js
new file mode 100644
index 000000000..538d0856d
--- /dev/null
+++ b/src/components/ChatLog.js
@@ -0,0 +1,29 @@
+import React from 'react';
+import ChatEntry from './ChatEntry';
+
+
+
+const ChatLog = (props) => {
+    const entries = props.entries;
+    
+    return (
+        <div className= 'chat-log'>
+        {
+            entries.map((entry,id) => (
+                <ChatEntry 
+                id={entry.id}
+                sender={entry.sender}
+                body={entry.body}
+                timeStamp={entry.timeStamp}
+                liked={entry.liked}
+                updateLikes={props.updateLikes}
+                key={id}
+            />
+            )
+            )}
+        </div>
+    )
+};
+
+
+export default ChatLog;