diff --git a/src/App.js b/src/App.js
index 5f4cdf8..e707683 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,20 +1,22 @@
 import React, { Component } from 'react';
 import './App.css';
 import timelineData from './data/timeline.json';
-
 import Timeline from './components/Timeline';
 
+const postEvents = () => {
+  return <Timeline events={timelineData["events"]} />
+};
+
 class App extends Component {
   render() {
-    console.log(timelineData);
-
-    // Customize the code below
+   
     return (
       <div className="App">
         <header className="App-header">
           <h1 className="App-title">Application title</h1>
         </header>
         <main className="App-main">
+          { postEvents() }
         </main>
       </div>
     );
diff --git a/src/components/Timeline.js b/src/components/Timeline.js
index 624d4ec..8bea634 100644
--- a/src/components/Timeline.js
+++ b/src/components/Timeline.js
@@ -2,9 +2,20 @@ import React from 'react';
 import './Timeline.css';
 import TimelineEvent from './TimelineEvent';
 
-const Timeline = () => {
-  // Fill in your code here
-  return;
-}
+const postData = (events) => {
+  return events.map((post) => {
+    return (
+      <TimelineEvent person={ post.person } status={ post.status } timestamp={ post.timeStamp } />
+      )
+    })
+  }
+    const Timeline = (props) => {
+    return (
+      <section>
+        { postData(props.events) }
+      </section>
+    )
+  }
 
 export default Timeline;
+/* <p>key={i}</p> */
\ No newline at end of file
diff --git a/src/components/TimelineEvent.js b/src/components/TimelineEvent.js
index 9079165..6f37d26 100644
--- a/src/components/TimelineEvent.js
+++ b/src/components/TimelineEvent.js
@@ -2,9 +2,24 @@ import React from 'react';
 import './TimelineEvent.css';
 import Timestamp from './Timestamp';
 
-const TimelineEvent = () => {
-  // Fill in your code here
-  return;
+const postTimestamp = (props) => {
+  return <Timestamp time={props} />
 }
 
-export default TimelineEvent;
+const TimelineEvent = (props) => {
+  return(
+    <section>
+      <h3>
+        Person: {props.person}
+      </h3>
+      <p>
+        Status: {props.status}
+      </p>
+      <p>
+        Timestamp: { postTimestamp(props.timestamp) }
+      </p>
+    </section>
+  ) 
+}
+
+export default TimelineEvent;
\ No newline at end of file
diff --git a/src/components/Timestamp.js b/src/components/Timestamp.js
index 9a39231..a2d378e 100644
--- a/src/components/Timestamp.js
+++ b/src/components/Timestamp.js
@@ -1,5 +1,6 @@
 import React from 'react';
 import moment from 'moment';
+import './TimelineEvent.js';
 
 const Timestamp = (props) => {
   const time = moment(props.time);