diff --git a/src/App.js b/src/App.js
index 76d86d2..4727fba 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,19 +1,17 @@
 import React from 'react';
-import logo from './logo.svg';
 import './App.css';
 import timelineData from './data/timeline.json';
 import Timeline from './components/Timeline';
 
 function App() {
-  console.log(timelineData);
 
-  // Customize the code below
   return (
     <div className="App">
       <header className="App-header">
-        <h1 className="App-title">Application title</h1>
+        <h1 className="App-title">Ada Lovelace's Social Media Feed</h1> 
       </header>
       <main className="App-main">
+        <Timeline events={timelineData.events} />
       </main>
     </div>
   );
diff --git a/src/components/Timeline.js b/src/components/Timeline.js
index 463eb3e..fb4b4b9 100644
--- a/src/components/Timeline.js
+++ b/src/components/Timeline.js
@@ -2,9 +2,13 @@ import React from 'react';
 import './Timeline.css';
 import TimelineEvent from './TimelineEvent';
 
-const Timeline = () => {
-  
-  return;
+const Timeline = (props) => {
+  const allEvents = props.events.map((event, index) => {
+    return (
+      <TimelineEvent key={index} person={event.person} status={event.status} timeStamp={event.timeStamp} />
+    );
+  });
+  return allEvents;
 }
 
 export default Timeline;
\ No newline at end of file
diff --git a/src/components/TimelineEvent.css b/src/components/TimelineEvent.css
index ea6407a..8761587 100644
--- a/src/components/TimelineEvent.css
+++ b/src/components/TimelineEvent.css
@@ -12,12 +12,14 @@
 
 .event-person {
   grid-area: 1 / 1 / span 1 / span 1;
-  margin-top: 0.5rem;
+  margin-top: 0.6rem;
   font-weight: bolder;
 }
 
 .event-status {
+  word-wrap: break-word;
   grid-area: 2 / 1 / span 1 / -1;
+  max-width: 500px;
 }
 
 .event-time {
diff --git a/src/components/TimelineEvent.js b/src/components/TimelineEvent.js
index cc476c2..dc201c1 100644
--- a/src/components/TimelineEvent.js
+++ b/src/components/TimelineEvent.js
@@ -2,9 +2,16 @@ import React from 'react';
 import './TimelineEvent.css';
 import Timestamp from './Timestamp';
 
-const TimelineEvent = () => {
+const TimelineEvent = (props) => {
   
-  return;
+  return (
+    <div className="timeline-event">
+      <h2 className="event-person">{props.person}</h2>
+      <p className="event-status">{props.status}</p>
+      <time className="event-timestamp"><Timestamp time={props.timeStamp} /></time>
+    </div>
+  );
+
 }
 
 export default TimelineEvent;
\ No newline at end of file