diff --git a/add_client_contact_modal.php b/add_client_contact_modal.php
new file mode 100644
index 00000000..362f7d82
--- /dev/null
+++ b/add_client_contact_modal.php
@@ -0,0 +1,58 @@
+<div class="modal fade" id="addClientContactModal" tabindex="-1">
+  <div class="modal-dialog modal-lg">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fa fa-user-plus"></i> New Contact</h5>
+        <button type="button" class="close" data-dismiss="modal">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <form action="post.php" method="post" autocomplete="off">
+        <div class="modal-body">
+          <div class="form-group">
+            <label>Name</label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-user"></i></span>
+              </div>
+              <input type="text" class="form-control" name="name" placeholder="Full Name" required>
+            </div>
+          </div>
+          <div class="form-group">
+            <label>Title</label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-id-badge"></i></span>
+              </div>
+              <input type="text" class="form-control" name="title" placeholder="Title" required>
+            </div>
+          </div>
+          <div class="form-row">
+            <div class="form-group col-sm">
+              <label>Phone</label>
+              <div class="input-group">
+                <div class="input-group-prepend">
+                  <span class="input-group-text"><i class="fa fa-phone"></i></span>
+                </div>
+                <input type="text" class="form-control" name="phone" placeholder="Phone Number" data-inputmask="'mask': '999-999-9999'" required> 
+              </div>
+            </div>
+            <div class="form-group col-sm">
+              <label>Email</label>
+              <div class="input-group">
+                <div class="input-group-prepend">
+                  <span class="input-group-text"><i class="fa fa-envelope"></i></span>
+                </div>
+                <input type="email" class="form-control" name="email" placeholder="Email Address" required>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_client" class="btn btn-primary">Save</button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/client.php b/client.php
new file mode 100644
index 00000000..4d53bf85
--- /dev/null
+++ b/client.php
@@ -0,0 +1,103 @@
+<?php include("header.php"); ?>
+
+<?php 
+
+if(isset($_GET['client_id'])){
+  $client_id = intval($_GET['client_id']);
+
+  $sql = mysqli_query($mysqli,"SELECT * FROM clients WHERE client_id = $client_id");
+
+  $row = mysqli_fetch_array($sql);
+  $client_name = $row['client_name'];
+  $client_address = $row['client_address'];
+  $client_city = $row['client_city'];
+  $client_state = $row['client_state'];
+  $client_zip = $row['client_zip'];
+  $client_email = $row['client_email'];
+  $client_phone = $row['client_phone'];
+  if(strlen($client_phone)>2){ 
+    $client_phone = substr($row['client_phone'],0,3)."-".substr($row['client_phone'],3,3)."-".substr($row['client_phone'],6,4);
+  }
+  $client_website = $row['client_website'];
+
+?>
+<div class="row">
+  <div class="col-8">
+    <h2><?php echo $client_name; ?></h2>
+  </div>
+  <div class="col-4">
+    <div class="dropdown dropleft text-center">
+      <button class="btn btn-primary btn-sm float-right" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+        <i class="fas fa-ellipsis-h"></i>
+      </button>
+      <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
+        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editinvoiceModal<?php echo $invoice_id; ?>">Edit</a>
+        <a class="dropdown-item" href="#">Delete</a>
+      </div>
+    </div>
+  </div>
+</div>    
+<div class="row">
+  <div class="col-sm-12">
+    <div class="card">
+      <div class="card-header">
+        <ul class="nav nav-pills">
+          <li class="nav-item">
+            <a class="nav-link active" href="?client_id=<?php echo $client_id; ?>&tab=details">Details</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" href="?client_id=<?php echo $client_id; ?>&tab=contacts">Contacts</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" href="#">Locations</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" href="#">Assets</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" href="#">Vendors</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" href="#">Passwords</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" href="#">Invoices</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" href="#">Payments</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" href="#">Quotes</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" href="#">Attachments</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" href="#">Notes</a>
+          </li>
+        </ul>
+      </div>
+
+      <div class="card-body">
+        <?php
+        if(isset($_GET['tab'])){
+          if($_GET['tab'] == "details") {
+            include("client_details.php");
+          }
+          elseif($_GET['tab'] == "contacts") {
+            include("client_contacts.php");
+          }
+        }
+        else{
+          include("client_details.php");
+        }
+     
+        ?>
+      </div>
+    </div>
+  </div>
+</div>
+
+<?php } ?>
+
+<?php include("footer.php");
\ No newline at end of file
diff --git a/client_contacts.php b/client_contacts.php
new file mode 100644
index 00000000..d29136f5
--- /dev/null
+++ b/client_contacts.php
@@ -0,0 +1,55 @@
+<?php $sql = mysqli_query($mysqli,"SELECT * FROM client_contact_contacts ORDER BY client_contact_contact_id DESC"); ?>
+
+<div class="table-responsive">
+  <table class="table table-striped table-borderless table-hover" id="dataTable" width="100%" cellspacing="0">
+    <thead>
+      <tr>
+        <th>Name</th>
+        <th>Title</th>
+        <th>Phone</th>
+        <th>Email</th>
+        <th class="text-center">Actions</th>
+      </tr>
+    </thead>
+    <tbody>
+      <?php
+  
+      while($row = mysqli_fetch_array($sql)){
+        $client_contact_id = $row['client_contact_id'];
+        $client_contact_name = $row['client_contact_name'];
+        $client_contact_title = $row['client_contact_title'];
+        $client_contact_email = $row['client_contact_email'];
+        $client_contact_phone = $row['client_contact_phone'];
+        if(strlen($client_contact_phone)>2){ 
+          $client_contact_phone = substr($row['client_contact_phone'],0,3)."-".substr($row['client_contact_phone'],3,3)."-".substr($row['client_contact_phone'],6,4);
+        }
+  
+      ?>
+      <tr>
+        <td><?php echo "$client_contact_name"; ?></td>
+        <td><?php echo "$client_contact_title"; ?></td>
+        <td><a href="mailto:<?php echo $client_contact_email; ?>"><?php echo "$client_contact_email"; ?></a></td>
+        <td><?php echo "$client_contact_phone"; ?></td>
+        <td>
+          <div class="dropdown dropleft text-center">
+            <button class="btn btn-secondary btn-sm" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              <i class="fas fa-ellipsis-h"></i>
+            </button>
+            <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
+              <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editClientContactModal<?php echo $client_contact_id; ?>">Edit</a>
+              <a class="dropdown-item" href="#">Delete</a>
+            </div>
+          </div>      
+        </td>
+      </tr>
+
+      <?php
+      include("edit_client_contact_modal.php");
+      }
+      ?>
+
+    </tbody>
+  </table>
+</div>
+    
+<?php include("add_client_contact_modal.php"); ?>
\ No newline at end of file
diff --git a/client_details.php b/client_details.php
new file mode 100644
index 00000000..32bcee74
--- /dev/null
+++ b/client_details.php
@@ -0,0 +1,23 @@
+<table class="table">
+  <tr>
+    <td><i class="fa fa-map-marker"></i></td>
+    <td>
+      <a href="https://maps.google.com?q=<?php echo "$client_address $client_zip"; ?>" target="_blank">
+        <?php echo $client_address; ?>
+        <br>
+        <?php echo "$client_city $client_state $client_zip"; ?>
+      </a>
+    </td>
+  <tr>
+    <td><i class="fa fa-phone"></i></td>
+    <td><?php echo $client_phone; ?></td>
+  </tr>
+  <tr>      
+    <td><i class="fa fa-envelope"></i></td>
+    <td><a href="mailto:<?php echo $client_email; ?>"><?php echo $client_email; ?></a></td>
+  </tr>
+  <tr> 
+    <td><i class="fa fa-globe"></i></td>
+    <td><a href="http://<?php echo $client_website; ?>"><?php echo $client_website; ?></a></td>
+  </tr>
+</table>
\ No newline at end of file
diff --git a/client_footer.php b/client_footer.php
new file mode 100644
index 00000000..8d331783
--- /dev/null
+++ b/client_footer.php
@@ -0,0 +1,8 @@
+		</div>
+    </div>
+  </div>
+</div>
+
+<?php } ?>
+
+<?php include("footer.php");
\ No newline at end of file
diff --git a/client_header.php b/client_header.php
new file mode 100644
index 00000000..8b3bcebe
--- /dev/null
+++ b/client_header.php
@@ -0,0 +1,81 @@
+<?php include("header.php"); ?>
+
+<?php 
+
+if(isset($_GET['client_id'])){
+  $client_id = intval($_GET['client_id']);
+
+  $sql = mysqli_query($mysqli,"SELECT * FROM clients WHERE client_id = $client_id");
+
+  $row = mysqli_fetch_array($sql);
+  $client_name = $row['client_name'];
+  $client_address = $row['client_address'];
+  $client_city = $row['client_city'];
+  $client_state = $row['client_state'];
+  $client_zip = $row['client_zip'];
+  $client_email = $row['client_email'];
+  $client_phone = $row['client_phone'];
+  if(strlen($client_phone)>2){ 
+    $client_phone = substr($row['client_phone'],0,3)."-".substr($row['client_phone'],3,3)."-".substr($row['client_phone'],6,4);
+  }
+  $client_website = $row['client_website'];
+
+?>
+<div class="row">
+  <div class="col-md-11">
+    <h3><?php echo $client_name; ?></h3>
+  </div>
+  <div class="col-md-1">
+    <div class="dropdown dropleft text-center">
+      <button class="btn btn-primary btn-sm float-right" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+        <i class="fas fa-ellipsis-h"></i>
+      </button>
+      <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
+        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editinvoiceModal<?php echo $invoice_id; ?>">Edit</a>
+        <a class="dropdown-item" href="#">Delete</a>
+      </div>
+    </div>
+  </div>
+</div>    
+<div class="row mb-3">
+  <div class="col-sm-12">
+    <div class="card">
+      <div class="card-header">
+        <ul class="nav nav-pills">
+          <li class="nav-item">
+            <a class="nav-link active" href="?tab=contacts">Details</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" href="?tab=contacts">Contacts</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" href="#">Locations</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" href="#">Assets</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" href="#">Vendors</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" href="#">Passwords</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" href="#">Invoices</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" href="#">Payments</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" href="#">Quotes</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" href="#">Attachments</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" href="#">Notes</a>
+          </li>
+        </ul>
+      </div>
+
+      <div class="card-body">
\ No newline at end of file