diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 000000000..6f3a2913e
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "liveServer.settings.port": 5501
+}
\ No newline at end of file
diff --git a/src/App.js b/src/App.js
index c10859093..560be220f 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,16 +1,44 @@
-import React from 'react';
+import React, { useState } from 'react';
 import './App.css';
+//import ChatEntry from './components/ChatEntry';
+import ChatLog from './components/ChatLog';
 import chatMessages from './data/messages.json';
 
+// const message = {
+//   id: 1,
+//   sender: 'Vladimir',
+//   body: 'why are you arguing with me',
+//   timeStamp: '2018-05-29T22:49:06+00:00',
+//   liked: false,
+// };
+
 const App = () => {
+  const [chatData, setChatData] = useState(chatMessages);
+  const [numLiked, setNumLiked] = useState(0);
+
+  const updateChatHeart = (updatedChat) => {
+    const chats = chatData.map((chat) => {
+      if (chat.id === updatedChat.id) {
+        if (updatedChat.liked) {
+          setNumLiked(numLiked + 1);
+        } else {
+          setNumLiked(numLiked - 1);
+        }
+        return updatedChat;
+      } else {
+        return chat;
+      }
+    });
+    setChatData(chats);
+  };
   return (
     <div id="App">
       <header>
-        <h1>Application title</h1>
+        <h1>OcelotChat</h1>
+        <h1>{numLiked} ❤️s</h1>
       </header>
       <main>
-        {/* Wave 01: Render one ChatEntry component
-        Wave 02: Render ChatLog component */}
+        <ChatLog entries={chatData} onUpdateChatHeart={updateChatHeart} />
       </main>
     </div>
   );
diff --git a/src/components/ChatEntry.js b/src/components/ChatEntry.js
index b92f0b7b2..00a5f4892 100644
--- a/src/components/ChatEntry.js
+++ b/src/components/ChatEntry.js
@@ -1,22 +1,52 @@
-import React from 'react';
 import './ChatEntry.css';
 import PropTypes from 'prop-types';
+import TimeStamp from './TimeStamp';
+
+const ChatEntry = ({
+  id,
+  sender,
+  body,
+  timeStamp,
+  liked,
+  onUpdateChatHeart,
+}) => {
+  const updateChatEntry = () => {
+    const updatedChat = {
+      id,
+      sender,
+      body,
+      timeStamp,
+      liked: !liked,
+    };
+    onUpdateChatHeart(updatedChat);
+  };
+
+  const heart = liked ? '❤️' : '🤍';
 
-const ChatEntry = (props) => {
   return (
-    <div className="chat-entry local">
-      <h2 className="entry-name">Replace with name of sender</h2>
+    <div className="chat-entry local" id={id}>
+      <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={updateChatEntry}>
+          {heart}
+        </button>
       </section>
     </div>
   );
 };
 
 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,
+  onUpdateChatHeart: PropTypes.func.isRequired,
 };
 
 export default ChatEntry;
diff --git a/src/components/ChatLog.js b/src/components/ChatLog.js
new file mode 100644
index 000000000..4dfaf77c7
--- /dev/null
+++ b/src/components/ChatLog.js
@@ -0,0 +1,36 @@
+import React from 'react';
+import './ChatLog.css';
+import PropTypes from 'prop-types';
+import ChatEntry from './ChatEntry';
+
+const ChatLog = ({ entries, onUpdateChatHeart }) => {
+  const chatEntries = entries.map((entry) => {
+    return (
+      <ChatEntry
+        key={entry.id}
+        id={entry.id}
+        sender={entry.sender}
+        body={entry.body}
+        timeStamp={entry.timeStamp}
+        liked={entry.liked}
+        onUpdateChatHeart={onUpdateChatHeart}
+      />
+    );
+  });
+  return <section>{chatEntries}</section>;
+};
+
+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,
+    })
+  ),
+  onUpdateChatHeart: PropTypes.func.isRequired,
+};
+
+export default ChatLog;