diff --git a/src/api/index.php b/src/api/index.php
index 11d3c65..3dc5b71 100644
--- a/src/api/index.php
+++ b/src/api/index.php
@@ -7,17 +7,31 @@ use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Slim\Factory\AppFactory;
 
-require "routes.php";
-require "./vendor/autoload.php";
+//require “routes.php”;
+require “../vendor/autoload.php”;
+include "timelineData.php"; 
 
 // Start slim
 $app = AppFactory::create();
 // create middleware
 $app->addRoutingMiddleware();
 
-$errorMiddleware = $app->addErrorMiddleware(false, true, true);
+// for error checking
+$errorMiddleware = $app->addErrorMiddleware(true, true, true);
 
-$app->get("/timelineData", function (Request $request, Response $response)
+$app->setBasePath(“/api”);
+
+$timelineData = new TimelineData();
+
+$app->get(“/timelineData”, function (Request $request, Response $response)
 {
-
+    $result = $timelineData->getTimelineData();
+    
+    $json = json_encode($result);
+    
+    $response->getBody()->write($json);
+    
+    return $response->withHeader("Content-Type", "application/json");
 });
+
+$app->run();1q
diff --git a/src/api/timelineData.php b/src/api/timelineData.php
index 1df8746..60eb74d 100644
--- a/src/api/timelineData.php
+++ b/src/api/timelineData.php
@@ -1,7 +1,25 @@
 <?php
-
+require_once "./confjg.php"
 
 class TimelineData
 {
+    function getTimelineData()
+    {
+        $conn = dbConn();
+        $stmt = $conn->prepare("SELECT * FROM timeline;"); 
+        $stmt->execute();
 
+        // set the resulting array to associative
+        $result = $stmt->fetchAll(PDO::FETCH_ASSOC);
+        
+        if ($result)
+        {
+            return $result;
+        }
+        else 
+        {
+            return array("errorMessage" => "Error timeline data not found");
+        }
+          
+    }
 }
\ No newline at end of file