diff --git a/src/App.js b/src/App.js
index c10859093..e206d524d 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,16 +1,39 @@
-import React from 'react';
+import React, { useState } from 'react';
 import './App.css';
-import chatMessages from './data/messages.json';
+import entries from './data/messages.json';
+import ChatLog from './components/ChatLog';
+import ChatEntry from './components/ChatEntry';
+
+
 
 const App = () => {
+  const [messages, setMessages] = useState(entries)
+
+  const numLikes = messages.filter((message) => message.liked).length;
+
+  // going to write a helper function for messages
+  const setLikes = (id) => {
+    const newMessages = messages.map((message) => {
+      if (id === message.id){
+        return {...message, liked: !message.liked};
+        
+      }
+      
+      return message 
+    });
+
+    setMessages(newMessages)
+
+  }
+ 
   return (
     <div id="App">
       <header>
-        <h1>Application title</h1>
+        <h1>chit chat</h1>
+        <p>number of likes {numLikes} ❤️s</p>
       </header>
       <main>
-        {/* Wave 01: Render one ChatEntry component
-        Wave 02: Render ChatLog component */}
+        <ChatLog entries={messages} setLikes={setLikes}  />
       </main>
     </div>
   );
diff --git a/src/components/ChatEntry.js b/src/components/ChatEntry.js
index b92f0b7b2..59e3d8d66 100644
--- a/src/components/ChatEntry.js
+++ b/src/components/ChatEntry.js
@@ -1,22 +1,31 @@
-import React from 'react';
+import React, { useState } from 'react';
 import './ChatEntry.css';
 import PropTypes from 'prop-types';
+import TimeStamp from './TimeStamp';
 
 const ChatEntry = (props) => {
-  return (
-    <div className="chat-entry local">
-      <h2 className="entry-name">Replace with name of sender</h2>
+
+
+  const heart = props.liked? '❤️': '🤍';
+
+
+  return(
+    <div className = "chat-entry 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>
+        <TimeStamp time={props.timeStamp} />
+        <button className='like'onClick={()=>props.setLikes(props.id)}>{heart}</button>
       </section>
-    </div>
+    </div >
   );
 };
 
 ChatEntry.propTypes = {
-  //Fill with correct proptypes
+  body: PropTypes.string.isRequired,
+  sender: PropTypes.string.isRequired,
+  timeStamp: PropTypes.string.isRequired,
+  id: PropTypes.number.isRequired,
 };
 
 export default ChatEntry;
diff --git a/src/components/ChatLog.js b/src/components/ChatLog.js
new file mode 100644
index 000000000..a69cde1f6
--- /dev/null
+++ b/src/components/ChatLog.js
@@ -0,0 +1,38 @@
+import ChatEntry from './ChatEntry';
+import PropTypes from 'prop-types';
+
+
+const ChatLog = (props) => {
+    const data = props.entries.map((entry, index) => {
+        return (
+            <li key={index}>
+                <ChatEntry
+                    body={entry.body}
+                    sender={entry.sender}
+                    timeStamp={entry.timeStamp}
+                    liked={entry.liked}
+                    setLikes={props.setLikes}
+                    id={entry.id}
+                ></ChatEntry>
+            </li>
+        );
+    });
+    return (
+        <div>
+            <ul>
+                {data}
+            </ul>
+        </div>
+
+    );
+};
+ChatLog.propTypes = {
+    entries: PropTypes.arrayOf(PropTypes.shape({
+        body: PropTypes.string.isRequired,
+        sender: PropTypes.string.isRequired,
+        timeStamp: PropTypes.string.isRequired,
+        liked: PropTypes.bool.isRequired
+    }))
+};
+
+export default ChatLog;
diff --git a/src/components/TimeStamp.js b/src/components/TimeStamp.js
index e8892b4d4..5f4759573 100644
--- a/src/components/TimeStamp.js
+++ b/src/components/TimeStamp.js
@@ -2,11 +2,11 @@ import { DateTime } from 'luxon';
 import PropTypes from 'prop-types';
 
 const TimeStamp = (props) => {
-  const time = DateTime.fromISO(props.time);
-  const absolute = time.toFormat('MMMM Do YYYY, h:mm:ss a');
-  const relative = time.toRelative();
+  const compTime = DateTime.fromISO(props.time);
+  const absolute = compTime.toFormat('MMMM Do YYYY, h:mm:ss a');
+  const relative = compTime.toRelative();
 
-  return <span title={absolute}>{relative}</span>;
+  return <span className="entry-time" title={absolute}>{relative}</span>;
 };
 
 TimeStamp.propTypes = {