diff --git a/server/core/Image.php b/server/core/Image.php
index 3001eea..4025595 100644
--- a/server/core/Image.php
+++ b/server/core/Image.php
@@ -1,7 +1,4 @@
 <?php
-
-//require 'CoreInterface.php';
-
 /**
 * File containing the Image Class.
 *
@@ -12,16 +9,18 @@
 * 
 * @todo Complete the functions with errors detection and finish the descriptions
 */
- 
- 
+use OpenStack\Common\Error\BadResponseError;
+use OpenStack\Common\Error\BaseError;
+use OpenStack\Common\Error\NotImplementedError;
+use OpenStack\Common\Error\UserInputError;
+
 /**
 * Image Class of the back-end application
 *
 * ADD CLASS DESCRIPTION
 *
 */
-class image{ 
-	//implements Core
+class image implements Core{ 
 
 	/** @var App $app protected, contains the main app object */
 	protected $app;
@@ -29,10 +28,6 @@ class image{
 	/** @var OpenStack\Identity $libClass protected, contains the library Identity object */
 	protected $libClass;
 	
-	/** @var array $actions protected, contains the functions which can be call by the front-end */
-	protected $actions = array();
-
-	
 	/**
 	* Image constructor
 	*
@@ -43,12 +38,36 @@ class image{
 	* @return Image
 	*/
 	public function __construct($app){
-		$this->app = $app;
-		$this->libClass = $app->getLibClass("Image");
+		if(!isset($app)){
+			$this->app->setOutput("Error", "Incorrect parameter");
+		}
+		try{
+			$this->app = $app;
+			$this->libClass = $app->getLibClass("Image");
+		}catch(BadResponseError $e){
+			$this->app->getErrorInstance()->BadResponseHandler($e);
+        }catch(UserInputError $e){
+			$this->app->getErrorInstance->UserInputHandler($e);
+        }catch(BaseError $e){
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+        }catch(NotImplementedError $e){
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        }
 	}
 
 
-	
+	/**
+	* Execute an action
+	*
+	* @param String $action name of another function of this class
+	*
+	* @return void
+	*/
+	public function action($action){
+		
+		 $this->{$action.""}();
+		
+	}
 
 	/**
 	* Details about an image
@@ -57,55 +76,96 @@ class image{
 	*	options for the image creation
 	*
 	**/
-	public function create_image(array $opt){
-		// VOIR SI MAUVAIS TYPE
-		$options = Array();
-		if(isset($opt['name'])){ // string, rendre le nom obligatoire, vérifier nom pas déjà pris
-		}
-		else{
-			//ERROR
-		}
-		if(isset($opt['id'])){ // UUID : nnnnnnnn-nnnn-nnnn-nnnn-nnnnnnnnnnnn
-			$options['id'] = $opt['id'];
-		}
-		if(isset($opt['visibility'])){ // public, private
-			$options['visibility'] = $opt['visibility'];
-		}
-		if(isset($opt['tags'])){ // list
-			$options['tags'] = $opt['tags'];
-		}
-		if(isset($opt['containerFormat'])){ // string : ami, ari, aki, bare, ovf, ova, docker
-			$options['containerFormat'] = $opt['containerFormat'];
-		}
-		if(isset($opt['diskFormat'])){ // string : ami, ari, aki, vhd, vmdk, raw, qcow2, vdi, iso
-			$options['diskFormat'] = $opt['diskFormat'];
-		}
-		if(isset($opt['minDisk'])){ //int
-			$options['minDisk'] = $opt['minDisk'];
-		}
-		if(isset($opt['minRam'])){ // int
-			$options['minRam'] = $opt['minRam'];
-		}
-		if(isset($opt['protected'])){ // boolean
-			$options['protected'] = $opt['protected'];
-		}
-		if(isset($opt['properties'])){ // type dict ?
-			$options['properties'] = $opt['properties'];
-		}	
+	private function createImage(array $opt){
 
-		$image = $this->oidentity->createImage($options);
+		if(!isset($opt)){
+			$this->app->setOutput("Error", "Incorrect parameter");
+		}
 
+
+		try{	
+			// VOIR SI MAUVAIS TYPE
+			$options = Array();
+			if(isset($opt['name'])){ // if the image name already exists -> error
+				$imagesList = listImage();
+				if(isset($images)){
+    				foreach($imagesList as $image){
+    					if(strcmp($image->name, $opt['name']) == 0){
+
+    					}
+    				}
+    			}
+
+			}
+			else{
+				$this->app->setOutput("Error", "Image name already exists");
+			}
+			if(isset($opt['id'])){ // UUID : nnnnnnnn-nnnn-nnnn-nnnn-nnnnnnnnnnnn
+				if($this->libClass->getImage($opt['id']) != null){ // if the id already exists -> error
+
+				}
+				$options['id'] = $opt['id'];
+			}
+			if(isset($opt['visibility'])){ // public, private
+				$options['visibility'] = $opt['visibility'];
+			}
+			if(isset($opt['tags'])){ // list
+				$options['tags'] = $opt['tags'];
+			}
+			if(isset($opt['containerFormat'])){ // string : ami, ari, aki, bare, ovf, ova, docker
+				$options['containerFormat'] = $opt['containerFormat'];
+			}
+			if(isset($opt['diskFormat'])){ // string : ami, ari, aki, vhd, vmdk, raw, qcow2, vdi, iso
+				$options['diskFormat'] = $opt['diskFormat'];
+			}
+			if(isset($opt['minDisk'])){ //int
+				$options['minDisk'] = $opt['minDisk'];
+			}
+			if(isset($opt['minRam'])){ // int
+				$options['minRam'] = $opt['minRam'];
+			}
+			if(isset($opt['protected'])){ // boolean
+				$options['protected'] = $opt['protected'];
+			}
+			if(isset($opt['properties'])){ // type dict ?
+				$options['properties'] = $opt['properties'];
+			}	
+
+			$image = $this->libClass->createImage($options);
+		}catch(BadResponseError $e){
+			$this->app->getErrorInstance()->BadResponseHandler($e);
+        }catch(UserInputError $e){
+			$this->app->getErrorInstance->UserInputHandler($e);
+        }catch(BaseError $e){
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+        }catch(NotImplementedError $e){
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        }
 		return $image;
 	}
 
-	/*
-	* List images
+	/**
+	* List the images of the server
+	*
+	* @return the list with all images on the server
 	*/
-	public function list_images(){
-		// vérifier si au moins une image
-		$service = $this->oidentity;
-		$images = $service->listImages();
-		return $images;
+	private function listImage(){
+		try{
+			$l = $this->libClass->listImages();
+			if(!isset($l)){ // if the list is empty there is no images
+				$this->app->setOutput("Error", "No image");
+			}
+		}catch(BadResponseError $e){
+			$this->app->getErrorInstance()->BadResponseHandler($e);
+        }catch(UserInputError $e){
+			$this->app->getErrorInstance->UserInputHandler($e);
+        }catch(BaseError $e){
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+        }catch(NotImplementedError $e){
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        }
+		return $l;
+
 	}
 
 	/**
@@ -115,11 +175,27 @@ class image{
 	*	identifier of the image
 	*
 	**/
-	public function image_details($id){
-		//vérifier existence image
-		$service = $this->oidentity;
-		$image = $service->getImage($id);
-		return $image;
+	private function detailsImage($id){
+		if(!isset($id)){
+			// Renvoyer erreur 
+		}
+		try{
+			$service = $this->libClass;
+			$image = $service->getImage($id);
+			if($image == null){ // if the image don't exists -> error
+				$this->app->setOutput("Error", "Image doesn't exist");
+			}
+			
+			return $image;
+		}catch(BadResponseError $e){
+			$this->app->getErrorInstance()->BadResponseHandler($e);
+        }catch(UserInputError $e){
+			$this->app->getErrorInstance->UserInputHandler($e);
+        }catch(BaseError $e){
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+        }catch(NotImplementedError $e){
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        }
 	}
 
 	/**
@@ -131,33 +207,53 @@ class image{
 	* @param array $opt
 	*	options for the image creation
 	**/
-	public function update_image($id, array $opt){
-		//vérifier existence image
-		$service = $this->oidentity;
-		$image = $service->getImage($id);
-		$options = Array();
+	private function updateImage($id, array $opt){
+		if(!isset($id)){
+			$this->app->setOutput("Error", "Incorrect id parameter"); 
+		}
+		if(!isset($opt)){
+			$this->app->setOutput("Error", "Incorrect opt parameter");
+		}
 
-		// Voir vérification des types
-		if(isset($opt['name'])){ //string
-			$options['name'] = $opt['name'];
-		}
-		if(isset($opt['minDisk'])){ //int
-			$options['minDisk'] = $opt['minDisk'];
-		}
-		if(isset($opt['minRam'])){ // int
-			$options['minRam'] = $opt['minRam'];
-		}
-		if(isset($opt['protected'])){ // boolean
-			$options['protected'] = $opt['protected'];
-		}
-		if(isset($opt['visibility'])){ // public, private
-			$options['visibility'] = $opt['visibility'];
-		}
-		if(isset($opt['tags'])){ // list
-			$options['tags'] = $opt['tags'];
-		}
-		$image->update($options);
+		try{
+			//vérifier existence image
+			$service = $this->libClass;
+			$image = $service->getImage($id);
+			if($image == null){ // if the image don't exists -> error
+				$this->app->setOutput("Error", "Image doesn't exist");
+			}
 
+			$options = Array();
+
+			// Voir vérification des types
+			if(isset($opt['name'])){ //string
+				$options['name'] = $opt['name'];
+			}
+			if(isset($opt['minDisk'])){ //int
+				$options['minDisk'] = $opt['minDisk'];
+			}
+			if(isset($opt['minRam'])){ // int
+				$options['minRam'] = $opt['minRam'];
+			}
+			if(isset($opt['protected'])){ // boolean
+				$options['protected'] = $opt['protected'];
+			}
+			if(isset($opt['visibility'])){ // public, private
+				$options['visibility'] = $opt['visibility'];
+			}
+			if(isset($opt['tags'])){ // list
+				$options['tags'] = $opt['tags'];
+			}
+			$image->update($options);
+		}catch(BadResponseError $e){
+			$this->app->getErrorInstance()->BadResponseHandler($e);
+        }catch(UserInputError $e){
+			$this->app->getErrorInstance->UserInputHandler($e);
+        }catch(BaseError $e){
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+        }catch(NotImplementedError $e){
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        }
 		return $image;
 	}
 
@@ -167,11 +263,30 @@ class image{
 	* @param string $id
 	*	identifier of the image
 	**/
-	public function delete_image($id){
+	private function deleteImage($id){
 		// si protected = true, demander de le mettre a false
 		// vérifier existence image
-		$service = $this->oidentity;
-		$service->getImage($id)->delete();
+		if(!isset($id)){
+			$this->app->setOutput("Error", "Image doesn't exist");
+		}
+
+		try{
+			$service = $this->libClass;
+			$image = $this->libClass->getImage($id);
+			if($image == null){ // if the image don't exists -> error
+				$this->app->setOutput("Error", "Image doesn't exist");
+			}
+			$image->delete();
+		}catch(BadResponseError $e){
+			$this->app->getErrorInstance()->BadResponseHandler($e);
+        }catch(UserInputError $e){
+			$this->app->getErrorInstance->UserInputHandler($e);
+        }catch(BaseError $e){
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+        }catch(NotImplementedError $e){
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        }
+		
 	}
 
 	/**
@@ -180,11 +295,27 @@ class image{
 	* @param string $id
 	*	identifier of the image
 	**/
-	public function reactivate_image($id){
-		// vérifier existence image
-		$service = $this->oidentity;
-		$image = $service->getImage($id);
-		$image->reactivate();
+	private function reactivateImage($id){
+		if(!isset($id)){
+			$this->app->setOutput("Error", "Incorrect parameter");
+		}
+		try{
+			// vérifier existence image
+			$service = $this->libClass;
+			$image = $service->getImage($id);
+			if($image == null){ // if the image don't exists -> error
+				$this->app->setOutput("Error", "Image doesn't exist");
+			}
+			$image->reactivate();
+		}catch(BadResponseError $e){
+			$this->app->getErrorInstance()->BadResponseHandler($e);
+        }catch(UserInputError $e){
+			$this->app->getErrorInstance->UserInputHandler($e);
+        }catch(BaseError $e){
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+        }catch(NotImplementedError $e){
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        }
 	}
 
 	/**
@@ -193,11 +324,27 @@ class image{
 	* @param string $id
 	*	identifier of the image
 	**/
-	public function desactivate_image($id){
-		// vérifier existence image
-		$service = $this->oidentity;
-		$image = $service->getImage($id);
-		$image->deactivate();
+	private function desactivateImage($id){
+		if(!isset($id)){
+			$this->app->setOutput("Error", "Incorrect parameter");
+		}
+		try{
+			// vérifier existence image
+			$service = $this->libClass;
+			$image = $service->getImage($id);
+			if($image == null){ // if the image don't exists -> error
+				$this->app->setOutput("Error", "Image doesn't exist");
+			}
+			$image->deactivate();
+		}catch(BadResponseError $e){
+			$this->app->getErrorInstance()->BadResponseHandler($e);
+        }catch(UserInputError $e){
+			$this->app->getErrorInstance->UserInputHandler($e);
+        }catch(BaseError $e){
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+        }catch(NotImplementedError $e){
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        }
 	}
 
 	/**
@@ -209,12 +356,31 @@ class image{
 	* @param string $file_name
 	*	path of the image
 	**/
-	public function upload_image($id, $file_name){
-		// vérifier existence image
-		$service = $this->oidentity;
-		$image  = $service->getImage($id);
-		$stream = \GuzzleHttp\Psr7\stream_for(fopen($file_name, 'r')); // A VOIR
-		$image->uploadData($stream);
+	private function uploadImage($id, $file_name){
+		if(!isset($id)){
+			$this->app->setOutput("Error", "Incorrect id parameter");
+		}
+		if(!isset($file_name)){
+			$this->app->setOutput("Error", "Incorrect file_name parameter");
+		}
+		try{
+			// vérifier existence image
+			$service = $this->libClass;
+			$image  = $service->getImage($id);
+			if($image == null){ // if the image don't exists -> error
+				$this->app->setOutput("Error", "Image doesn't exist");
+			}
+			$stream = \GuzzleHttp\Psr7\stream_for(fopen($file_name, 'r'));
+			$image->uploadData($stream);
+		}catch(BadResponseError $e){
+			$this->app->getErrorInstance()->BadResponseHandler($e);
+        }catch(UserInputError $e){
+			$this->app->getErrorInstance->UserInputHandler($e);
+        }catch(BaseError $e){
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+        }catch(NotImplementedError $e){
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        }
 	}
 
 	/**
@@ -223,12 +389,28 @@ class image{
 	* @param string $id
 	*	identifier of the image
 	**/
-	public function download_image($id){
-		// vérifier existence image 
-		$service = $this->oidentity;
-		$image  = $service->getImage($id);
-		$stream = $image->downloadData();
-		return $stream;
+	private function downloadImage($id){
+		if(!isset($id)){
+			$this->app->setOutput("Error", "Incorrect parameter");
+		}
+		try{
+			// vérifier existence image 
+			$service = $this->libClass;
+			$image  = $service->getImage($id);
+			if($image == null){ // if the image don't exists -> error
+				$this->app->setOutput("Error", "Image doesn't exist");
+			}
+			$stream = $image->downloadData();
+		}catch(BadResponseError $e){
+			$this->app->getErrorInstance()->BadResponseHandler($e);
+        }catch(UserInputError $e){
+			$this->app->getErrorInstance->UserInputHandler($e);
+        }catch(BaseError $e){
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+        }catch(NotImplementedError $e){
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        }
+        return $stream;
 	}
 
 	/**
@@ -240,12 +422,30 @@ class image{
 	* @param string $member_id
 	*	identifier of the member
 	**/
-	public function add_member($image_id, $member_id){
-		// vérifier existence image
-		// on doit être le proprio de l'image
-		// vérifier membre existe
-		$service = $this->oidentity;		
-		$member_id = $service>getImage($image_id)->addMember($member_id);
+	private function addMemberImage($image_id, $member_id){
+		if(!isset($image_id)){
+			$this->app->setOutput("Error", "Incorrect parameter image_id");
+		}
+		if(!isset($member_id)){
+			$this->app->setOutput("Error", "Incorrect parameter member_id");
+		}
+		try{
+			$service = $this->libClass;	
+
+			$image  = $service->getImage($id);
+			if($image == null){ // if the image don't exists -> error
+				$this->app->setOutput("Error", "Image doesn't exist");
+			}
+			$member_id = $image->addMember($member_id);
+		}catch(BadResponseError $e){
+			$this->app->getErrorInstance()->BadResponseHandler($e);
+        }catch(UserInputError $e){
+			$this->app->getErrorInstance->UserInputHandler($e);
+        }catch(BaseError $e){
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+        }catch(NotImplementedError $e){
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        }
 	}
 
 	
@@ -255,11 +455,33 @@ class image{
 	* @param string $image_id
 	*	identifier of the image
 	**/
-	public function list_member($image_id, $member_id){
-		// vérifier existence image
-		$service = $this->oidentity;
-		$image = $service->getImage($image_id);
-		$members = $image->listMembers();
+	private function listMemberImage($image_id, $member_id){
+		if(!isset($image_id)){
+			$this->app->setOutput("Error", "Incorrect parameter image_id");
+		}
+		if(!isset($member_id)){
+			$this->app->setOutput("Error", "Incorrect parameter member_id"); 
+		}
+		try{
+			// vérifier existence image
+			$service = $this->libClass;
+			$image = $service->getImage($image_id);
+			if($image == null){ // if the image don't exists -> error
+				$this->app->setOutput("Error", "Image doesn't exist"); 
+			}
+			$members = $image->listMembers();
+			if($member == null){ // if the image don't exists -> error
+				$this->app->setOutput("Error", "No member");
+			}
+		}catch(BadResponseError $e){
+			$this->app->getErrorInstance()->BadResponseHandler($e);
+        }catch(UserInputError $e){
+			$this->app->getErrorInstance->UserInputHandler($e);
+        }catch(BaseError $e){
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+        }catch(NotImplementedError $e){
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        }
 		return $members;
 	}
 
@@ -272,12 +494,37 @@ class image{
 	* @param string $member_id
 	*	identifier of the member
 	**/
-	public function detail_member($image_id, $member_id){
-		// vérifier existence image
-		// on doit être le proprio de l'image
-		// vérifier membre existe
-		$service = $this->oidentity;		
-		$member = $service>getImage($image_id)->getMember($member_id);
+	private function detailMemberImage($image_id, $member_id){
+		if(!isset($image_id)){
+			$this->app->setOutput("Error", "Incorrect parameter image_id"); 
+		}
+		if(!isset($member_id)){
+			$this->app->setOutput("Error", "Incorrect parameter member_id");
+		}
+		try{
+			// vérifier existence image
+			// on doit être le proprio de l'image
+			// vérifier membre existe
+			$service = $this->libClass;	
+
+			$image  = $service->getImage($id);
+			if($image == null){ // if the image don't exists -> error
+				$this->app->setOutput("Error", "Image doesn't exist");
+			}
+
+			$member = $image->getMember($member_id);
+			if($member == null){ // if the member don't exists -> error
+				$this->app->setOutput("Error", "Member doesn't exist");
+			}
+		}catch(BadResponseError $e){
+			$this->app->getErrorInstance()->BadResponseHandler($e);
+        }catch(UserInputError $e){
+			$this->app->getErrorInstance->UserInputHandler($e);
+        }catch(BaseError $e){
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+        }catch(NotImplementedError $e){
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        }
 		return $member;
 	}
 	
@@ -290,12 +537,34 @@ class image{
 	* @param string $member_id
 	*	identifier of the member
 	**/
-	public function remove_member($image_id, $member_id){
-		// vérifier existence image
-		// on doit être le proprio de l'image
-		// vérifier membre existe
-		$service = $this->oidentity;		
-		$service>getImage($image_id)->getMember($member_id)->delete();
+	private function removeMemberImage($image_id, $member_id){
+		if(!isset($image_id)){
+			$this->app->setOutput("Error", "Incorrect parameter image_id"); 
+		}
+		if(!isset($member_id)){
+			$this->app->setOutput("Error", "Incorrect parameter member_id");
+		}
+		try{
+			$service = $this->libClass;	
+
+			$image  = $service->getImage($id);
+			if($image == null){ // if the image don't exists -> error
+				$this->app->setOutput("Error", "Image doesn't exist");
+			}	
+			$member = $image->getMember($member_id);
+			if($member == null){ // if the image don't exists -> error
+				$this->app->setOutput("Error", "Member doesn't exist");
+			}
+			$member->delete();
+		}catch(BadResponseError $e){
+			$this->app->getErrorInstance()->BadResponseHandler($e);
+        }catch(UserInputError $e){
+			$this->app->getErrorInstance->UserInputHandler($e);
+        }catch(BaseError $e){
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+        }catch(NotImplementedError $e){
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        }
 	}
 
 	/**
@@ -310,13 +579,35 @@ class image{
 	* @param string $status
 	*	new status for the member
 	**/
-	public function update_member($image_id, $member_id, $status){
-		// vérifier existence image
-		// on doit être le proprio de l'image
-		// vérifier membre existe
-		$service = $this->oidentity;		
-		$member = $service>getImage($image_id)->getMember($member_id)->updateStatus($status);
+	private function updateMemberImage($image_id, $member_id, $status){
+		if(!isset($image_id)){
+			$this->app->setOutput("Error", "Incorrect parameter image_id");
+		}
+		if(!isset($member_id)){
+			$this->app->setOutput("Error", "Incorrect parameter member_id");
+		}
+		try{
+			$service = $this->libClass;		
+
+			$image  = $service->getImage($id);
+			if($image == null){ // if the image don't exists -> error
+				$this->app->setOutput("Error", "Image doesn't exist");
+			}
+			$member = $image->getMember($member_id);
+			if($member == null){ // if the member don't exists -> error
+				$this->app->setOutput("Error", "Member doesn't exist");
+			}
+			$member->updateStatus($status);
+		}catch(BadResponseError $e){
+			$this->app->getErrorInstance()->BadResponseHandler($e);
+        }catch(UserInputError $e){
+			$this->app->getErrorInstance->UserInputHandler($e);
+        }catch(BaseError $e){
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+        }catch(NotImplementedError $e){
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        }
 	}
 
 }
-?> 
+?>
\ No newline at end of file