diff --git a/ext/resize/main.php b/ext/resize/main.php
new file mode 100644
index 00000000..0d2e1d50
--- /dev/null
+++ b/ext/resize/main.php
@@ -0,0 +1,233 @@
+<?php
+/*
+ * Name: Image Resize
+ * Author: jgen <jgen.tech@gmail.com>
+ * Description: Allows admins to resize uploaded images.
+ * License: GPLv2
+ * Version: 0.1
+ * Notice:
+ *  The image resize and resample code is based off of the "smart_resize_image"
+ *  function copyright 2008 Maxim Chernyak, released under a MIT-style license.
+ *
+ */
+
+/**
+ * This class is just a wrapper around SCoreException.
+ */
+class ImageResizeException extends SCoreException {
+	var $error;
+
+	public function __construct($error) {
+		$this->error = $error;
+	}
+}
+
+/**
+ *	This class handles image resize requests.
+ */
+class ResizeImage extends SimpleExtension {
+
+	public function onInitExt($event) {
+		global $config;
+		$config->set_default_bool('resize_enabled', true);
+		$config->set_default_int('resize_default_width', 0);
+		$config->set_default_int('resize_default_height', 0);		
+	}
+
+	public function onImageAdminBlockBuilding($event) {
+		global $user, $config;
+		if($user->is_admin() && $config->get_bool("resize_enabled")) {
+			/* Add a link to resize the image */
+			$event->add_part($this->theme->get_resize_html($event->image->id));
+		}
+	}
+	
+	public function onSetupBuilding($event) {
+		$sb = new SetupBlock("Image Resize");
+		$sb->add_bool_option("resize_enabled", "Allow resizing images: ");
+		$sb->add_label("<br>Preset/Default Width: ");
+		$sb->add_int_option("resize_default_width");
+		$sb->add_label(" px");
+		$sb->add_label("<br>Preset/Default Height: ");
+		$sb->add_int_option("resize_default_height");
+		$sb->add_label(" px");
+		$sb->add_label("<br>(enter 0 for no default)");
+		$event->panel->add_block($sb);
+	}
+	
+	public function onPageRequest($event) {
+		global $page, $user;
+
+		if ( $event->page_matches("resize") && $user->is_admin() ) {
+			// Try to get the image ID
+			$image_id = int_escape($event->get_arg(0));
+			if (empty($image_id)) {
+				$image_id = isset($_POST['image_id']) ? $_POST['image_id'] : null;
+			}
+			if (empty($image_id)) {
+				throw new ImageResizeException("Can not resize Image: No valid Image ID given.");
+			}
+			
+			$image = Image::by_id($image_id);
+			if(is_null($image)) {
+				$this->theme->display_error($page, "Image not found", "No image in the database has the ID #$image_id");
+			} else {
+			
+				/* Check if options were given to resize an image. */
+				if (isset($_POST['resize'])) {
+					
+					/* get options */
+					
+					$width = $height = 0;
+					
+					if (isset($_POST['resize_width'])) {
+						$width = int_escape($_POST['resize_width']);
+					}
+					if (isset($_POST['resize_height'])) {
+						$width = int_escape($_POST['resize_height']);
+					}
+					
+					/* Attempt to resize the image */
+					try {
+						$this->resize_image($image, $width, $height);
+					} catch (ImageResizeException $e) {
+						$this->theme->display_resize_error($page, "Error Resizing", $e->error);
+					}
+				} else {
+					/* Display options for resizing */
+					$this->theme->display_resize_page($page, $image_id);
+				}
+			}
+		}
+	}
+	
+	
+	// Private functions
+	
+	/*
+		This function could be made much smaller by using the ImageReplaceEvent
+		ie: Pretend that we are replacing the image with a resized copy.
+	*/
+	private function resize_image($image, $width, $height) {
+		global $config;
+		global $user;
+		global $page;
+		global $database;
+		
+		if ( $height <= 0 && $width <= 0 ) {
+			throw new ImageResizeException("Invalid options for height and width.");
+		}
+		
+		$id = $image->id;
+		$hash = $image->hash;
+		if (is_null($hash)) {
+			throw new ImageResizeException("Image does not have a hash associated with it.");
+		}
+		
+		$image_filename  = warehouse_path("images", $hash);
+		$info = getimagesize($image_filename);
+		
+		if (($image->width != $info[0] ) || ($image->height != $info[1])) {
+			throw new ImageResizeException("The image size does not match what is in the database! - Aborting Resize.");
+		}
+		
+		/* Check memory usage limits */
+		$memory_use = (filesize($image_filename)*2) + ($width*$height*4) + (4*1024*1024);
+		$memory_limit = get_memory_limit();
+		
+		if ($memory_use > $memory_limit) {
+			throw new ImageResizeException("The image is too large to resize given the memory limits. ($memory_use > $memory_limit)");
+		}
+		
+		/* Calculate the new size of the image */
+		if ( $height > 0 && $width > 0 ) {
+			$new_height = $height;
+			$new_width = $width;
+		} else {
+			// Scale the new image
+			if      ($width  == 0)  $factor = $height/$image->height;
+			elseif  ($height == 0)  $factor = $width/$image->width;
+			else                    $factor = min( $width / $image->width, $height / $image->height );
+
+			$new_width  = round( $image->width * $factor );
+			$new_height = round( $image->height * $factor );			
+		}
+		
+		/* Attempt to load the image */
+		switch ( $info[2] ) {
+		  case IMAGETYPE_GIF:   $image = imagecreatefromgif($image_filename);   break;
+		  case IMAGETYPE_JPEG:  $image = imagecreatefromjpeg($image_filename);  break;
+		  case IMAGETYPE_PNG:   $image = imagecreatefrompng($image_filename);   break;
+		  default:
+			throw new ImageResizeException("Unsupported image type.");
+		}
+		
+		/* Resize and resample the image */
+		$image_resized = imagecreatetruecolor( $new_width, $new_height );
+		
+		if ( ($info[2] == IMAGETYPE_GIF) || ($info[2] == IMAGETYPE_PNG) ) {
+		  $transparency = imagecolortransparent($image);
+
+		  if ($transparency >= 0) {
+			$transparent_color  = imagecolorsforindex($image, $trnprt_indx);
+			$transparency       = imagecolorallocate($image_resized, $trnprt_color['red'], $trnprt_color['green'], $trnprt_color['blue']);
+			imagefill($image_resized, 0, 0, $transparency);
+			imagecolortransparent($image_resized, $transparency);
+		  }
+		  elseif ($info[2] == IMAGETYPE_PNG) {
+			imagealphablending($image_resized, false);
+			$color = imagecolorallocatealpha($image_resized, 0, 0, 0, 127);
+			imagefill($image_resized, 0, 0, $color);
+			imagesavealpha($image_resized, true);
+		  }
+		}
+		imagecopyresampled($image_resized, $image, 0, 0, 0, 0, $new_width, $new_height, $image->width, $image->height);
+		
+		/* Delete original image and thumbnail */
+		log_debug("image", "Removing image with hash ".$hash);
+		$image->remove_image_only();
+		
+		/* Temp storage while we resize */
+		$tmp_filename = tempnam("/tmp", 'shimmie_resize_'.time());
+		if (empty($tmp_filename)) {
+			throw new ImageResizeException("Unable to save temporary image file.");
+		}
+		
+		/* Output to the same format as the original image */
+		switch ( $info[2] ) {
+		  case IMAGETYPE_GIF:   imagegif($image_resized, $tmp_filename);    break;
+		  case IMAGETYPE_JPEG:  imagejpeg($image_resized, $tmp_filename);   break;
+		  case IMAGETYPE_PNG:   imagepng($image_resized, $tmp_filename);    break;
+		  default:
+			throw new ImageResizeException("Unsupported image type.");
+		}
+		
+		
+		/* Regenerate thumbnail */
+		
+
+		unlink($tmp_filename);
+		
+		
+		/* Update the database */
+		$database->Execute(
+				"UPDATE images SET 
+					filename = :filename, filesize = :filesize,	hash = :hash,
+					ext = :ext, width = :width, height = :height, source = :source
+				WHERE 
+					id = :id
+				",
+				array(
+					"filename"=>$image_new->filename, "filesize"=>$image->filesize, "hash"=>$image->hash,
+					"ext"=>$image->ext, "width"=>$image->width, "height"=>$image->height, "source"=>$image->source,
+					"id"=>$id
+				)
+		);
+
+		
+		
+		log_info("resize", "Resized Image #{$image->id}");
+		
+	}
+}
+?>
diff --git a/ext/resize/theme.php b/ext/resize/theme.php
new file mode 100644
index 00000000..853274d1
--- /dev/null
+++ b/ext/resize/theme.php
@@ -0,0 +1,56 @@
+<?php
+
+class ResizeImageTheme extends Themelet {
+	/*
+	 * Display a link to resize an image
+	 */
+	public function get_resize_html($image_id) {
+		global $user;
+		global $config;
+
+		$i_image_id = int_escape($image_id);
+		
+		$html = "
+			".make_form(make_link("resize"),'POST',false,'resize_image')."
+				<input type='hidden' name='image_id' value='$i_image_id' />
+				<input type='submit' value='Resize' id='resize_image_submit' />
+			</form>
+		";
+		
+		return $html;
+	}
+	
+	public function display_resize_error(Page $page, $title, $message) {
+		$page->add_block(new Block($title, $message));
+	}
+	
+	public function display_resize_page(Page $page, $image_id) {
+		global $config;
+		
+		$default_width = $config->get_int('resize_default_width');
+		$default_height = $config->get_int('resize_default_height');
+		
+		$image = Image::by_id($image_id);
+		$thumbnail = $this->build_thumb_html($image, null);
+		
+		$html = "<p>Resize Image ID ".$image_id."<br>".$thumbnail."</p>
+				<p>Please note: You will have to refresh the image page, or empty your browser cache.</p>
+				<p>Enter the new size for the image, or leave blank to scale the image automatically.</p><br>"
+				.make_form(make_link('resize/'.$image_id), 'POST', $multipart=True,'form_resize')."
+				<input type='hidden' name='image_id' value='$image_id'>
+				<table id='large_upload_form'>
+					<tr><td>New Width</td><td colspan='3'><input id='resize_width' name='resize_width' type='text' value='".$default_width."'></td></tr>
+					<tr><td>New Height</td><td colspan='3'><input id='resize_height' name='resize_height' type='text' value='".$default_height."'></td></tr>
+					<tr><td colspan='4'><input id='resizebutton' type='submit' value='Resize'></td></tr>
+				</table>
+			</form>
+		";
+	
+		$page->set_title("Resize Image");
+		$page->set_heading("Resize Image");
+		$page->add_block(new NavBlock());
+		$page->add_block(new Block("Resize Image", $html, "main", 20));
+	
+	}
+}
+?>