diff --git a/src/App.js b/src/App.js
index 76d86d2..0e2f880 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,19 +1,19 @@
 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);
 
+function App() {
+  console.log(timelineData.events);
   // Customize the code below
   return (
     <div className="App">
       <header className="App-header">
-        <h1 className="App-title">Application title</h1>
+        <h1 className="App-title">{timelineData.person}'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..94b2abe 100644
--- a/src/components/Timeline.js
+++ b/src/components/Timeline.js
@@ -2,9 +2,23 @@ import React from 'react';
 import './Timeline.css';
 import TimelineEvent from './TimelineEvent';
 
-const Timeline = () => {
-  
-  return;
-}
 
-export default Timeline;
\ No newline at end of file
+
+const Timeline = (props) => {
+  const events = props.events.map((event, i) => {
+    return (
+      <div key={i}>
+        <TimelineEvent person={event.person} status={event.status} time={event.timeStamp}/>
+      </div>
+    );
+  });
+
+  return (
+    <div className="timeline">{events}</div>
+  );
+};
+
+//cd desktop/ada/projects/react-timeline/src
+export default Timeline;
+
+
diff --git a/src/components/TimelineEvent.js b/src/components/TimelineEvent.js
index cc476c2..6d5f3c7 100644
--- a/src/components/TimelineEvent.js
+++ b/src/components/TimelineEvent.js
@@ -2,9 +2,15 @@ import React from 'react';
 import './TimelineEvent.css';
 import Timestamp from './Timestamp';
 
-const TimelineEvent = () => {
-  
-  return;
-}
+const TimelineEvent = (props) => {
+  return (
+  <div className="timeline-event">
+    <h2 className="event-person">{props.person}</h2>
+    <p className="event-status">{props.status}</p>
+      {/*Kaida helped fix the time={props.time} duirng roundtable*/}
+    <p className="event-time"> <Timestamp time={props.Timestamp}/></p>
+  </div>
+  );
+};
 
-export default TimelineEvent;
\ No newline at end of file
+export default TimelineEvent; 
\ No newline at end of file