diff --git a/src/App.jsx b/src/App.jsx
index 14a7f684d..2ca0d88bd 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -1,17 +1,61 @@
 import './App.css';
+import ChatLog from './components/ChatLog';
+import ColorChoice from './components/ColorChoice';
+import messagesData from './data/messages.json';
+import { useState } from 'react';
 
 const App = () => {
+  const [messages, setMessages] = useState(messagesData);
+  const [colors, setColors] = useState({
+    Vladimir: '#ffffe0',
+    Estragon: '#e0ffff'
+  });
+
+  const participants = [...new Set(messages.map(msg => msg.sender))];
+
+  const updateLikeStatus = (messageId, newLikedStatus) => {
+    setMessages(messages.map(message => {
+      if (message.id === messageId) {
+        return { ...message, liked: newLikedStatus };
+      }
+      return message;
+    }));
+  };
+
+  const handleColorChange = (user, newColor) => {
+    setColors(prevColors => ({
+      ...prevColors,
+      [user]: newColor
+    }));
+  };
+
+  const totalLikes = messages.filter(message => message.liked).length;
+
   return (
     <div id="App">
       <header>
-        <h1>Application title</h1>
+        <h1>Chat between {participants.join(' and ')}</h1>
+        <p>{totalLikes} ❤️s</p>
+        <div className="color-controls">
+          {participants.map(user => (
+            <ColorChoice
+              key={user}
+              user={user}
+              currentColor={colors[user]}
+              onColorChange={handleColorChange}
+            />
+          ))}
+        </div>
       </header>
       <main>
-        {/* Wave 01: Render one ChatEntry component
-        Wave 02: Render ChatLog component */}
+        <ChatLog 
+          entries={messages} 
+          onUpdateLike={updateLikeStatus}
+          colors={colors} 
+        />
       </main>
     </div>
   );
 };
 
-export default App;
+export default App;
\ No newline at end of file
diff --git a/src/components/ChatEntry.jsx b/src/components/ChatEntry.jsx
index 15c56f96b..c888b2cb9 100644
--- a/src/components/ChatEntry.jsx
+++ b/src/components/ChatEntry.jsx
@@ -1,20 +1,37 @@
 import './ChatEntry.css';
+import TimeStamp from './TimeStamp.jsx';
+import PropTypes from 'prop-types';
+
+const ChatEntry = ({ id, sender, body, timeStamp, liked, onUpdateLike, color = undefined }) => {
+  const messagesClass = sender === 'Vladimir' ? 'local' : 'remote';
 
-const ChatEntry = () => {
   return (
-    <div className="chat-entry local">
-      <h2 className="entry-name">Replace with name of 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>
+    <div className={`chat-entry ${messagesClass}`}>
+      <h2 className="entry-name">{sender}</h2>
+      <section 
+        className="entry-bubble"
+        style={color ? { backgroundColor: color } : {}}
+      >
+        <p>{body}</p>
+        <p className="entry-time">
+          <TimeStamp time={timeStamp} />
+        </p>
+        <button onClick={() => onUpdateLike(id, !liked)} className="like">
+          {liked ? '❤️' : '🤍'}
+        </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,
+  onUpdateLike: PropTypes.func.isRequired,
+  color: PropTypes.string
 };
 
-export default ChatEntry;
+export default ChatEntry;
\ No newline at end of file
diff --git a/src/components/ChatEntry.test.jsx b/src/components/ChatEntry.test.jsx
index 85eff9256..4508b236b 100644
--- a/src/components/ChatEntry.test.jsx
+++ b/src/components/ChatEntry.test.jsx
@@ -3,6 +3,7 @@ import { render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
 
 describe('Wave 01: ChatEntry', () => {
+  const mockOnUpdateLike = () => { };
   beforeEach(() => {
     render(
       <ChatEntry
@@ -11,6 +12,7 @@ describe('Wave 01: ChatEntry', () => {
         body="Get out by 8am.  I'll count the silverware"
         timeStamp="2018-05-18T22:12:03Z"
         liked={false}
+        onUpdateLike={mockOnUpdateLike}
       />
     );
   });
diff --git a/src/components/ChatLog.jsx b/src/components/ChatLog.jsx
new file mode 100644
index 000000000..a32cda768
--- /dev/null
+++ b/src/components/ChatLog.jsx
@@ -0,0 +1,38 @@
+import './ChatLog.css';
+import ChatEntry from './ChatEntry';
+import PropTypes from 'prop-types';
+
+const ChatLog = ({ entries, onUpdateLike, colors = {} }) => {
+  return (
+    <div className="chat-log">
+      {entries.map((message) => (
+        <ChatEntry
+          key={message.id}
+          id={message.id}
+          sender={message.sender}
+          body={message.body}
+          timeStamp={message.timeStamp}
+          liked={message.liked}
+          onUpdateLike={onUpdateLike}
+          color={colors?.[message.sender]}
+        />
+      ))}
+    </div>
+  );
+};
+
+ChatLog.propTypes = {
+  entries: PropTypes.arrayOf(
+    PropTypes.shape({
+      id: PropTypes.number,
+      sender: PropTypes.string.isRequired,
+      body: PropTypes.string.isRequired,
+      timeStamp: PropTypes.string.isRequired,
+      liked: PropTypes.bool.isRequired
+    })
+  ).isRequired,
+  onUpdateLike: PropTypes.func.isRequired,
+  colors: PropTypes.objectOf(PropTypes.string)
+};
+
+export default ChatLog;
\ No newline at end of file
diff --git a/src/components/ChatLog.test.jsx b/src/components/ChatLog.test.jsx
index dfcfeda99..626d9294c 100644
--- a/src/components/ChatLog.test.jsx
+++ b/src/components/ChatLog.test.jsx
@@ -41,8 +41,10 @@ const LOG = [
 ];
 
 describe('Wave 02: ChatLog', () => {
+  const mockOnUpdateLike = () => { };
+  
   beforeEach(() => {
-    render(<ChatLog entries={LOG} />);
+    render(<ChatLog entries={LOG} onUpdateLike={mockOnUpdateLike} />);
   });
 
   test('renders without crashing and shows all the names', () => {
@@ -66,7 +68,7 @@ describe('Wave 02: ChatLog', () => {
   });
 
   test('renders an empty list without crashing', () => {
-    const element = render(<ChatLog entries={[]} />);
+    const element = render(<ChatLog entries={[]} onUpdateLike={mockOnUpdateLike} />);
     expect(element).not.toBeNull();
   });
 });
diff --git a/src/components/ColorChoice.jsx b/src/components/ColorChoice.jsx
new file mode 100644
index 000000000..708c586f7
--- /dev/null
+++ b/src/components/ColorChoice.jsx
@@ -0,0 +1,23 @@
+import PropTypes from 'prop-types';
+
+const ColorChoice = ({ user, currentColor, onColorChange }) => {
+  return (
+    <div className="color-choice">
+      <label htmlFor={`color-${user}`}>{user}'s messages: </label>
+      <input 
+        type="color" 
+        id={`color-${user}`}
+        value={currentColor}
+        onChange={(e) => onColorChange(user, e.target.value)}
+      />
+    </div>
+  );
+};
+
+ColorChoice.propTypes = {
+  user: PropTypes.string.isRequired,
+  currentColor: PropTypes.string.isRequired,
+  onColorChange: PropTypes.func.isRequired
+};
+
+export default ColorChoice;
\ No newline at end of file