diff --git a/include/items.php b/include/items.php
index 088aa11a1..2a85556df 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3,7 +3,7 @@
 require_once('include/bbcode.php');
 require_once('include/oembed.php');
 require_once('include/crypto.php');
-require_once('include/Photo.php');
+require_once('include/photo/photo_driver.php');
 require_once('include/permissions.php');
 
 
@@ -2433,7 +2433,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 
 	if((is_array($contact)) && ($photo_timestamp) && (strlen($photo_url)) && ($photo_timestamp > $contact['avatar_date'])) {
 		logger('consume_feed: Updating photo for ' . $contact['name']);
-		require_once("Photo.php");
+
 		$photo_failure = false;
 		$have_photo = false;
 
@@ -2454,7 +2454,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 		$type = guess_image_type($photo_url,true);
 		
 		
-		$img = new Photo($img_str, $type);
+		$img = photo_factory($img_str, $type);
 		if($img->is_valid()) {
 			if($have_photo) {
 				q("DELETE FROM `photo` WHERE `resource_id` = '%s' AND `contact-id` = %d AND `uid` = %d",
@@ -2979,7 +2979,7 @@ function local_delivery($importer,$data) {
 
 	if(($photo_timestamp) && (strlen($photo_url)) && ($photo_timestamp > $importer['avatar_date'])) {
 		logger('local_delivery: Updating photo for ' . $importer['name']);
-		require_once("Photo.php");
+
 		$photo_failure = false;
 		$have_photo = false;
 
@@ -3000,7 +3000,7 @@ function local_delivery($importer,$data) {
 		$type = guess_image_type($photo_url,true);
 		
 		
-		$img = new Photo($img_str, $type);
+		$img = photo_factory($img_str, $type);
 		if($img->is_valid()) {
 			if($have_photo) {
 				q("DELETE FROM `photo` WHERE `resource_id` = '%s' AND `contact-id` = %d AND `uid` = %d",
@@ -4210,7 +4210,7 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) {
 							$width = intval($match[1]);
 							$height = intval($match[2]);
 
-							$ph = new Photo($data, $type);
+							$ph = photo_factory($data, $type);
 							if($ph->is_valid()) {
 								$ph->scaleImage(max($width, $height));
 								$data = $ph->imageString();
diff --git a/include/network.php b/include/network.php
index a70207be2..f750fcfd8 100644
--- a/include/network.php
+++ b/include/network.php
@@ -1051,7 +1051,8 @@ function scale_external_images($s, $include_link = true, $scale_replace = false)
 	$matches = null;
 	$c = preg_match_all('/\[img.*?\](.*?)\[\/img\]/ism',$s,$matches,PREG_SET_ORDER);
 	if($c) {
-		require_once('include/Photo.php');
+		require_once('include/photo/photo_driver.php');
+
 		foreach($matches as $mtch) {
 			logger('scale_external_image: ' . $mtch[1]);
 
@@ -1080,7 +1081,7 @@ function scale_external_images($s, $include_link = true, $scale_replace = false)
 			$type = guess_image_type($mtch[1],true);
 			
 			if($i) {
-				$ph = new Photo($i, $type);
+				$ph = photo_factory($i, $type);
 				if($ph->is_valid()) {
 					$orig_width = $ph->getWidth();
 					$orig_height = $ph->getHeight();
diff --git a/include/Photo.php b/include/photo/photo_driver.php
similarity index 50%
rename from include/Photo.php
rename to include/photo/photo_driver.php
index 5882f39f5..27237c530 100644
--- a/include/Photo.php
+++ b/include/photo/photo_driver.php
@@ -1,270 +1,91 @@
 <?php /** @file */
 
+function photo_factory($data, $type = null) {
+	$ph = null;
+
+	if(class_exists('Imagick')) {
+		require_once('include/photo/photo_imagick.php');
+		$ph = new photo_imagick($data,$type);
+	}
+	else {
+		require_once('include/photo/photo_gd.php');
+		$ph = new photo_gd($data,$type);
+	}
+
+	return $ph;
+}
+
+
+
 
 abstract class photo_driver {
 
-	private $image;
-	private $width;
-	private $height;
-	private $valid;
-	private $type;
-	private $types;
-
+	protected $image;
+	protected $width;
+	protected $height;
+	protected $valid;
+	protected $type;
+	protected $types;
 
 	abstract function supportedTypes();
-	abstract function load();
+
+	abstract function load($data,$type);
+
 	abstract function destroy();
-	abstract function getWidth();
-	abstract function getHeight();
+
+	abstract function setDimensions();
 
 	abstract function getImage();
 
-	abstract function getType();
-
-	abstract function getExt();
-
-	abstract function scaleImage($max);
+	abstract function doScaleImage($new_width,$new_height);
 
 	abstract function rotate($degrees);
 
 	abstract function flip($horiz = true, $vert = false);
 
-	abstract function scaleImageUp($min);
-
-	abstract function scaleImageSquare($dim);
-
 	abstract function cropImage($max,$x,$y,$w,$h);
 
 	abstract function imageString();
 
+
+	public function __construct($data, $type='') {
+		$this->types = $this->supportedTypes();
+		if (! array_key_exists($type,$this->types)){
+			$type='image/jpeg';
+		}
+		$this->type = $type;
+		$this->valid = false;
+		$this->load($data,$type);
+	}
+
+	public function __destruct() {
+		if($this->is_valid())
+			$this->destroy();
+	}
+
+	public function is_valid() {
+		return $this->valid;
+	}
+
+	public function getWidth() {
+		if(!$this->is_valid())
+			return FALSE;
+		return $this->width;
+	}
+
+	public function getHeight() {
+		if(!$this->is_valid())
+			return FALSE;
+		return $this->height;
+	}
+
+
 	public function saveImage($path) {
 		if(!$this->is_valid())
 			return FALSE;
 		file_put_contents($path, $this->imageString());
 	}
 
-	public function orient($filename) {
-
-		/**
-		 * This function is a bit unusual, because it is operating on a file, but you must
-		 * first create an image from that file to initialise the type and check validity
-		 * of the image.
-		 */
-
-		if(! $this->is_valid())
-			return FALSE;
-
-		if((! function_exists('exif_read_data')) || ($this->getType() !== 'image/jpeg'))
-			return;
-
-		$exif = @exif_read_data($filename);
-		if($exif) {
-			$ort = $exif['Orientation'];
-
-			switch($ort)
-			{
-				case 1: // nothing
-					break;
-
-				case 2: // horizontal flip
-					$this->flip();
-					break;
-
-				case 3: // 180 rotate left
-					$this->rotate(180);
-					break;
-
-				case 4: // vertical flip
-					$this->flip(false, true);
-					break;
-
-				case 5: // vertical flip + 90 rotate right
-					$this->flip(false, true);
-					$this->rotate(-90);
-					break;
-
-				case 6: // 90 rotate right
-					$this->rotate(-90);
-					break;
-
-				case 7: // horizontal flip + 90 rotate right
-					$this->flip();
-					$this->rotate(-90);
-					break;
-
-				case 8:	// 90 rotate left
-					$this->rotate(90);
-					break;
-			}
-		}
-	}
-}
-
-
-
-
-
-
-
-class Photo {
-
-	private $image;
-
-	/**
-	 * Put back gd stuff, not everybody have Imagick
-	 */
-	private $imagick;
-	private $width;
-	private $height;
-	private $valid;
-	private $type;
-	private $types;
-
-	/**
-	 * supported mimetypes and corresponding file extensions
-	 */
-	static function supportedTypes() {
-		if(class_exists('Imagick')) {
-			/**
-			 * Imagick::queryFormats won't help us a lot there...
-			 * At least, not yet, other parts of friendica uses this array
-			 */
-			$t = array(
-				'image/jpeg' => 'jpg',
-				'image/png' => 'png',
-				'image/gif' => 'gif'
-			);
-		} else {
-			$t = array();
-			$t['image/jpeg'] ='jpg';
-			if (imagetypes() & IMG_PNG) $t['image/png'] = 'png';
-		}
-
-		return $t;
-	}
-
-	public function __construct($data, $type=null) {
-		$this->imagick = class_exists('Imagick');
-		$this->types = $this->supportedTypes();
-		if (!array_key_exists($type,$this->types)){
-			$type='image/jpeg';
-		}
-		$this->type = $type;
-
-		if($this->is_imagick()) {
-			$this->image = new Imagick();
-			$this->image->readImageBlob($data);
-
-			/**
-			 * Setup the image to the format it will be saved to
-			 */
-			$map = $this->get_FormatsMap();
-			$format = $map[$type];
-			$this->image->setFormat($format);
-
-			// Always coalesce, if it is not a multi-frame image it won't hurt anyway
-			$this->image = $this->image->coalesceImages();
-
-			/**
-			 * setup the compression here, so we'll do it only once
-			 */
-			switch($this->getType()){
-				case "image/png":
-					$quality = get_config('system','png_quality');
-					if((! $quality) || ($quality > 9))
-						$quality = PNG_QUALITY;
-					/**
-					 * From http://www.imagemagick.org/script/command-line-options.php#quality:
-					 *
-					 * 'For the MNG and PNG image formats, the quality value sets
-					 * the zlib compression level (quality / 10) and filter-type (quality % 10).
-					 * The default PNG "quality" is 75, which means compression level 7 with adaptive PNG filtering,
-					 * unless the image has a color map, in which case it means compression level 7 with no PNG filtering'
-					 */
-					$quality = $quality * 10;
-					$this->image->setCompressionQuality($quality);
-					break;
-				case "image/jpeg":
-					$quality = get_config('system','jpeg_quality');
-					if((! $quality) || ($quality > 100))
-						$quality = JPEG_QUALITY;
-					$this->image->setCompressionQuality($quality);
-			}
-		} else {
-			$this->valid = false;
-			$this->image = @imagecreatefromstring($data);
-			if($this->image !== FALSE) {
-				$this->width  = imagesx($this->image);
-				$this->height = imagesy($this->image);
-				$this->valid  = true;
-				imagealphablending($this->image, false);
-				imagesavealpha($this->image, true);
-			}
-		}
-	}
-
-	public function __destruct() {
-		if($this->image) {
-			if($this->is_imagick()) {
-				$this->image->clear();
-				$this->image->destroy();
-				return;
-			}
-			imagedestroy($this->image);
-		}
-	}
-
-	public function is_imagick() {
-		return $this->imagick;
-	}
-
-	/**
-	 * Maps Mime types to Imagick formats
-	 */
-	public function get_FormatsMap() {
-		$m = array(
-			'image/jpeg' => 'JPG',
-			'image/png' => 'PNG',
-			'image/gif' => 'GIF'
-		);
-		return $m;
-	}
-
-	public function is_valid() {
-		if($this->is_imagick())
-			return ($this->image !== FALSE);
-		return $this->valid;
-	}
-
-	public function getWidth() {
-		if(!$this->is_valid())
-			return FALSE;
-
-		if($this->is_imagick())
-			return $this->image->getImageWidth();
-		return $this->width;
-	}
-
-	public function getHeight() {
-		if(!$this->is_valid())
-			return FALSE;
-
-		if($this->is_imagick())
-			return $this->image->getImageHeight();
-		return $this->height;
-	}
-
-	public function getImage() {
-		if(!$this->is_valid())
-			return FALSE;
-
-		if($this->is_imagick()) {
-			/* Clean it */
-			$this->image = $this->image->deconstructImages();
-			return $this->image;
-		}
-		return $this->image;
-	}
 
 	public function getType() {
 		if(!$this->is_valid())
@@ -339,95 +160,72 @@ class Photo {
 				}
 			}
 		}
-
-
-		if($this->is_imagick()) {
-			/**
-			 * If it is not animated, there will be only one iteration here,
-			 * so don't bother checking
-			 */
-			// Don't forget to go back to the first frame
-			$this->image->setFirstIterator();
-			do {
-
-				// FIXME - implement horizantal bias for scaling as in followin GD functions
-				// to allow very tall images to be constrained only horizontally. 
-
-				$this->image->scaleImage($dest_width, $dest_height);
-			} while ($this->image->nextImage());
-
-			// FIXME - also we need to copy the new dimensions to $this->height, $this->width as other functions
-			// may rely on it.
-
-			return;
-		}
-
-
-		$dest = imagecreatetruecolor( $dest_width, $dest_height );
-		imagealphablending($dest, false);
-		imagesavealpha($dest, true);
-		if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
-		imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dest_width, $dest_height, $width, $height);
-		if($this->image)
-			imagedestroy($this->image);
-		$this->image = $dest;
-		$this->width  = imagesx($this->image);
-		$this->height = imagesy($this->image);
+		$this->doScaleImage($dest_width,$dest_height);
 	}
 
-	public function rotate($degrees) {
+	public function scaleImageUp($min) {
 		if(!$this->is_valid())
 			return FALSE;
 
-		if($this->is_imagick()) {
-			$this->image->setFirstIterator();
-			do {
-				$this->image->rotateImage(new ImagickPixel(), -$degrees); // ImageMagick rotates in the opposite direction of imagerotate()
-			} while ($this->image->nextImage());
-			return;
-		}
 
-		$this->image  = imagerotate($this->image,$degrees,0);
-		$this->width  = imagesx($this->image);
-		$this->height = imagesy($this->image);
-	}
+		$width = $this->width;
+		$height = $this->height;
 
-	public function flip($horiz = true, $vert = false) {
-		if(!$this->is_valid())
+		$dest_width = $dest_height = 0;
+
+		if((! $width)|| (! $height))
 			return FALSE;
 
-		if($this->is_imagick()) {
-			$this->image->setFirstIterator();
-			do {
-				if($horiz) $this->image->flipImage();
-				if($vert) $this->image->flopImage();
-			} while ($this->image->nextImage());
-			return;
-		}
-
-		$w = imagesx($this->image);
-		$h = imagesy($this->image);
-		$flipped = imagecreate($w, $h);
-		if($horiz) {
-			for ($x = 0; $x < $w; $x++) {
-				imagecopy($flipped, $this->image, $x, 0, $w - $x - 1, 0, 1, $h);
+		if($width < $min && $height < $min) {
+			if($width > $height) {
+				$dest_width = $min;
+				$dest_height = intval(( $height * $min ) / $width);
+			}
+			else {
+				$dest_width = intval(( $width * $min ) / $height);
+				$dest_height = $min;
 			}
 		}
-		if($vert) {
-			for ($y = 0; $y < $h; $y++) {
-				imagecopy($flipped, $this->image, 0, $y, 0, $h - $y - 1, $w, 1);
+		else {
+			if( $width < $min ) {
+				$dest_width = $min;
+				$dest_height = intval(( $height * $min ) / $width);
+			}
+			else {
+				if( $height < $min ) {
+					$dest_width = intval(( $width * $min ) / $height);
+					$dest_height = $min;
+				}
+				else {
+					$dest_width = $width;
+					$dest_height = $height;
+				}
 			}
 		}
-		$this->image = $flipped;
+		$this->doScaleImage($dest_width,$dest_height);
 	}
 
+	public function scaleImageSquare($dim) {
+		if(!$this->is_valid())
+			return FALSE;
+		$this->doScaleImage($dim,$dim);
+	}
+
+
+
+
 	public function orient($filename) {
-		// based off comment on http://php.net/manual/en/function.imagerotate.php
 
-		if(!$this->is_valid())
+		/**
+		 * This function is a bit unusual, because it is operating on a file, but you must
+		 * first create an image from that file to initialise the type and check validity
+		 * of the image.
+		 */
+
+		if(! $this->is_valid())
 			return FALSE;
 
-		if( (! function_exists('exif_read_data')) || ($this->getType() !== 'image/jpeg') )
+		if((! function_exists('exif_read_data')) || ($this->getType() !== 'image/jpeg'))
 			return;
 
 		$exif = @exif_read_data($filename);
@@ -473,165 +271,6 @@ class Photo {
 	}
 
 
-
-	public function scaleImageUp($min) {
-		if(!$this->is_valid())
-			return FALSE;
-
-
-		$width = $this->width;
-		$height = $this->height;
-
-		$dest_width = $dest_height = 0;
-
-		if((! $width)|| (! $height))
-			return FALSE;
-
-		if($width < $min && $height < $min) {
-			if($width > $height) {
-				$dest_width = $min;
-				$dest_height = intval(( $height * $min ) / $width);
-			}
-			else {
-				$dest_width = intval(( $width * $min ) / $height);
-				$dest_height = $min;
-			}
-		}
-		else {
-			if( $width < $min ) {
-				$dest_width = $min;
-				$dest_height = intval(( $height * $min ) / $width);
-			}
-			else {
-				if( $height < $min ) {
-					$dest_width = intval(( $width * $min ) / $height);
-					$dest_height = $min;
-				}
-				else {
-					$dest_width = $width;
-					$dest_height = $height;
-				}
-			}
-		}
-
-		if($this->is_imagick())
-			return $this->scaleImage($dest_width,$dest_height);
-
-		$dest = imagecreatetruecolor( $dest_width, $dest_height );
-		imagealphablending($dest, false);
-		imagesavealpha($dest, true);
-		if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
-		imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dest_width, $dest_height, $width, $height);
-		if($this->image)
-			imagedestroy($this->image);
-		$this->image = $dest;
-		$this->width  = imagesx($this->image);
-		$this->height = imagesy($this->image);
-	}
-
-
-
-	public function scaleImageSquare($dim) {
-		if(!$this->is_valid())
-			return FALSE;
-
-		if($this->is_imagick()) {
-			$this->image->setFirstIterator();
-			do {
-				$this->image->scaleImage($dim, $dim);
-			} while ($this->image->nextImage());
-			return;
-		}
-
-		$dest = imagecreatetruecolor( $dim, $dim );
-		imagealphablending($dest, false);
-		imagesavealpha($dest, true);
-		if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
-		imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dim, $dim, $this->width, $this->height);
-		if($this->image)
-			imagedestroy($this->image);
-		$this->image = $dest;
-		$this->width  = imagesx($this->image);
-		$this->height = imagesy($this->image);
-	}
-
-
-	public function cropImage($max,$x,$y,$w,$h) {
-		if(!$this->is_valid())
-			return FALSE;
-
-		if($this->is_imagick()) {
-			$this->image->setFirstIterator();
-			do {
-				$this->image->cropImage($w, $h, $x, $y);
-				/**
-				 * We need to remove the canva,
-				 * or the image is not resized to the crop:
-				 * http://php.net/manual/en/imagick.cropimage.php#97232
-				 */
-				$this->image->setImagePage(0, 0, 0, 0);
-			} while ($this->image->nextImage());
-			return $this->scaleImage($max);
-		}
-
-		$dest = imagecreatetruecolor( $max, $max );
-		imagealphablending($dest, false);
-		imagesavealpha($dest, true);
-		if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
-		imagecopyresampled($dest, $this->image, 0, 0, $x, $y, $max, $max, $w, $h);
-		if($this->image)
-			imagedestroy($this->image);
-		$this->image = $dest;
-		$this->width  = imagesx($this->image);
-		$this->height = imagesy($this->image);
-	}
-
-	public function saveImage($path) {
-		if(!$this->is_valid())
-			return FALSE;
-
-		$string = $this->imageString();
-		file_put_contents($path, $string);
-	}
-
-	public function imageString() {
-		if(!$this->is_valid())
-			return FALSE;
-
-		if($this->is_imagick()) {
-			/* Clean it */
-			$this->image = $this->image->deconstructImages();
-			$string = $this->image->getImagesBlob();
-			return $string;
-		}
-
-		$quality = FALSE;
-
-		ob_start();
-
-		switch($this->getType()){
-			case "image/png":
-				$quality = get_config('system','png_quality');
-				if((! $quality) || ($quality > 9))
-					$quality = PNG_QUALITY;
-				imagepng($this->image,NULL, $quality);
-				break;
-			case "image/jpeg":
-			default:
-				$quality = get_config('system','jpeg_quality');
-				if((! $quality) || ($quality > 100))
-					$quality = JPEG_QUALITY;
-				imagejpeg($this->image,NULL,$quality);
-				break;
-		}
-		$string = ob_get_contents();
-		ob_end_clean();
-
-		return $string;
-	}
-
-
-
 	public function store($aid, $uid, $xchan, $rid, $filename, $album, $scale, $profile = 0, $allow_cid = '', $allow_gid = '', $deny_cid = '', $deny_gid = '') {
 
 		$x = q("select id from photo where `resource_id` = '%s' and uid = %d and `xchan` = '%s' and `scale` = %d limit 1",
@@ -712,15 +351,18 @@ class Photo {
 		}
 		return $r;
 	}
+
 }
 
 
+
 /**
  * Guess image mimetype from filename or from Content-Type header
  *
  * @arg $filename string Image filename
  * @arg $fromcurl boolean Check Content-Type header from curl request
  */
+
 function guess_image_type($filename, $fromcurl=false) {
 	logger('Photo: guess_image_type: '.$filename . ($fromcurl?' from curl headers':''), LOGGER_DEBUG);
 	$type = null;
diff --git a/include/photo/photo_gd.php b/include/photo/photo_gd.php
new file mode 100644
index 000000000..a32bd2816
--- /dev/null
+++ b/include/photo/photo_gd.php
@@ -0,0 +1,137 @@
+<?php /** @file */
+
+
+require_once('include/photo/photo_driver.php');
+
+
+class photo_gd extends photo_driver {
+
+	function supportedTypes() {
+		$t = array();
+		$t['image/jpeg'] ='jpg';
+		if (imagetypes() & IMG_PNG) $t['image/png'] = 'png';
+
+		return $t;
+
+	}
+
+	function load($data, $type) {
+		$this->valid = false;
+		$this->image = @imagecreatefromstring($data);
+		if($this->image !== FALSE) {
+			$this->valid  = true;
+			$this->setDimensions();
+			imagealphablending($this->image, false);
+			imagesavealpha($this->image, true);
+		}
+	}
+
+	function setDimensions() {
+		$this->width  = imagesx($this->image);
+		$this->height = imagesy($this->image);
+	}
+
+
+	public function destroy() {
+		if($this->is_valid()) {
+			imagedestroy($this->image);
+		}
+	}
+
+	public function getImage() {
+		if(!$this->is_valid())
+			return FALSE;
+
+		return $this->image;
+	}
+
+	public function doScaleImage($dest_width,$dest_height) {
+
+		$dest = imagecreatetruecolor( $dest_width, $dest_height );
+		$width = imagesx($this->image);
+		$height = imagesy($this->image);
+
+		imagealphablending($dest, false);
+		imagesavealpha($dest, true);
+		if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
+		imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dest_width, $dest_height, $width, $height);
+		if($this->image)
+			imagedestroy($this->image);
+		$this->image = $dest;
+		$this->setDimensions();
+	}
+
+	public function rotate($degrees) {
+		if(!$this->is_valid())
+			return FALSE;
+
+		$this->image  = imagerotate($this->image,$degrees,0);
+		$this->setDimensions();
+	}
+
+	public function flip($horiz = true, $vert = false) {
+		if(!$this->is_valid())
+			return FALSE;
+
+		$w = imagesx($this->image);
+		$h = imagesy($this->image);
+		$flipped = imagecreate($w, $h);
+		if($horiz) {
+			for ($x = 0; $x < $w; $x++) {
+				imagecopy($flipped, $this->image, $x, 0, $w - $x - 1, 0, 1, $h);
+			}
+		}
+		if($vert) {
+			for ($y = 0; $y < $h; $y++) {
+				imagecopy($flipped, $this->image, 0, $y, 0, $h - $y - 1, $w, 1);
+			}
+		}
+		$this->image = $flipped;
+		$this->setDimensions(); // Shouldn't really be necessary
+	}
+
+	public function cropImage($max,$x,$y,$w,$h) {
+		if(!$this->is_valid())
+			return FALSE;
+
+		$dest = imagecreatetruecolor( $max, $max );
+		imagealphablending($dest, false);
+		imagesavealpha($dest, true);
+		if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
+		imagecopyresampled($dest, $this->image, 0, 0, $x, $y, $max, $max, $w, $h);
+		if($this->image)
+			imagedestroy($this->image);
+		$this->image = $dest;
+		$this->setDimensions();
+	}
+
+	public function imageString() {
+		if(!$this->is_valid())
+			return FALSE;
+
+		$quality = FALSE;
+
+		ob_start();
+
+		switch($this->getType()){
+			case "image/png":
+				$quality = get_config('system','png_quality');
+				if((! $quality) || ($quality > 9))
+					$quality = PNG_QUALITY;
+				imagepng($this->image,NULL, $quality);
+				break;
+			case "image/jpeg":
+			default:
+				$quality = get_config('system','jpeg_quality');
+				if((! $quality) || ($quality > 100))
+					$quality = JPEG_QUALITY;
+				imagejpeg($this->image,NULL,$quality);
+				break;
+		}
+		$string = ob_get_contents();
+		ob_end_clean();
+
+		return $string;
+	}
+
+}
\ No newline at end of file
diff --git a/include/photo/photo_imagick.php b/include/photo/photo_imagick.php
new file mode 100644
index 000000000..7282898b4
--- /dev/null
+++ b/include/photo/photo_imagick.php
@@ -0,0 +1,173 @@
+<?php /** @file */
+
+
+require_once('include/photo/photo_driver.php');
+
+
+class photo_imagick extends photo_driver {
+
+
+	function supportedTypes() {
+		return array(
+			'image/jpeg' => 'jpg',
+			'image/png' => 'png',
+			'image/gif' => 'gif'
+		);
+	}
+
+	public function get_FormatsMap() {
+		return array(
+			'image/jpeg' => 'JPG',
+			'image/png' => 'PNG',
+			'image/gif' => 'GIF'
+		);
+	}
+
+
+	function load($data, $type) {
+		$this->valid = false;
+		$this->image = new Imagick();
+		$this->image->readImageBlob($data);
+
+
+		/**
+		 * Setup the image to the format it will be saved to
+		 */
+
+		$map = $this->get_FormatsMap();
+		$format = $map[$type];
+
+		if($this->image) {
+			$this->image->setFormat($format);
+
+			// Always coalesce, if it is not a multi-frame image it won't hurt anyway
+			$this->image = $this->image->coalesceImages();
+
+
+			$this->valid = true;
+			$this->setDimensions();
+
+			/**
+			 * setup the compression here, so we'll do it only once
+			 */
+			switch($this->getType()) {
+				case "image/png":
+					$quality = get_config('system','png_quality');
+					if((! $quality) || ($quality > 9))
+						$quality = PNG_QUALITY;
+					/**
+					 * From http://www.imagemagick.org/script/command-line-options.php#quality:
+					 *
+					 * 'For the MNG and PNG image formats, the quality value sets
+					 * the zlib compression level (quality / 10) and filter-type (quality % 10).
+					 * The default PNG "quality" is 75, which means compression level 7 with adaptive PNG filtering,
+					 * unless the image has a color map, in which case it means compression level 7 with no PNG filtering'
+					 */
+					$quality = $quality * 10;
+					$this->image->setCompressionQuality($quality);
+					break;
+				case "image/jpeg":
+					$quality = get_config('system','jpeg_quality');
+					if((! $quality) || ($quality > 100))
+						$quality = JPEG_QUALITY;
+					$this->image->setCompressionQuality($quality);
+
+				default:
+					break;
+			}
+		}
+	}
+
+	public function destroy() {
+		if($this->is_valid()) {
+			$this->image->clear();
+			$this->image->destroy();
+		}
+	}
+
+
+	public function setDimensions() {
+		$this->width = $this->image->getImageWidth();
+		$this->height = $this->image->getImageHeight();
+	}
+
+
+	public function getImage() {
+		if(!$this->is_valid())
+			return FALSE;
+
+		$this->image = $this->image->deconstructImages();
+		return $this->image;
+	}
+
+	public function doScaleImage($dest_width,$dest_height) {
+
+		/**
+		 * If it is not animated, there will be only one iteration here,
+		 * so don't bother checking
+		 */
+		// Don't forget to go back to the first frame
+		$this->image->setFirstIterator();
+		do {
+			$this->image->scaleImage($dest_width, $dest_height);
+		} while ($this->image->nextImage());
+
+		$this->setDimensions();
+	}
+
+	public function rotate($degrees) {
+		if(!$this->is_valid())
+			return FALSE;
+
+		$this->image->setFirstIterator();
+		do {
+			// ImageMagick rotates in the opposite direction of imagerotate()
+			$this->image->rotateImage(new ImagickPixel(), -$degrees); 
+		} while ($this->image->nextImage());
+
+		$this->setDimensions();
+	}
+
+	public function flip($horiz = true, $vert = false) {
+		if(!$this->is_valid())
+			return FALSE;
+
+		$this->image->setFirstIterator();
+		do {
+			if($horiz) $this->image->flipImage();
+			if($vert) $this->image->flopImage();
+		} while ($this->image->nextImage());
+
+		$this->setDimensions(); // Shouldn't really be necessary
+	}
+
+	public function cropImage($max,$x,$y,$w,$h) {
+		if(!$this->is_valid())
+			return FALSE;
+
+		$this->image->setFirstIterator();
+		do {
+			$this->image->cropImage($w, $h, $x, $y);
+			/**
+			 * We need to remove the canva,
+			 * or the image is not resized to the crop:
+			 * http://php.net/manual/en/imagick.cropimage.php#97232
+			 */
+			$this->image->setImagePage(0, 0, 0, 0);
+		} while ($this->image->nextImage());
+
+		$this->doScaleImage($max);
+	}
+
+	public function imageString() {
+		if(!$this->is_valid())
+			return FALSE;
+
+		/* Clean it */
+		$this->image = $this->image->deconstructImages();
+		return $this->image->getImagesBlob();
+	}
+
+
+
+}
\ No newline at end of file
diff --git a/include/photos.php b/include/photos.php
index 123cd0659..fae01ba80 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -2,6 +2,8 @@
 
 require_once('include/permissions.php');
 require_once('include/items.php');
+require_once('include/photo/photo_driver.php');
+
 
 function photo_upload($channel, $observer, $args) {
 
@@ -116,7 +118,7 @@ function photo_upload($channel, $observer, $args) {
 	}
 		
 
-	$ph = new Photo($imagedata, $type);
+	$ph = photo_factory($imagedata, $type);
 
 	if(! $ph->is_valid()) {
 		$ret['message'] = t('Unable to process image');
diff --git a/include/zot.php b/include/zot.php
index e8fba603a..9addf80cf 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -563,7 +563,7 @@ function import_xchan($arr) {
 
 	if($import_photos) {
 
-		require_once("Photo.php");
+		require_once('include/photo/photo_driver.php');
 
 		$photos = import_profile_photo($arr['photo'],$xchan_hash);
 		$r = q("update xchan set xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s'
diff --git a/mod/crepair.php b/mod/crepair.php
index e5ece0f98..f749fac0e 100644
--- a/mod/crepair.php
+++ b/mod/crepair.php
@@ -76,7 +76,7 @@ function crepair_post(&$a) {
 
 	if($photo) {
 		logger('mod-crepair: updating photo from ' . $photo);
-		require_once("Photo.php");
+		require_once('include/photo/photo_driver.php');
 
 		$photos = import_profile_photo($photo,local_user(),$contact['id']);
 
diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index d10d8021b..31004c0d8 100644
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -5,7 +5,7 @@
  * @author		Fabio Comuni <fabrixxm@kirgroup.com>
  */
 
-require_once('include/Photo.php');
+require_once('include/photo/photo_driver.php');
 
 /**
  * @param App $a
diff --git a/mod/import.php b/mod/import.php
index 8b8019a99..4602c8aa8 100644
--- a/mod/import.php
+++ b/mod/import.php
@@ -114,7 +114,7 @@ function import_post(&$a) {
 	$channel = $r[0];
 
 	if($data['photo']) {
-		require_once('include/Photo.php');
+		require_once('include/photo/photo_driver.php');
 		import_channel_photo(base64url_decode($data['photo']['data']),$data['photo']['type'],get_account_id,$channel['channel_id']);
 	}
 
@@ -217,7 +217,7 @@ function import_post(&$a) {
 				. "')" );
 
 	
-			require_once("Photo.php");
+			require_once('include/photo/photo_driver.php');
 			$photos = import_profile_photo($xchan['xchan_photo_l'],$xchan['xchan_hash']);
 			$r = q("update xchan set xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s'
 				where xchan_hash = '%s' limit 1",
diff --git a/mod/photo.php b/mod/photo.php
index aff4dc895..43418e524 100644
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -1,7 +1,7 @@
 <?php
 
 require_once('include/security.php');
-require_once('include/Photo.php');
+require_once('include/photo/photo_driver.php');
 
 function photo_init(&$a) {
 
@@ -151,7 +151,7 @@ function photo_init(&$a) {
 	}
 
 	if(isset($res) && intval($res) && $res < 500) {
-		$ph = new Photo($data, $mimetype);
+		$ph = photo_factory($data, $mimetype);
 		if($ph->is_valid()) {
 			$ph->scaleImageSquare($res);
 			$data = $ph->imageString();
diff --git a/mod/photos.php b/mod/photos.php
index 0564cb3ff..84a12aacb 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1,5 +1,5 @@
 <?php
-require_once('include/Photo.php');
+require_once('include/photo/photo_driver.php');
 require_once('include/photos.php');
 require_once('include/items.php');
 require_once('include/acl_selectors.php');
@@ -59,7 +59,9 @@ function photos_post(&$a) {
 	logger('mod_photos: REQUEST ' . print_r($_REQUEST,true), LOGGER_DATA);
 	logger('mod_photos: FILES '   . print_r($_FILES,true), LOGGER_DATA);
 
-	$phototypes = Photo::supportedTypes();
+	$ph = photo_factory('');
+
+	$phototypes = $ph->supportedTypes();
 
 	$can_post  = false;
 
@@ -233,7 +235,7 @@ function photos_post(&$a) {
 				intval($page_owner_uid)
 			);
 			if(count($r)) {
-				$ph = new Photo($r[0]['data'], $r[0]['type']);
+				$ph = photo_factory($r[0]['data'], $r[0]['type']);
 				if($ph->is_valid()) {
 					$rotate_deg = ( (intval($_POST['rotate']) == 1) ? 270 : 90 );
 					$ph->rotate($rotate_deg);
@@ -565,7 +567,8 @@ function photos_content(&$a) {
 		return;
 	}
 
-	$phototypes = Photo::supportedTypes();
+	$ph = photo_factory('');
+	$phototypes = $ph->supportedTypes();
 
 	$_SESSION['photo_return'] = $a->cmd;
 
@@ -1152,7 +1155,7 @@ function photos_content(&$a) {
 			$dislike = '';
 
 			// display comments
-			if(count($r)) {
+			if($r) {
 
 				foreach($r as $item) {
 					like_puller($a,$item,$alike,'like');
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index ea7a01bc9..64dfc0e83 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once("Photo.php");
+require_once('include/photo/photo_driver.php');
 
 function profile_photo_init(&$a) {
 
@@ -77,7 +77,7 @@ function profile_photo_post(&$a) {
 
 			$base_image = $r[0];
 		
-			$im = new Photo($base_image['data'], $base_image['type']);
+			$im = photo_factory($base_image['data'], $base_image['type']);
 			if($im->is_valid()) {
 
 				$im->cropImage(175,$srcX,$srcY,$srcW,$srcH);
@@ -164,7 +164,7 @@ function profile_photo_post(&$a) {
 	}
 
 	$imagedata = @file_get_contents($src);
-	$ph = new Photo($imagedata, $filetype);
+	$ph = photo_factory($imagedata, $filetype);
 
 	if(! $ph->is_valid()) {
 		notice( t('Unable to process image.') . EOL );
@@ -251,7 +251,7 @@ function profile_photo_content(&$a) {
 			return;
 		}
 
-		$ph = new Photo($r[0]['data'], $r[0]['type']);
+		$ph = photo_factory($r[0]['data'], $r[0]['type']);
 		// go ahead as if we have just uploaded a new photo to crop
 		profile_photo_crop_ui_head($a, $ph);
 	}
diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index cee40744f..0d24755d2 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once('Photo.php');
+require_once('include/photo/photo_driver.php');
 require_once('include/photos.php');
 
 
diff --git a/util/typo.php b/util/typo.php
index 427b97efa..6c846696d 100644
--- a/util/typo.php
+++ b/util/typo.php
@@ -26,6 +26,13 @@
 		include_once($file);
 	}
 
+	echo "Directory: include/photo\n";
+	$files = glob('include/photo/*.php');
+	foreach($files as $file) {
+		echo $file . "\n";
+		include_once($file);
+	}
+
 	echo "Directory: mod\n";
 	$files = glob('mod/*.php');
 	foreach($files as $file) {