diff --git a/searchform.php b/searchform.php
deleted file mode 100644
index 7730a0b..0000000
--- a/searchform.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/**
- * The template for displaying search forms in superhero
- *
- * @package Superhero
- * @since Superhero 1.0
- */
-?>
-<form method="get" id="searchform" action="<?php echo esc_url( home_url( '/' ) ); ?>" role="search">
-	<label for="s" class="assistive-text"><?php _e( 'Search', 'superhero' ); ?></label>
-	<input type="text" class="field" name="s" value="<?php echo esc_attr( get_search_query() ); ?>" id="s" placeholder="<?php esc_attr_e( 'Search &hellip;', 'superhero' ); ?>" />
-	<input type="submit" class="submit" name="submit" id="searchsubmit" value="Go!" />
-</form>
diff --git a/sidebar.php b/sidebar.php
new file mode 100644
index 0000000..3082435
--- /dev/null
+++ b/sidebar.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * The Sidebar containing the main widget areas.
+ *
+ * @package Superhero
+ * @since Superhero 1.0
+ */
+?>
+<div id="secondary" class="widget-area" role="complementary">
+	<?php do_action( 'before_sidebar' ); ?>
+	<?php if ( ! dynamic_sidebar( 'sidebar-1' ) ) : ?>
+
+		<aside id="search" class="widget widget_search">
+			<?php get_search_form(); ?>
+		</aside>
+
+		<aside id="archives" class="widget">
+			<h1 class="widget-title"><?php _e( 'Archives', 'superhero' ); ?></h1>
+			<ul>
+				<?php wp_get_archives( array( 'type' => 'monthly' ) ); ?>
+			</ul>
+		</aside>
+
+	<?php endif; // end sidebar widget area ?>
+</div><!-- #secondary .widget-area -->