diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..40b7eda
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/nbproject/
diff --git a/FSs3Repo.php b/FSs3Repo.php
index 2a51407..8ca0fd6 100644
--- a/FSs3Repo.php
+++ b/FSs3Repo.php
@@ -35,7 +35,7 @@ function __construct( $info ) {
 
 		// Optional settings
 		$this->AWS_S3_PUBLIC = isset( $info['AWS_S3_PUBLIC'] ) ? $info['AWS_S3_PUBLIC'] : false;
-		$s3->useSSL = $this->AWS_S3_SSL = isset( $info['AWS_S3_SSL'] ) ? $info['AWS_S3_SSL'] : true;
+		$s3::$useSSL = $this->AWS_S3_SSL = isset( $info['AWS_S3_SSL'] ) ? $info['AWS_S3_SSL'] : true;
 		$this->url = isset( $info['url'] ) ? $info['url'] :
 			($this->AWS_S3_SSL ? "https://" : "http://") . "s3.amazonaws.com/" .
 				$this->AWS_S3_BUCKET . "/" . $this->directory;
@@ -88,7 +88,7 @@ function isHashed() {
 	/**
 	 * Get the S3 directory corresponding to one of the three basic zones
 	 */
-	function getZonePath( $zone ) {
+	function getZonePath($zone, $ext = NULL) {
 		switch ( $zone ) {
 			case 'public':
 				return $this->directory;
@@ -106,7 +106,7 @@ function getZonePath( $zone ) {
 	/** Returns zone part of repo URL, plus base URL, to be appended to S3 base URL
 	 * @see FileRepo::getZoneUrl()
 	 */
-	function getZoneUrl( $zone ) {
+	function getZoneUrl($zone, $ext = NULL) {
 		switch ( $zone ) {
 			case 'public':
 				$retval = $this->url;
@@ -175,7 +175,7 @@ function resolveVirtualUrl( $url ) {
 	 *     self::OVERWRITE_SAME    Overwrite the file if the destination exists and has the
 	 *                             same contents as the source (not implemented in S3)
 	 */
-	function storeBatch( $triplets, $flags = 0 ) {
+	function storeBatch(array $triplets, $flags = 0) {
 		wfDebug(__METHOD__." triplets: ".print_r($triplets,true)."flags: ".print_r($flags)."\n");
 		global $s3;
 		$status = $this->newGood();
@@ -192,7 +192,7 @@ function storeBatch( $triplets, $flags = 0 ) {
 			$dstPath = "$root/$dstRel";
 
 			if ( self::isVirtualUrl( $srcPath ) ) {
-				$srcPath = $triplets[$i][0] = $this->resolveVirtualUrl( $srcPath );
+				$srcPath = $ntuples[$i][0] = $this->resolveVirtualUrl( $srcPath );
 			}
 			$s3path = $srcPath;
 			$info = $s3->getObjectInfo($this->AWS_S3_BUCKET, $s3path);
@@ -334,12 +334,9 @@ function append( $srcPath, $toAppendPath, $flags = 0 ) {
 	 * Checks existence of specified array of files.
 	 *
 	 * @param $files Array: URLs of files to check
-	 * @param $flags Integer: bitwise combination of the following flags:
-	 *     self::FILES_ONLY     Mark file as existing only if it is a file (not directory)
-	 *     Will mark all items found on S3 as true, no directory concept exists on the S3
 	 * @return Either array of files and existence flags, or false
 	 */
-	function fileExistsBatch( $files, $flags = 0 ) {
+	function fileExistsBatch(array $files) {
 		global $s3;
 		$result = array();
 		foreach ( $files as $key => $file ) {
@@ -403,21 +400,21 @@ function freeTemp( $virtualUrl ) {
 
 	/**
 	 * Publish a batch of files
-	 * @param $triplets Array: (source,dest,archive) triplets as per publish()
+	 * @param $ntuples Array: (source,dest,archive) triplets as per publish()
 	 *        source can be on local machine or on S3, dest must be on S3
 	 * @param $flags Integer: bitfield, may be FileRepo::DELETE_SOURCE to indicate
 	 *        that the source files should be deleted if possible
 	 */
-	function publishBatch( $triplets, $flags = 0 ) {
+	function publishBatch(array $ntuples, $flags = 0 ) {
 		// Perform initial checks
-		wfDebug(__METHOD__.": ".print_r($triplets,true));
+		wfDebug(__METHOD__.": ".print_r($ntuples,true));
 		global $s3;
 		$status = $this->newGood( array() );
-		foreach ( $triplets as $i => $triplet ) {
+		foreach ( $ntuples as $i => $triplet ) {
 			list( $srcPath, $dstRel, $archiveRel ) = $triplet;
 
 			if ( substr( $srcPath, 0, 9 ) == 'mwrepo://' ) {
-				$triplets[$i][0] = $srcPath = $this->resolveVirtualUrl( $srcPath );
+				$ntuples[$i][0] = $srcPath = $this->resolveVirtualUrl( $srcPath );
 			}
 			if ( !$this->validateFilename( $dstRel ) ) {
 				throw new MWException( 'Validation error in $dstRel' );
@@ -443,7 +440,7 @@ function publishBatch( $triplets, $flags = 0 ) {
 			return $status;
 		}
 
-		foreach ( $triplets as $i => $triplet ) {
+		foreach ( $ntuples as $i => $triplet ) {
 			list( $srcPath, $dstRel, $archiveRel ) = $triplet;
 			$dstPath = "{$this->directory}/$dstRel";
 			$archivePath = "{$this->directory}/$archiveRel";
@@ -545,7 +542,7 @@ function publishBatch( $triplets, $flags = 0 ) {
 	 *        to the deleted zone root in the second element.
 	 * @return FileRepoStatus
 	 */
-	function deleteBatch( $sourceDestPairs ) {
+	function deleteBatch(array $sourceDestPairs) {
 		wfDebug(__METHOD__.": ".print_r($sourceDestPairs,true)."\n");
 		global $s3;
 		$status = $this->newGood();
diff --git a/LocalS3File.php b/LocalS3File.php
index 153f4c1..cf5df75 100644
--- a/LocalS3File.php
+++ b/LocalS3File.php
@@ -85,7 +85,7 @@ function getArchiveUrl( $suffix = false ) {
 			if(! $this->repo->AWS_S3_PUBLIC) {
 				$path = self::getAuthenticatedURL($this->repo->AWS_S3_BUCKET, $this->repo->getZonePath('public') . $path, 60*60*24*7 /*week*/, false, $this->repo->AWS_S3_SSL);
 			} else {
-				$path = $this->repo->url . $path;
+				$path = $this->repo->getZoneUrl('public') . $path;
 			}
 		}
 		wfDebug( __METHOD__ . " return: $path \n".print_r($this,true)."\n" );
@@ -327,7 +327,7 @@ function loadFromRow( $row, $prefix = 'img_' ) {
 	/**
 	 * Load file metadata from cache or DB, unless already loaded
 	 */
-	function load() {
+	function load($flags = 0) {
 		if ( !$this->dataLoaded ) {
 			if ( !$this->loadFromCache() ) {
 				$this->loadFromDB();
@@ -584,6 +584,7 @@ function isLocal() {
 	 *                      keys are width, height and page.
 	 * @param integer $flags A bitfield, may contain self::RENDER_NOW to force rendering
 	 * @return MediaTransformOutput
+	 *	Key to s3 Uploads
 	 */
 	function transform( $params, $flags = 0 ) {
 		global $wgUseSquid, $wgIgnoreImageErrors;
@@ -607,13 +608,14 @@ function transform( $params, $flags = 0 ) {
 				}
 			}
 
+			//I believe the issue is here due to public conversion works but without a key private does not.
 			$normalisedParams = $params;
 			$this->handler->normaliseParams( $this, $normalisedParams );
 			$thumbName = $this->thumbName( $normalisedParams );
 			$thumbPath = $this->getThumbPath( $thumbName );
 			$thumbUrl = $this->getThumbUrl( $thumbPath );
 			wfDebug( __METHOD__.": thumbName: $thumbName, thumbPath: $thumbPath\n  thumbUrl: $thumbUrl\n" );
-
+			
 			if ( $this->repo->canTransformVia404() && !($flags & self::RENDER_NOW ) ) {
 				$thumb = $this->handler->getTransform( $this, $thumbPath, $thumbUrl, $params );
 				break;
@@ -621,21 +623,65 @@ function transform( $params, $flags = 0 ) {
 
 			wfDebug( __METHOD__.": Doing stat for $thumbPath\n  ($thumbUrl)\n" );
 			$this->migrateThumbFile( $thumbName );
+
+			//$thumbPath - is the full path of the image on s3
 			$info = $s3->getObjectInfo($this->repo->AWS_S3_BUCKET, $thumbPath);
+
+			//thumbTempPath
+			//This makes the temp file and then attempts to put contents in to the temp file
+			$this->thumbTempPath = tempnam(wfTempDir(), "s3thumb-");
+			//copy($this->getUrl(), $this->thumbTempPath);
+
+			//Get Full Path of Original Uploaded Image
+			$fullPath = str_replace("thumb/", "", $thumbPath);
+			$fullPath = explode("/",$fullPath);
+			unset( $fullPath[ count($fullPath) - 1]);
+			$fullPath = implode("/",$fullPath);
+
+			//echo $fullPath."<br>";
+			//echo $thumbPath."<br>";
+			//echo $this->thumbTempPath."<br><br><br>";
+
+			//This is where it request the file and put it in the thumbTempPath
+			$s3->getObject(
+						$this->repo->AWS_S3_BUCKET,
+						$fullPath, 
+						$this->thumbTempPath
+					  );
+
+			if(!file_exists($this->thumbTempPath)){
+				$tmpImg = file_get_contents($this->getUrl());
+			
+				if(!empty($tmpImg) && !is_object($tmpImg)){
+					file_put_contents($this->thumbTempPath, $tmpImg);
+				}
+			}
+
+
+			//copy($this->thumbTempPath, $thumbPath);
+			/*
+			//if private then it needs to try again with key
+			if(!preg_match("/AWSAccessKeyId/",$thumbUrl) && $this->repo->AWS_S3_PUBLIC ){
+				//public static function getAuthenticatedURL($bucket, $uri, $lifetime, $hostBucket = false, $https = false) {
+				$thumbUrl = self::getAuthenticatedURL($this->repo->AWS_S3_BUCKET, $thumbPath, 60*60*24*7, false,  $this->repo->AWS_S3_SSL);
+			}
+			*/
+
 			wfDebug(__METHOD__." thumbPath: $thumbPath\ninfo:".print_r($info,true)."\n");
+
+			//Gets the transformed file, not sure where it transformed it though.
 			if ( $info /*file_exists( $thumbPath )*/ ) {
 				$thumb = $this->handler->getTransform( $this, $thumbPath, $thumbUrl, $params );
 				break;
 			}
 
-			$this->thumbTempPath = tempnam(wfTempDir(), "s3thumb-");
-			copy($this->getUrl(), $this->thumbTempPath);
-
+			//This makes the thumb from the temp file
 			$thumb = $this->handler->doTransform( $this, $this->thumbTempPath, $thumbUrl, $params );
 
-			wfDebug( __METHOD__. " thumb: ".print_r($thumb->url,true)."\n" );
+			wfDebug( __METHOD__. " thumb: ".print_r($thumb->getUrl(),true)."\n" );
 			$s3path = $thumbPath;
 
+			//This puts the file to the temp location
 			$info = $s3->putObjectFile($this->thumbTempPath, $this->repo->AWS_S3_BUCKET, $s3path, 
 							($this->repo->AWS_S3_PUBLIC ? S3::ACL_PUBLIC_READ : S3::ACL_PRIVATE));
 
@@ -664,6 +710,133 @@ function transform( $params, $flags = 0 ) {
 		wfDebug( __METHOD__. " return thumb: ".print_r($thumb,true)."\n" );
 		return is_object( $thumb ) ? $thumb : false;
 	}
+
+
+	public function generateAndSaveThumb( $tmpFile, $transformParams, $flags ) {
+		global $IP, $wgUploadDirectory, $wgAWS_S3_BUCKET, $wgAWS_BucketDir, $aws_s3_client, $wgUploadBaseUrl;
+		global $wgIgnoreImageErrors;
+
+		$stats = RequestContext::getMain()->getStats();
+
+		$handler = $this->getHandler();
+
+		$normalisedParams = $transformParams;
+		$handler->normaliseParams( $this, $normalisedParams );
+
+		$thumbName = $this->thumbName( $normalisedParams );
+		$thumbUrl = $this->getThumbUrl( $thumbName );
+		$thumbPath = $this->getThumbPath( $thumbName ); // final thumb path
+
+		//S3 determine if thumb is on S3 if not use original
+		//$this->file_existsS3();
+
+		$this->thumbTempPath = tempnam(wfTempDir(), "s3thumb-");
+
+		$s3->getObject(
+					$this->repo->AWS_S3_BUCKET,
+					$thumbPath, 
+					$this->thumbTempPath
+				  );
+
+		//$tmpThumbPath = $tmpFile->getPath();
+
+		/**/
+		//This only can be activated once the sync is complete and the delete files have been deleted.
+		//This section searches for the thumbpath and if it does not exists
+		if(!file_exists($tmpThumbPath) || filesize($tmpThumbPath) == 0){
+			
+			//Get Path
+			//$s3ThumbPath = str_replace("https://".$wgAWS_S3_BUCKET.".s3.amazonaws.com/","",$thumbUrl);
+			//$temps3 = explode("?",$s3ThumbPath);
+			//$s3ThumbPath = $temps3[0];
+			$s3ThumbPath = str_replace("images/", "", $wgUploadDirectory)."/thumb".str_replace("mwstore://local-backend/local-thumb", "", $thumbPath);
+			$s3FullPath = explode("/", str_replace("images/", "", $wgUploadDirectory)."".str_replace("mwstore://local-backend/local-thumb", "", $thumbPath));
+			unset( $s3FullPath[ count($s3FullPath)-1 ] );
+			$s3FullPath = implode("/", $s3FullPath);
+			
+			if($this->file_existsS3($s3ThumbPath)){
+
+				//$tmpThumbPath = $this->getS3Url($s3ThumbPath); //$thumbUrl;
+				//$thumbUrl = $this->getS3Url($s3ThumbPath); 
+
+			} else if($this->file_existsS3($s3FullPath)){
+				//$tmpThumbPath = $this->getS3Url($s3FullPath); //$thumbUrl;
+				//$thumbUrl = $this->getS3Url($s3FullPath); 
+
+			}
+
+		}
+		/**/
+
+
+		if ( $handler->supportsBucketing() ) {
+			$this->generateBucketsIfNeeded( $normalisedParams, $flags );
+		}
+
+		$starttime = microtime( true );
+
+		// Actually render the thumbnail...
+		//Add the s3 capability of getting the s3 url to generate new thumbnail if it didnt exists
+		/*
+		$thumbUrl = "/opt/bitnami/apache2/htdocs/images/noaccess.png";
+		$thumb = $handler->doTransform( $image, $dstPath, 		$dstUrl, $params, $flags = 0);
+		*/
+		//echo $thumbUrl."<br>";
+		
+		$thumb = $handler->doTransform( $this , $tmpThumbPath, $thumbUrl, $transformParams );
+
+		/*ß
+		if(preg_match("/120px/",$thumbUrl)){
+			echo "<br><pre>";
+			print_r($thumb);
+			echo $tmpThumbPath."<br>";
+			echo $thumbUrl."<br>";
+			echo "</pre>";
+		}
+		*/
+
+		$tmpFile->bind( $thumb ); // keep alive with $thumb
+
+		$statTiming = microtime( true ) - $starttime;
+		$stats->timing( 'media.thumbnail.generate.transform', 1000 * $statTiming );
+		
+		/*
+		Kelvin
+		*/
+
+		if ( !$thumb ) { // bad params?
+			$thumb = false;
+
+		} elseif ( $thumb->isError() ) { // transform error
+			/** @var $thumb MediaTransformError */
+			$this->lastError = $thumb->toText();
+			// Ignore errors if requested
+			if ( $wgIgnoreImageErrors && !( $flags & self::RENDER_NOW ) ) {
+				$thumb = $handler->getTransform( $this, $tmpThumbPath, $thumbUrl, $transformParams );
+			}
+		} elseif ( $this->repo && $thumb->hasFile() && !$thumb->fileIsSource() ) {
+			// Copy the thumbnail from the file system into storage...
+
+			$starttime = microtime( true );
+
+			$disposition = $this->getThumbDisposition( $thumbName );
+			$status = $this->repo->quickImport( $tmpThumbPath, $thumbPath, $disposition );
+			if ( $status->isOK() ) {
+				$thumb->setStoragePath( $thumbPath );
+			} else {
+				$thumb = $this->transformErrorOutput( $thumbPath, $thumbUrl, $transformParams, $flags );
+			}
+
+			$statTiming = microtime( true ) - $starttime;
+			$stats->timing( 'media.thumbnail.generate.store', 1000 * $statTiming );
+
+			// Give extensions a chance to do something with this thumbnail...
+			Hooks::run( 'FileTransformed', [ $this, $thumb, $tmpThumbPath, $thumbPath ] );
+		}
+
+
+		return $thumb;
+	}
 	
 	/** Get the URL of the thumbnail directory, or a particular file if $suffix is specified.
 	 *  $suffix is a path relative to the S3 bucket, and includes the upload directory
@@ -674,10 +847,16 @@ function getThumbUrl( $suffix = false ) {
 		else
 			$path = $this->repo->getUrlBase() . "/$suffix";
 
-		if(! $this->repo->AWS_S3_PUBLIC) 
+		if(!$this->repo->AWS_S3_PUBLIC){
 			$this->url = self::getAuthenticatedURL($this->repo->AWS_S3_BUCKET, 
-				$suffix, 60*60*24*7 /*week*/, false, 
+				$suffix, 60*60*24*7, false, 
 				$this->repo->AWS_S3_SSL);
+		}
+
+		$path = self::getAuthenticatedURL($this->repo->AWS_S3_BUCKET, 
+				$suffix, 60*60*24*7, false, 
+				$this->repo->AWS_S3_SSL);
+
 		return $path;
 	}
 
@@ -699,10 +878,17 @@ public function getPath( $forceExist=true ) {
 		global $s3;
 		if ( !isset( $this->tempPath ) ) {
 			$this->tempPath = tempnam(wfTempDir(), "s3file-");
-			$info = $s3->getObject($this->repo->AWS_S3_BUCKET,
-				$this->repo->directory . '/'  . $this->getUrlRel(), $this->tempPath);
+			
+			//This is not getting private files - kelvin
+			$info = $s3->getObject(
+									$this->repo->AWS_S3_BUCKET,
+									$this->repo->directory . '/'  . $this->getUrlRel(), 
+									$this->tempPath
+								  );
+
 			if(!$info) $this->tempPath = false;
 		}
+
 		return $this->tempPath;
 	}
 
@@ -789,7 +975,7 @@ function purgeHistory() {
 	/**
 	 * Delete all previously generated thumbnails, refresh metadata in memcached and purge the squid
 	 */
-	function purgeCache() {
+	function purgeCache($options = []) {
 		// Refresh metadata cache
 		$this->purgeMetadataCache();
 
@@ -967,8 +1153,7 @@ function upload( $srcPath, $comment, $pageText, $flags = 0, $props = false, $tim
 	 * Record a file upload in the upload log and the image table
 	 * @deprecated use upload()
 	 */
-	function recordUpload( $oldver, $desc, $license = '', $copyStatus = '', $source = '',
-		$watch = false, $timestamp = false )
+	function recordUpload($oldver, $desc, $license = '', $copyStatus = '', $source = '', $watch = false, $timestamp = false, User $user = NULL)
 	{
 		$pageText = SpecialUpload::getInitialPageText( $desc, $license, $copyStatus, $source );
 		if ( !$this->recordUpload2( $oldver, $desc, $pageText ) ) {
@@ -1159,7 +1344,7 @@ function recordUpload2( $oldver, $comment, $pageText, $props = false, $timestamp
 	 * @return FileRepoStatus object. On success, the value member contains the
 	 *     archive name, or an empty string if it was a new file.
 	 */
-	function publish( $srcPath, $flags = 0 ) {
+	function publish($srcPath, $flags = 0, array $options = []) {
 		$this->lock();
 		$dstRel = $this->getRel();
 		$archiveName = gmdate( 'YmdHis' ) . '!'. $this->getName();
@@ -1229,20 +1414,28 @@ function move( $target ) {
 	 * @param $suppress
 	 * @return FileRepoStatus object.
 	 */
-	function delete( $reason, $suppress = false ) {
-		$this->lock();
-		$batch = new LocalS3FileDeleteBatch( $this, $reason, $suppress );
+	function delete($reason, $suppress = false, $user = null) {
+		//$dbw = $this->repo->getMasterDB();
+		//$batch = new LocalS3FileDeleteBatch( $this, $reason, $suppress );		
+
+		//$this->lock();
+		$batch = new LocalS3FileDeleteBatch( $this, $reason, $suppress );		
 		$batch->addCurrent();
 
 		# Get old version relative paths
 		$dbw = $this->repo->getMasterDB();
+
+		/*
 		$result = $dbw->select( 'oldimage',
 			array( 'oi_archive_name' ),
 			array( 'oi_name' => $this->getName() ) );
 		while ( $row = $dbw->fetchObject( $result ) ) {
 			$batch->addOld( $row->oi_archive_name );
 		}
+		*/
+
 		$status = $batch->execute();
+		
 
 		if ( $status->ok ) {
 			// Update site_stats
@@ -1329,7 +1522,7 @@ function getDescriptionUrl() {
 	 * This is not used by ImagePage for local files, since (among other things)
 	 * it skips the parser cache.
 	 */
-	function getDescriptionText() {
+	function getDescriptionText($lang = false) {
 		global $wgParser;
 		$revision = Revision::newFromTitle( $this->title );
 		if ( !$revision ) return false;
@@ -1339,7 +1532,7 @@ function getDescriptionText() {
 		return $pout->getText();
 	}
 
-	function getDescription() {
+	function getDescription($audience = self::FOR_PUBLIC, User $user = NULL) {
 		$this->load();
 		return $this->description;
 	}
@@ -1407,6 +1600,8 @@ function unlockAndRollback() {
 	 * Return the complete URL of the file
 	 */
 	public function getUrl() {
+		global $s3;
+
 		if ( !isset( $this->url ) ) 
 		{
 			if($this->repo->cloudFrontUrl)
@@ -1414,12 +1609,146 @@ public function getUrl() {
 			else
 				$this->url = $this->repo->getZoneUrl( 'public' ) . '/' . $this->getUrlRel();
 
-			if(! $this->repo->AWS_S3_PUBLIC) 
+			if(!$this->repo->AWS_S3_PUBLIC){
 				$this->url = self::getAuthenticatedURL($this->repo->AWS_S3_BUCKET, $this->repo->directory . '/'  . $this->getUrlRel(), 60*60*24*7 /*week*/, false, $this->repo->AWS_S3_SSL);
+			}
 		}
+
+/* kelvin
+		$d =
+		array(
+		    'Bucket' => $this->repo->AWS_S3_BUCKET,
+		    'Key'    => $key
+		);
+
+		$this->tempPath = tempnam(wfTempDir(), "s3file-");
+		$info = $s3->getObject(
+								$this->repo->AWS_S3_BUCKET,
+								$this->repo->directory . '/'  . $this->getUrlRel(), 
+								$this->tempPath
+							  );
+
+		echo $this->repo->directory . '/'  . $this->getUrlRel();
+		echo "<pre>";
+		print_r($info);
+		echo "</pre>";
+		exit;
+		*/
+
 		wfDebug( __METHOD__ . ": ".print_r($this->url, true)."\n" );
 		return $this->url;
 	}
+
+
+	/*
+	public function generateAndSaveThumb( $tmpFile, $transformParams, $flags ) {
+		global $IP, $wgUploadDirectory, $wgAWS_S3_BUCKET, $wgAWS_BucketDir, $aws_s3_client, $wgUploadBaseUrl;
+		global $wgIgnoreImageErrors;
+
+		$stats = RequestContext::getMain()->getStats();
+
+		$handler = $this->getHandler();
+
+		$normalisedParams = $transformParams;
+		$handler->normaliseParams( $this, $normalisedParams );
+
+		$thumbName = $this->thumbName( $normalisedParams );
+		$thumbUrl = $this->getThumbUrl( $thumbName );
+		$thumbPath = $this->getThumbPath( $thumbName ); // final thumb path
+
+		//S3 determine if thumb is on S3 if not use original
+		//$this->file_existsS3();
+		$tmpThumbPath = $tmpFile->getPath();
+
+		
+		//This only can be activated once the sync is complete and the delete files have been deleted.
+		//This section searches for the thumbpath and if it does not exists
+		if(!file_exists($tmpThumbPath) || filesize($tmpThumbPath) == 0){
+			
+			//Get Path
+			//$s3ThumbPath = str_replace("https://".$wgAWS_S3_BUCKET.".s3.amazonaws.com/","",$thumbUrl);
+			//$temps3 = explode("?",$s3ThumbPath);
+			//$s3ThumbPath = $temps3[0];
+			$s3ThumbPath = str_replace("images/", "", $wgUploadDirectory)."/thumb".str_replace("mwstore://local-backend/local-thumb", "", $thumbPath);
+			$s3FullPath = explode("/", str_replace("images/", "", $wgUploadDirectory)."".str_replace("mwstore://local-backend/local-thumb", "", $thumbPath));
+			unset( $s3FullPath[ count($s3FullPath)-1 ] );
+			$s3FullPath = implode("/", $s3FullPath);
+			
+			if($this->file_existsS3($s3ThumbPath)){
+
+				//$tmpThumbPath = $this->getS3Url($s3ThumbPath); //$thumbUrl;
+				//$thumbUrl = $this->getS3Url($s3ThumbPath); 
+
+			} else if($this->file_existsS3($s3FullPath)){
+				//$tmpThumbPath = $this->getS3Url($s3FullPath); //$thumbUrl;
+				//$thumbUrl = $this->getS3Url($s3FullPath); 
+
+			}
+
+		}
+		/
+
+
+		if ( $handler->supportsBucketing() ) {
+			$this->generateBucketsIfNeeded( $normalisedParams, $flags );
+		}
+
+		$starttime = microtime( true );
+
+		// Actually render the thumbnail...
+		//Add the s3 capability of getting the s3 url to generate new thumbnail if it didnt exists
+		
+		//$thumbUrl = "/opt/bitnami/apache2/htdocs/images/noaccess.png";
+		//$thumb = $handler->doTransform( $image, $dstPath, 		$dstUrl, $params, $flags = 0);
+		
+		//echo $thumbUrl."<br>";
+		
+
+		$thumb = $handler->doTransform( $this , $tmpThumbPath, $thumbUrl, $transformParams );
+
+		$tmpFile->bind( $thumb ); // keep alive with $thumb
+
+		$statTiming = microtime( true ) - $starttime;
+		$stats->timing( 'media.thumbnail.generate.transform', 1000 * $statTiming );
+		
+		
+		//Kelvin
+		
+
+		if ( !$thumb ) { // bad params?
+			$thumb = false;
+
+		} elseif ( $thumb->isError() ) { // transform error
+			// @var $thumb MediaTransformError 
+			$this->lastError = $thumb->toText();
+			// Ignore errors if requested
+			if ( $wgIgnoreImageErrors && !( $flags & self::RENDER_NOW ) ) {
+				$thumb = $handler->getTransform( $this, $tmpThumbPath, $thumbUrl, $transformParams );
+			}
+		} elseif ( $this->repo && $thumb->hasFile() && !$thumb->fileIsSource() ) {
+			// Copy the thumbnail from the file system into storage...
+
+			$starttime = microtime( true );
+
+			$disposition = $this->getThumbDisposition( $thumbName );
+			$status = $this->repo->quickImport( $tmpThumbPath, $thumbPath, $disposition );
+			if ( $status->isOK() ) {
+				$thumb->setStoragePath( $thumbPath );
+			} else {
+				$thumb = $this->transformErrorOutput( $thumbPath, $thumbUrl, $transformParams, $flags );
+			}
+
+			$statTiming = microtime( true ) - $starttime;
+			$stats->timing( 'media.thumbnail.generate.store', 1000 * $statTiming );
+
+			// Give extensions a chance to do something with this thumbnail...
+			Hooks::run( 'FileTransformed', [ $this, $thumb, $tmpThumbPath, $thumbPath ] );
+		}
+
+
+		return $thumb;
+	}
+	*/
 } // LocalS3File class
 
 #------------------------------------------------------------------------------
@@ -1610,6 +1939,16 @@ function doDBDeletes() {
 	 * Run the transaction
 	 */
 	function execute() {
+		global $status;
+
+		$status = new customStatus();
+		$dbw = $this->file->repo->getMasterDB();
+		$status->delete($dbw, $this->file->title->mDbkeyform);
+		$status->good = 1;
+		$status->ok = 1;
+
+		return $status;
+
 		global $wgUseSquid;
 		wfProfileIn( __METHOD__ );
 
@@ -2160,3 +2499,22 @@ function removeNonexistentFiles( $triplets ) {
 		return $filteredTriplets;
 	}
 }
+
+
+
+class customStatus {
+
+	function isOK(){
+		return true;
+	}
+
+	function isGood(){
+		return true;
+	}
+
+	function delete(&$dbw, $title){
+
+		$dbw->query( "DELETE FROM image WHERE img_name = '$title'" );
+	}
+
+}
diff --git a/LocalS3Repo.php b/LocalS3Repo.php
index 9de92c0..92a82bf 100644
--- a/LocalS3Repo.php
+++ b/LocalS3Repo.php
@@ -82,7 +82,7 @@ function newFromArchiveName( $title, $archiveName ) {
 	 * remote operation.
 	 * @return FileRepoStatus
 	 */
-	function cleanupDeletedBatch( $storageKeys ) {
+	function cleanupDeletedBatch(array $storageKeys) {
 		$root = $this->getZonePath( 'deleted' );
 		$dbw = $this->getMasterDB();
 		$status = $this->newGood();
@@ -124,7 +124,7 @@ function cleanupDeletedBatch( $storageKeys ) {
 	 *
 	 * @param $title Title of file
 	 */
-	function checkRedirect( $title ) {
+	function checkRedirect(Title $title) {
 		global $wgMemc;
 
 		if( is_string( $title ) ) {
@@ -242,7 +242,7 @@ function getSharedCacheKey( /*...*/ ) {
 	 *
 	 * @param $title Title of page
 	 */
-	function invalidateImageRedirect( $title ) {
+	function invalidateImageRedirect(Title $title) {
 		global $wgMemc;
 		$memcKey = $this->getSharedCacheKey( 'image_redirect', md5( $title->getDBkey() ) );
 		if ( $memcKey ) {
diff --git a/OldLocalS3File.php b/OldLocalS3File.php
index f68bdf0..7517855 100644
--- a/OldLocalS3File.php
+++ b/OldLocalS3File.php
@@ -201,7 +201,7 @@ function getVisibility() {
 	 * @param $field Integer
 	 * @return bool
 	 */
-	function userCan( $field ) {
+	function userCan($field, User $user = NULL) {
 		if( isset($this->deleted) && ($this->deleted & $field) == $field ) {
 			global $wgUser;
 			$permission = ( $this->deleted & File::DELETED_RESTRICTED ) == File::DELETED_RESTRICTED
diff --git a/README.md b/README.md
index 16b046d..91488ac 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,53 @@
+### LocalSettings.php ###
+
+Below are 2 versions of what should be added to the bottom of your LocalSettings file. Believe the first one will work from v1.21 onwards as much as the second one, as well as the code it is attached to. This repository should be tagged if not.
+
+```php
+/*
+	Modified to work with 1.25.
+	Antony D'Andrea - contactme at antonydandrea dot com
+
+        This also has a couple of bug fixes on the code, but the config below
+        along with the bug fixes definitely works in MediaWiki 1.25.
+*/
+
+// s3 filesystem repo
+$wgUploadDirectory = 'wiki';
+$wgUploadS3Bucket = 'YOUR S3 BUCKET';
+$wgUploadS3SSL = false; // true if SSL should be used
+$wgPublicS3 = true; // true if public, false if authentication should be used
+
+$wgS3BaseUrl = "http".($wgUploadS3SSL?"s":"")."://s3.amazonaws.com/$wgUploadS3Bucket";
+
+//viewing needs a different url from uploading. Uploading doesnt work on the below url and viewing doesnt work on the above one.
+$wgS3BaseUrlView = "http".($wgUploadS3SSL?"s":"")."://".$wgUploadS3Bucket.".s3.amazonaws.com";
+$wgUploadBaseUrl = "$wgS3BaseUrlView/$wgUploadDirectory";
+
+// leave $wgCloudFrontUrl blank to not render images from CloudFront
+$wgCloudFrontUrl = '';//"http".($wgUploadS3SSL?"s":"").'://YOUR_CLOUDFRONT_SUBDOMAIN.cloudfront.net/';
+$wgLocalFileRepo = array(
+        'class' => 'LocalS3Repo',
+        'name' => 's3',
+        'directory' => $wgUploadDirectory,
+        'url' => $wgUploadBaseUrl ? $wgUploadBaseUrl . $wgUploadPath : $wgUploadPath,
+        'urlbase' => $wgS3BaseUrl ? $wgS3BaseUrl : "",
+        'hashLevels' => $wgHashedUploadDirectory ? 2 : 0,
+        'thumbScriptUrl' => $wgThumbnailScriptPath,
+        'transformVia404' => !$wgGenerateThumbnailOnParse,
+        'initialCapital' => $wgCapitalLinks,
+        'deletedDir' => $wgUploadDirectory.'/deleted',
+        'deletedHashLevels' => $wgFileStore['deleted']['hash'],
+        'AWS_ACCESS_KEY' => 'YOUR_AWS_ACCESS_KEY',
+        'AWS_SECRET_KEY' => 'YOUR_AWS_SECRET_KEY',
+        'AWS_S3_BUCKET' => $wgUploadS3Bucket,
+        'AWS_S3_PUBLIC' => $wgPublicS3,
+        'AWS_S3_SSL' => $wgUploadS3SSL,
+        'cloudFrontUrl' => $wgCloudFrontUrl,
+);
+require_once("$IP/extensions/LocalS3Repo/LocalS3Repo.php");
+```
+
+```php
 /*
 	Modified to work with 1.21 and CloudFront.
 	Owen Borseth - owen at borseth dot us
@@ -41,3 +91,4 @@ $wgLocalFileRepo = array(
 );
 require_once("$IP/extensions/LocalS3Repo/LocalS3Repo.php");
 // s3 filesystem repo settings - end
+```
\ No newline at end of file
diff --git a/S3.php b/S3.php
index 401558b..b92072e 100644
--- a/S3.php
+++ b/S3.php
@@ -1227,8 +1227,8 @@ public function getResponse() {
 		curl_setopt($curl, CURLOPT_USERAGENT, 'S3/php');
 
 		if (S3::$useSSL) {
-			curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 1);
-			curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 1);
+			curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 0);
+			curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
 		}
 
 		curl_setopt($curl, CURLOPT_URL, $url);
diff --git a/currentImagesToS3Migration.php b/currentImagesToS3Migration.php
index 7b4a8a5..dd14d47 100644
--- a/currentImagesToS3Migration.php
+++ b/currentImagesToS3Migration.php
@@ -27,7 +27,7 @@ public function execute()
 
 		// In my situation the images were in two different S3 buckets already. It will search these locations to try and find it.
 		// Your images are probably local already, so you may need to modify the code further down to work with local directories.
-		$s3Buckets = array(...);
+		//$s3Buckets = array(...);
 
 		$dbw = wfGetDB( DB_MASTER );