diff --git a/Wello/www/details-content.php b/Wello/www/details-content.php
index bb6b97f..a07ba4b 100644
--- a/Wello/www/details-content.php
+++ b/Wello/www/details-content.php
@@ -64,18 +64,14 @@
 
             <li>
                 <h3>Address</h3>
-                <p id="address">STILLTODO</p>
-            </li>
-
-            <li>
-                <h3>Town</h3>
-                <p id="town">STILLTODO</p>
+                <p id="address">
+                    <?php
+                //Should add ternary operator for nulls and blanks
+                echo'<p id="name">'.$row['Owner_Address'].'</p>';
+                ?>
+                </p>
             </li>
 
-            <li>
-                <h3 >Zip code</h3>
-                <p id="zip-code" class="med-num">STILLTODO</p>
-            </li>
         </ul>
 </div>
 <div class="group">
@@ -105,7 +101,12 @@
 
             <li>
                 <h3>Lot number</h3>
-                <p id="lot-number" class="med-num">STILLTODO</p>
+                <p id="lot-number" class="med-num">
+                    <?php
+                    //Should add ternary operator for nulls and blanks
+                    echo $row['Well_Lot_Number'];
+                    ?>
+                </p>
             </li>
 
             <li id="get-gps-local">
@@ -129,12 +130,22 @@
 
             <li>
                 <h3 >Location relative to three permanent landmarks</h3>
-                <p id="relative-location">STILLTODO</p>
+                <p id="relative-location">
+                    <?php
+                    //Should add ternary operator for nulls and blanks
+                    echo $row['Relative_Location'];
+                    ?>
+               </p>
             </li>
 
             <li>
                 <h3>Use</h3>
-                <p id="other-use-case">STILLTODO</p>
+                <p id="other-use-case">
+                    <?php
+                    //Should add ternary operator for nulls and blanks
+                    echo $row['Proposed_Use'];
+                    ?>
+               </p>
             </li>
 
             <li>
@@ -153,16 +164,31 @@
         <ul class="inputs" id="casing-details">
             <li>
                 <h3>Length</h3>
-                <p  id="length">STILLTODO</p>
+                <p  id="length">
+                    <?php
+                    //Should add ternary operator for nulls and blanks
+                    echo $row['Casing_Length_Feet'];
+                    ?>
+               </p>
             </li>
             <li>
                 <h3>Diameter</h3>
-                <p  id="diameter">STILLTODO</p>
+                <p  id="diameter">
+                    <?php
+                    //Should add ternary operator for nulls and blanks
+                    echo $row['Casing_Diamiter_Inches'];
+                    ?>
+               </p>
             </li>
 
             <li>
                 <h3>Weight per foot</h3>
-                <p  id="weight">STILLTODO</p>
+                <p  id="weight">
+                    <?php
+                    //Should add ternary operator for nulls and blanks
+                    echo $row['Casing_Weight_Per_Foot_Pounds'];
+                    ?>
+               </p>
             </li>
 
             <li>
diff --git a/Wello/www/details.php b/Wello/www/details.php
index 9c13fd3..1fd60b3 100644
--- a/Wello/www/details.php
+++ b/Wello/www/details.php
@@ -10,12 +10,28 @@
     $Well_ID = "0";
 }
 
-$query = "SELECT Date_Well_Completed, Date_of_Report, Registration_Number, State_Well_No, Other_No, 
-            CONCAT(Owner_First_Name, ' ', Owner_Last_Name) AS 'Owner_Name',
-            CONCAT(Well_Street_Number, ' ', Well_Street_Name) AS 'WellAddress', Well_Town, Well_Latitude, Well_Longitude, 
-            Drilling_Equipment, Depth_To_Top_Of_Gravel_Pack, Depth_To_Bottom_Of_Gravel_Pack
-            FROM well_completion_report
-            WHERE Permit_Number = $Well_ID";
+$query = "SELECT 
+    Date_Well_Completed, 
+    Date_of_Report, 
+    Registration_Number, 
+    State_Well_No, 
+    Other_No, 
+    CONCAT(Owner_First_Name, ' ', Owner_Last_Name) AS 'Owner_Name', 
+    Owner_Address,
+    CONCAT(Well_Street_Number, ' ', Well_Street_Name) AS 'WellAddress', 
+    Well_Town, 
+    Well_Lot_Number,
+    Well_Latitude, 
+    Well_Longitude,
+    Relative_Location, 
+    Proposed_Use, 
+    Drilling_Equipment, 
+    Depth_To_Top_Of_Gravel_Pack, 
+    Depth_To_Bottom_Of_Gravel_Pack
+            
+            
+    FROM well_completion_report
+    WHERE Permit_Number = $Well_ID";
 if ($result = $mysqli->query($query)) {
     $row = $result->fetch_assoc();
 }
@@ -45,7 +61,9 @@
 
     <nav class="top-nav">
         <button><a href="map.php"><img alt="back" src="img/back.svg" ></a></button> <h1>Details</h1>
-        <button><a href="form.php"><img alt="edit" src="img/edit.svg" ></a></button>
+        <?php
+        echo'<button><a href="form.php?Well_ID='.$Well_ID.'"><img alt="edit" src="img/edit.svg" ></a></button>';
+        ?>
     </nav>
 <main class="details">
 
diff --git a/Wello/www/form.php b/Wello/www/form.php
index b422291..a647a84 100644
--- a/Wello/www/form.php
+++ b/Wello/www/form.php
@@ -1,5 +1,6 @@
-<?php
-$mysqli = new mysqli("localhost", "db10e41481317066", "jXLUjNG/cQxm4VJ1SionhDKdcT4BT1Dos7sZMddIapa/8LYDpDNz+3hwGCz8Shon", "db10e41481317066");
+<?php 
+require 'cred.php';
+$mysqli = new mysqli("localhost", $username, $password, $database);
 if ( (isset($_GET['Well_ID']))  && (is_numeric($_GET['Well_ID'])) ) {
 	$Well_ID = $_GET['Well_ID'];
 }
@@ -9,6 +10,16 @@
 else {
     $Well_ID = "0";
 }
+
+$query = "SELECT Date_Well_Completed, Date_of_Report, Registration_Number, State_Well_No, Other_No, 
+            CONCAT(Owner_First_Name, ' ', Owner_Last_Name) AS 'Owner_Name',
+            CONCAT(Well_Street_Number, ' ', Well_Street_Name) AS 'WellAddress', Well_Town, Well_Latitude, Well_Longitude, 
+            Drilling_Equipment, Depth_To_Top_Of_Gravel_Pack, Depth_To_Bottom_Of_Gravel_Pack
+            FROM well_completion_report
+            WHERE Permit_Number = $Well_ID";
+if ($result = $mysqli->query($query)) {
+    $row = $result->fetch_assoc();
+}
 ?>
 <!doctype html>
 <html class="no-js" lang="">