diff --git a/content.php b/content.php
new file mode 100644
index 0000000..d09d551
--- /dev/null
+++ b/content.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * @package cs
+ */
+?>
+
+<article id="post-<?php the_ID(); ?>" <?php post_class('clearfix'); ?>>
+	<header class="entry-header">
+			<?php
+            if(strlen(get_the_content()) > 0){
+                the_title( sprintf( '<h1 class="entry-title"><a href="%s" rel="bookmark">', esc_url( get_permalink() ) ), '</a></h1>' );
+            }
+			else{
+				the_title( sprintf( '<h1 class="entry-title">', esc_url( get_permalink() ) ), '</h1>' );
+			}
+			?>
+
+		<?php if ( 'post' == get_post_type() ) : ?>
+		<div class="entry-meta">
+			<?php cs_posted_on(); ?>
+		</div><!-- .entry-meta -->
+		<?php endif; ?>
+	</header><!-- .entry-header -->
+
+	<div class="entry-content">
+		<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'cs' ) ); ?>
+		<?php
+			wp_link_pages( array(
+				'before' => '<div class="page-links">' . __( 'Pages:', 'cs' ),
+				'after'  => '</div>',
+			) );
+		?>
+	</div><!-- .entry-content -->
+
+	<footer class="entry-footer">
+		<?php if ( 'post' == get_post_type() ) : // Hide category and tag text for pages on Search ?>
+			<?php
+				/* translators: used between list items, there is a space after the comma */
+				$categories_list = get_the_category_list( __( ', ', 'cs' ) );
+				if ( $categories_list && cs_categorized_blog() ) :
+			?>
+			<span class="cat-links">
+				<?php printf( __( 'Posted in %1$s', 'cs' ), $categories_list ); ?>
+			</span>
+			<?php endif; // End if categories ?>
+
+			<?php
+				/* translators: used between list items, there is a space after the comma */
+				$tags_list = get_the_tag_list( '', __( ', ', 'cs' ) );
+				if ( $tags_list ) :
+			?>
+			<span class="tags-links">
+				<?php printf( __( 'Tagged %1$s', 'cs' ), $tags_list ); ?>
+			</span>
+			<?php endif; // End if $tags_list ?>
+		<?php endif; // End if 'post' == get_post_type() ?>
+
+		<?php if ( ! post_password_required() && ( comments_open() || '0' != get_comments_number() ) ) : ?>
+		<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'cs' ), __( '1 Comment', 'cs' ), __( '% Comments', 'cs' ) ); ?></span>
+		<?php endif; ?>
+
+		<?php edit_post_link( __( 'Edit', 'cs' ), '<span class="edit-link">', '</span>' ); ?>
+	</footer><!-- .entry-footer -->
+</article><!-- #post-## -->
\ No newline at end of file
diff --git a/search.php b/search.php
new file mode 100644
index 0000000..f103f8d
--- /dev/null
+++ b/search.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * The template for displaying Search Results pages.
+ *
+ * @package cornerstone
+ */
+
+get_header(); ?>
+<div id="page-search">
+	<div class="row">
+		<div class="col-md-9">
+			<section id="primary" class="content-area">
+				<main id="main" class="site-main" role="main">
+
+				<?php if ( have_posts() ) : ?>
+
+					<header class="entry-header">
+						<h1 class="page-title"><?php printf( __( 'Search Results for: %s', 'cs' ), '<span>' . get_search_query() . '</span>' ); ?></h1>
+					</header><!-- .page-header -->
+
+					<?php /* Start the Loop */ ?>
+					<?php while ( have_posts() ) : the_post();?>
+						<?php
+							$url = get_field('external_url');
+							if( !empty($url) ){
+								$url = '<a href="'.$url.'" target="_blank">';
+							}elseif(strlen(get_the_content()) > 0){
+								$url = '<a href="'.get_permalink().'">';
+							}
+						?>
+
+						<h3><?php echo $url; ?><?php the_title();?></h3>
+                        <?php if(strlen(get_the_content()) > 0 || !empty($url)) echo '</a>'; ?>
+
+						<?php  the_excerpt(); ?>	<!-- e.g. "All about jellyfish" -->
+
+					<?php endwhile; ?>
+
+					<?php cs_paging_nav(); ?>
+
+				<?php else : ?>
+
+					<?php get_template_part( 'content', 'none' ); ?>
+
+				<?php endif; ?>
+
+				</main><!-- #main -->
+			</section><!-- #primary -->
+		</div>
+		<?php get_sidebar(); ?>
+	</div>
+</div>
+<?php get_footer(); ?>