diff --git a/test/widgets/BuyThisPrintWidgetTest.php b/test/widgets/BuyThisPrintWidgetTest.php
new file mode 100644
index 0000000..4da9c11
--- /dev/null
+++ b/test/widgets/BuyThisPrintWidgetTest.php
@@ -0,0 +1,36 @@
+<?php
+
+require_once('PHPUnit/Framework.php');
+require_once('MockPress/mockpress.php');
+require_once(dirname(__FILE__) . '/../../widgets/BuyThisPrintWidget.inc');
+
+class BuyThisPrintWidgetTest extends PHPUnit_Framework_TestCase {
+	function setUp() {
+		_reset_wp();
+		$this->w = new BuyThisPrintWidget('id', 'name', array());
+	}
+
+	function providerTestUpdate() {
+		return array(
+			array(
+				array(), array()
+			),
+			array(
+				array('test' => 'test'), array()
+			),
+			array(
+				array('title' => 'title'), array('title' => 'title')
+			),
+			array(
+				array('title' => "<i>title</i>"), array('title' => 'title')
+			)
+		);
+	}
+
+	/**
+	 * @dataProvider providerTestUpdate
+	 */
+	function testUpdate($input, $expected_output) {
+		$this->assertEquals($expected_output, $this->w->update($input));
+	}
+}
diff --git a/widgets/BuyThisPrintWidget.inc b/widgets/BuyThisPrintWidget.inc
new file mode 100644
index 0000000..39906a7
--- /dev/null
+++ b/widgets/BuyThisPrintWidget.inc
@@ -0,0 +1,60 @@
+<?php
+/*
+Widget Name: Buy Comic Print
+Widget URI: http://comicpress.org/
+Description: Places a button that works with the Buy This template.
+Author: Philip M. Hofer (Frumph)
+Version: 1.01
+Author URI: http://frumph.net/
+
+*/
+
+class BuyThisPrintWidget extends WP_Widget {
+	function BuyThisPrintWidget() {
+		$widget_ops = array('classname' => 'ComicPressBuyThisPrint', 'description' => __('Adds a button that goes to the buy print template page.','comicpress') );
+		$this->WP_Widget('comicpress_buyprint', __('Buy This Print','comicpress'), $widget_ops);
+	}
+
+	function init() {
+		add_filter('comicpress_buy_print_structure', array(&$this, 'buy_print_structure'));
+	}
+
+	function widget($args, $instance) {
+		extract($args, EXTR_SKIP);
+
+		echo $before_widget;
+		$title = apply_filters('widget_title', $instance['title']);
+		if ( !empty( $title ) ) { echo $before_title . $title . $after_title; };
+
+		if ( get_post_meta( get_the_ID(), "buythiscomic", true ) !== 'sold' ) {
+			echo apply_filters('comicpress_buy_print_structure', '');
+		}
+
+		echo $after_widget;
+	}
+
+	function buy_print_structure($content = '') {
+		global $buy_print_url; ?>
+			<div class="buythis"><form method="post" action="<?php echo $buy_print_url; ?>">
+			<input type="hidden" name="comic" value="<?php echo get_the_ID(); ?>" />
+			<button class="buythisbutton" type="submit" value="submit" name="submit"></button></form></div>
+			<div class="clear"></div>
+		<?php
+	}
+
+	function update($new_instance, $old_instance = array()) {
+		$instance = array();
+		foreach (array('title') as $field) {
+			if (isset($new_instance[$field])) { $instance[$field] = strip_tags($new_instance[$field]); }
+		}
+		return $instance;
+	}
+
+	function form($instance) {
+		$instance = wp_parse_args( (array) $instance, array( 'title' => '' ) );
+		$title = strip_tags($instance['title']);
+		?>
+		<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:','comicpress'); ?> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo attribute_escape($title); ?>" /></label></p>
+		<?php
+	}
+}
diff --git a/widgets/buythisprint.php b/widgets/buythisprint.php
deleted file mode 100644
index cb6a98c..0000000
--- a/widgets/buythisprint.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/*
-Widget Name: Buy Comic Print
-Widget URI: http://comicpress.org/
-Description: Places a button that works with the Buy This template.
-Author: Philip M. Hofer (Frumph)
-Version: 1.01
-Author URI: http://frumph.net/
-
-*/
-
-function buy_this_print_comic() {
-	global $buy_print_url;
-	$buythiscomic = get_post_meta( get_the_ID(), "buythiscomic", true );
-	if ( $buythiscomic !== 'sold' ) { ?>
-		<div class="buythis"><form method="post" action="<?php echo $buy_print_url; ?>">
-		<input type="hidden" name="comic" value="<?php echo get_the_ID(); ?>" />
-		<button class="buythisbutton" type="submit" value="submit" name="submit"></button></form></div>
-		<div class="clear"></div>
-	<?php }
-}
-
-class widget_comicpress_buy_this_print extends WP_Widget {
-	
-	function widget_comicpress_buy_this_print() {
-		$widget_ops = array('classname' => 'widget_comicpress_buy_this_print', 'description' => __('Adds a button that goes to the buy print template page.','comicpress') );
-		$this->WP_Widget('comicpress_buyprint', __('Buy This Print','comicpress'), $widget_ops);
-	}
-	
-	function widget($args, $instance) {
-		global $buy_print_url;
-		extract($args, EXTR_SKIP);
-		
-		echo $before_widget;
-		$title = empty($instance['title']) ? '' : apply_filters('widget_title', $instance['title']);
-		if ( !empty( $title ) ) { echo $before_title . $title . $after_title; };
-		buy_this_print_comic();
-		echo $after_widget;
-	}
-	
-	function update($new_instance, $old_instance) {
-		$instance = $old_instance;
-		$instance['title'] = strip_tags($new_instance['title']);
-		return $instance;
-	}
-	
-	function form($instance) {
-		$instance = wp_parse_args( (array) $instance, array( 'title' => '' ) );
-		$title = strip_tags($instance['title']);
-		?>
-		<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:','comicpress'); ?> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo attribute_escape($title); ?>" /></label></p>
-		<?php
-	}
-}
-register_widget('widget_comicpress_buy_this_print');
-
-
-function widget_comicpress_buy_this_print_init() {    
-	new widget_comicpress_buy_this_print(); 
-} 
-
-add_action('widgets_init', 'widget_comicpress_buy_this_print_init');
-
-?>
\ No newline at end of file