diff --git a/wp-content/themes/aerospace/archive-data.php b/wp-content/themes/aerospace/archive-data.php
index bac064d..aa3227d 100755
--- a/wp-content/themes/aerospace/archive-data.php
+++ b/wp-content/themes/aerospace/archive-data.php
@@ -7,6 +7,13 @@
  * @package Aerospace
  */
 
+$args = array(
+	'post_type' => 'data',
+	'posts_per_page' => -1
+);
+
+$result = new WP_Query($args);
+
 if ( get_archive_top_content() ) {
     $description = get_archive_top_content();
 } else {
@@ -23,56 +30,71 @@
 get_header(); ?>
 
 <div id="primary" class="content-area">
-  <main id="main" class="site-main content-wrapper">
-    <header class="page-header row">
-      <div class="title-container">
-      <?php the_archive_title('<h1 class="page-title">', '</h1>'); ?>
-      <div class="archive-description row">
+	<main id="main" class="site-main content-wrapper">
+		<header class="page-header row">
+			<div class="title-container">
+			<?php the_archive_title('<h1 class="page-title">', '</h1>'); ?>
+			<div class="archive-description row">
                 <?php echo $description_extra; ?>
                 <?php echo $description; ?>
             </div>
-      <div class="archive-pages-top row">
-        <?php if (have_posts() ) : ?>
-          <div class="col-xs-12 col-sm archives-meta-left">
-            <?php aerospace_post_num(); ?>
-          </div>
+			<div class="archive-pages-top row">
+				<?php if ( have_posts() ) : ?>
+					<div class="col-xs-12 col-sm archives-meta-left">
+					</div>
+					<div class="col-xs-12 col-sm-6 archives-meta-right">
+						<div class="sort-filter">
+							<span class="meta-label">Sort By:</span>
+							<button class="btn-sort tableSort active" data-sortCol="2" aria-label="Sort by Date">Date</button>
+							<span class="sort-filter-divider">|</span>
+							<button class="btn-sort tableSort" data-sortCol="1" aria-label="Sort by Title">Title</button>
+						</div>
+					</div>
+				<?php endif; ?>
+			</div>
+		</header><!-- .page-header -->
+		<section class="archive-content row">
+			<?php  if ( $result->have_posts() ) : ?>
+			<div class="col-xs-12 col-md-3 filter-sidebar">
+				<?php get_template_part( 'components/filters-data'); ?>
+			</div>
+			<div class="col-xs-12 col-md-9">
 
-        <?php endif; ?>
-      </div>
-    </header><!-- .page-header -->
-    <section class="archive-content row temp-data-archive">
-      <?php if (have_posts() ) : ?>
+				<table id="dataRepo" class="cards is-hidden">
+					<thead>
+						<tr>
+							<th>Display</th>
+							<th>Title</th>
+							<th>Last Updated</th>
+							<th>category</th>
+							<th>Tag</th>
+						</tr>
+					</thead>
+					<tbody>
+						<?php
+						/* Start the Loop */
+						while ($result->have_posts()) : $result->the_post();
+							get_template_part( 'template-parts/content-data' );
+						endwhile;
+						?>
+					</tbody>
+				</table>
+			</div>
+			<?php
+			else :
+			get_template_part( 'template-parts/content', 'none' );
 
-        <table class="cards is-hidden">
-          <tbody>
-            <?php
-            /* Start the Loop */
-            while ( have_posts() ) : the_post();
-              get_template_part( 'template-parts/content-data' );
-            endwhile;
-            ?>
-          </tbody>
-        </table>
-      <?php
-      else :
-      get_template_part( 'template-parts/content', 'none' );
-
-      endif; ?>
-    </section>
-    <?php if (have_posts() ) : ?>
-    <footer class="archive-pages-bottom row">
-            <div class="col-xs-12 col-sm archives-meta-left"><?php aerospace_post_num(); ?></div>
-            <div class="col-xs-12 col-sm-6 archives-meta-right">
-                <?php the_posts_pagination( array(
-                    'prev_text' => '<i class="icon-arrow-left"></i>',
-                    'next_text' => '<i class="icon-arrow-right"></i>',
-                )); ?>
-        </div>
-      </footer>
+			endif; ?>
+		</section>
+		<?php if (have_posts() ) : ?>
+		<footer class="archive-pages-bottom row">
+               
+    	</footer>
     <?php endif; ?>
-  </main><!-- #main -->
+	</main><!-- #main -->
 </div><!-- #primary -->
 
 <?php
+wp_enqueue_script('aerospace-datatables', '//cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js', array(), '20171128', true );
+wp_enqueue_script('aerospace-datarepo', get_template_directory_uri() . '/js/data-repo.js', array(), '20171128', true );
 get_footer();
-