diff --git a/src/App.js b/src/App.js
index c10859093..c916db67a 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,16 +1,48 @@
-import React from 'react';
+import React, {useState} from 'react';
 import './App.css';
 import chatMessages from './data/messages.json';
+import ChatLog from './components/ChatLog'
 
 const App = () => {
+  
+  const [entries, setEntries] = useState(chatMessages);
+
+  const toggleLike = (id) => {
+    const entriesCopy = entries.map((entry) => {
+      if (entry.id === id) {
+        return   {
+          id: entry.id,
+          sender: entry.sender,
+          body: entry.body,
+          timeStamp: entry.timeStamp,
+          liked: !entry.liked
+        };
+      } else return entry;
+    });
+    setEntries(entriesCopy);
+  };
+
+  const countLikes = () => {
+    let counter = 0;
+    for (let entry of entries) {
+      if (entry.liked) {
+        counter += 1;
+      };
+    };
+    return counter;
+  };
+
   return (
     <div id="App">
       <header>
-        <h1>Application title</h1>
+        <h1>Chat Log</h1>
+        <h2>{countLikes()} ❤️s</h2>
       </header>
       <main>
-        {/* Wave 01: Render one ChatEntry component
-        Wave 02: Render ChatLog component */}
+        <ChatLog 
+        entries={entries}
+        setLiked={toggleLike}
+        />
       </main>
     </div>
   );
diff --git a/src/components/ChatEntry.js b/src/components/ChatEntry.js
index b92f0b7b2..a774211cf 100644
--- a/src/components/ChatEntry.js
+++ b/src/components/ChatEntry.js
@@ -1,22 +1,29 @@
 import React from 'react';
 import './ChatEntry.css';
 import PropTypes from 'prop-types';
+import TimeStamp from './TimeStamp';
 
 const ChatEntry = (props) => {
+  const heartIcon =  (props.liked) ? '❤️' : '🤍';
+  const messageAlign = (props.sender === 'Vladimir') ? 'remote' : 'local';
   return (
-    <div className="chat-entry local">
-      <h2 className="entry-name">Replace with name of sender</h2>
+    <div className={`chat-entry ${messageAlign}`}>
+      <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={() => {props.setLiked(props.id)}}>{heartIcon}</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,
 };
 
 export default ChatEntry;
diff --git a/src/components/ChatLog.js b/src/components/ChatLog.js
new file mode 100644
index 000000000..c5c749487
--- /dev/null
+++ b/src/components/ChatLog.js
@@ -0,0 +1,30 @@
+import React from 'react';
+import ChatEntry from './ChatEntry';
+import PropTypes from 'prop-types';
+
+const ChatLog = (props) => {
+
+    const chatComponents = props.entries.map((entry) => {
+        return (
+            <ChatEntry
+                id = {entry.id}
+                key = {entry.id}
+                sender={entry.sender}
+                body={entry.body}
+                timeStamp={entry.timeStamp}
+                liked={entry.liked}
+                setLiked={props.setLiked}
+            />
+        );
+    });
+    return (
+        <section className="chat-log">{chatComponents}</section>
+    );
+};
+
+ChatLog.propTypes = {
+    entries: PropTypes.arrayOf(PropTypes.object).isRequired,
+
+};
+
+export default ChatLog;
\ No newline at end of file