diff --git a/src/App.js b/src/App.js
index 76d86d2..1a7af2d 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,9 +1,10 @@
 import React from 'react';
-import logo from './logo.svg';
+// import logo from './logo.svg';
 import './App.css';
 import timelineData from './data/timeline.json';
 import Timeline from './components/Timeline';
 
+
 function App() {
   console.log(timelineData);
 
@@ -14,6 +15,7 @@ function App() {
         <h1 className="App-title">Application title</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..d7e238a 100644
--- a/src/components/Timeline.js
+++ b/src/components/Timeline.js
@@ -2,9 +2,22 @@ import React from 'react';
 import './Timeline.css';
 import TimelineEvent from './TimelineEvent';
 
-const Timeline = () => {
+const Timeline = (props) => {
+  const Timelinecomponents = props.events.map((event) =>{
+    return(
+      <TimelineEvent 
+      key={event.timeStamp}
+      person={event.person} 
+      status={event.status} 
+      timeStamp={event.timeStamp}/>
+    );
+  });
   
-  return;
+  return(
+    <ul className="event-collection timeline">
+    {Timelinecomponents}
+  </ul>
+  )
 }
 
 export default Timeline;
\ No newline at end of file
diff --git a/src/components/TimelineEvent.js b/src/components/TimelineEvent.js
index cc476c2..c755b58 100644
--- a/src/components/TimelineEvent.js
+++ b/src/components/TimelineEvent.js
@@ -2,9 +2,21 @@ import React from 'react';
 import './TimelineEvent.css';
 import Timestamp from './Timestamp';
 
-const TimelineEvent = () => {
-  
-  return;
+
+const TimelineEvent = (props) => {
+  const person = props.person
+  const status = props.status
+  const timestamp = props.timestamp
+
+  return (
+    <div className="timeline-event">
+      <h3 className='event-person' >{person}</h3>
+      <p className='event-status'>{status}</p>
+      <Timestamp className='event-time' time={timestamp} />
+    </div>
+  )
 }
 
-export default TimelineEvent;
\ No newline at end of file
+export default TimelineEvent;
+
+