diff --git a/src/App.css b/src/App.css
index d97beb4e6..439a81e37 100644
--- a/src/App.css
+++ b/src/App.css
@@ -1,5 +1,5 @@
 #App {
-  background-color: #87cefa;
+  background-color: #E6E6FA;
 }
 
 #App header {
diff --git a/src/App.js b/src/App.js
index c10859093..8b1032496 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,16 +1,51 @@
 import React from 'react';
 import './App.css';
+// import ChatEntry from './components/ChatEntry';
+import ChatLog from './components/ChatLog';
 import chatMessages from './data/messages.json';
+import { useState } from 'react';
 
 const App = () => {
+  const [entries, setEntries] = useState(chatMessages)
+
+  const updateMessages = (updatedMessage) => {
+    const messages = entries.map(message => {
+      if (message.id === updatedMessage.id) {
+        return updatedMessage;
+      }
+      else {
+        return message
+      }
+    });
+    setEntries(messages);
+  };
+  
+  const totalLikes = (entries) => {
+    let likes = 0
+    for (let message of entries){
+      if (message.liked === true){
+        likes +=1;
+      }
+    }
+    return `${likes} ❤️s`;   
+    };
+  
   return (
     <div id="App">
       <header>
-        <h1>Application title</h1>
-      </header>
+        <h1>Heard it Through The Ivy Vine</h1>
+        <section>
+          <div className='widget'>
+            <div id='heartWidget'>{totalLikes(entries)}</div>
+          </div>
+        </section>
+      </header>       
+
       <main>
-        {/* Wave 01: Render one ChatEntry component
-        Wave 02: Render ChatLog component */}
+          <ChatLog 
+            entries={entries}
+            onToggleLike={updateMessages}
+          ></ChatLog>
       </main>
     </div>
   );
diff --git a/src/components/ChatEntry.js b/src/components/ChatEntry.js
index b92f0b7b2..65337647e 100644
--- a/src/components/ChatEntry.js
+++ b/src/components/ChatEntry.js
@@ -1,22 +1,50 @@
 import React from 'react';
 import './ChatEntry.css';
 import PropTypes from 'prop-types';
+import TimeStamp from './TimeStamp';
 
 const ChatEntry = (props) => {
+  let isLocal = 'local';
+  if (props.sender !== 'Vladimir'){
+    isLocal = 'remote';
+  }
+
+  const toggleLike = () => {
+    const updatedMessage = {
+      sender: props.sender,
+      id: props.id,
+      body: props.body,
+      timeStamp: props.timeStamp,
+      liked: !props.liked,
+    };
+    props.onToggleLike(updatedMessage);
+  }
+
+
+  const heart = props.liked ? '❤️' : '🤍';
+
   return (
-    <div className="chat-entry local">
-      <h2 className="entry-name">Replace with name of sender</h2>
+    <div className={`chat-entry ${isLocal}`}>
+      <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 onClick={toggleLike} className="like">{heart}</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,
+  onToggleLike : PropTypes.func,
 };
 
 export default ChatEntry;
diff --git a/src/components/ChatLog.css b/src/components/ChatLog.css
index 378848d1f..dfba563dd 100644
--- a/src/components/ChatLog.css
+++ b/src/components/ChatLog.css
@@ -2,3 +2,7 @@
   margin: auto;
   max-width: 50rem;
 }
+
+.chat-log ul{
+  list-style: none;
+}
\ No newline at end of file
diff --git a/src/components/ChatLog.js b/src/components/ChatLog.js
new file mode 100644
index 000000000..bd951684d
--- /dev/null
+++ b/src/components/ChatLog.js
@@ -0,0 +1,37 @@
+import React from 'react';
+import './ChatLog.css';
+import ChatEntry from './ChatEntry';
+import PropTypes from 'prop-types';
+
+const ChatLog = (props) => {
+    const entryComponants = props.entries.map((message, index) => {
+        return(
+            <li key={index}>
+                <ChatEntry 
+                    id = {message.id}
+                    sender={message.sender} 
+                    body={message.body} 
+                    liked = {message.liked}
+                    timeStamp={message.timeStamp}
+                    onToggleLike = {props.onToggleLike}
+                ></ChatEntry>
+            </li>
+        );
+    });
+
+    return (
+        <section className="chat-log">
+            <ul>
+                {entryComponants}
+            </ul>  
+        </section>
+
+    );
+};
+
+ChatLog.propTypes = {
+    entries: PropTypes.array.isRequired,
+    onToggleLike: PropTypes.func,
+};
+
+export default ChatLog;
\ No newline at end of file