diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..a6b719c
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,9 @@
+FROM python
+
+WORKDIR /usr/src/app
+
+COPY ./src ./
+
+RUN pip install -r requirements.txt
+
+CMD "python" "./app.py"
diff --git a/src/api/get.py b/src/api/get.py
index 412b8b1..97a6bb9 100644
--- a/src/api/get.py
+++ b/src/api/get.py
@@ -86,7 +86,9 @@ class addFile(Resource):
         if client.addMeme(fileContents=file,
                           name=fileName,
                           tags=tags):
-            return {"message" : "sucess"}
+            return {"message" : "success", "sucess" : True}
+        else:
+            return {"message" : "failure", "success" : False}, 500
 
 
 
diff --git a/src/app.py b/src/app.py
index dda269f..7efcc3a 100755
--- a/src/app.py
+++ b/src/app.py
@@ -8,10 +8,11 @@ import logging
 
 logging.basicConfig(level=logging.DEBUG)
 
-isDebug = True
+isDebug = bool(os.environ.get('DEBUG', False))
+port = int(os.environ.get('PORT', 5000))
 
 app = Flask(__name__)
 
 api.init_app(app)
 
-app.run(debug=isDebug)
+app.run(debug=isDebug, host='0.0.0.0', port=port)
diff --git a/requirements.txt b/src/requirements.txt
similarity index 100%
rename from requirements.txt
rename to src/requirements.txt
diff --git a/src/s3Client.py b/src/s3Client.py
index a80504a..79e539a 100644
--- a/src/s3Client.py
+++ b/src/s3Client.py
@@ -87,6 +87,7 @@ class Client:
             self.client = client
         else:
             raise Exception("Improper object passed for client!")
+        self.getCurrentMemeList(force=True)
 
     def getCurrentMemeList(self, force=False):
         """
@@ -135,8 +136,8 @@ class Client:
                                         tags=tags,
                                         part_size=10*1024*1024)
         if result.etag in self.memesToMd5:
-            logger.info('Uploaded meme named ' + name + ' already exists')
-            client.remove_object(bucket_name=S3_BUCKET,
+            logging.info('Uploaded meme named ' + name + ' already exists')
+            self.client.remove_object(bucket_name=S3_BUCKET,
                                  object_name=name)
             return False
         else: