diff --git a/Images/3f7e345e-5e2a-46b6-8f5f-123c4fa15943 b/Images/3f7e345e-5e2a-46b6-8f5f-123c4fa15943
deleted file mode 100644
index 40178c9..0000000
Binary files a/Images/3f7e345e-5e2a-46b6-8f5f-123c4fa15943 and /dev/null differ
diff --git a/Images/44660795-703c-40fb-ae3f-120134152d58.png b/Images/44660795-703c-40fb-ae3f-120134152d58.png
deleted file mode 100644
index 742306c..0000000
Binary files a/Images/44660795-703c-40fb-ae3f-120134152d58.png and /dev/null differ
diff --git a/Images/62e7de8a-914e-4f0d-af01-2e372f661dad b/Images/62e7de8a-914e-4f0d-af01-2e372f661dad
deleted file mode 100644
index 40178c9..0000000
Binary files a/Images/62e7de8a-914e-4f0d-af01-2e372f661dad and /dev/null differ
diff --git a/Images/a52f137d-0e13-48ac-8e51-55cb96fb2098 b/Images/a52f137d-0e13-48ac-8e51-55cb96fb2098
deleted file mode 100644
index 40178c9..0000000
Binary files a/Images/a52f137d-0e13-48ac-8e51-55cb96fb2098 and /dev/null differ
diff --git a/Images/c3948c16-946b-4bfe-b407-9b2ad3e1f892png b/Images/c3948c16-946b-4bfe-b407-9b2ad3e1f892png
deleted file mode 100644
index 742306c..0000000
Binary files a/Images/c3948c16-946b-4bfe-b407-9b2ad3e1f892png and /dev/null differ
diff --git a/Images/d77263ed-64cb-4dd5-a248-3f9eb637827a b/Images/d77263ed-64cb-4dd5-a248-3f9eb637827a
deleted file mode 100644
index 742306c..0000000
Binary files a/Images/d77263ed-64cb-4dd5-a248-3f9eb637827a and /dev/null differ
diff --git a/package.json b/package.json
index 0c71834..460ee1c 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
     "express": "^4.14.0",
     "gcloud": "^0.36.0",
     "geolib": "^2.0.21",
+    "imgur-node-api": "^0.1.0",
     "node-uuid": "^1.4.7"
   }
 }
diff --git a/server/fileRouter.js b/server/fileRouter.js
index 06a41d4..76a0928 100644
--- a/server/fileRouter.js
+++ b/server/fileRouter.js
@@ -4,6 +4,8 @@ var utils = require('./utils');
 // var bucket = require('./storageManager');
 var uuid = require('node-uuid');
 var fs = require('fs');
+var imgur = require('imgur-node-api');
+imgur.setClientID('d694242fc19e1a8');
 
 var gcloud = require('gcloud');
 var path = require('path');
@@ -27,14 +29,9 @@ router.post('/upload', (req, res) => {
   var image_name = uuid.v4() + '.' + file_ending;
   var file_path = path.join(__dirname, '..', '/Images/', image_name);
 
-  // //Permissions to file
-  // file.acl.add({
-  //   entity: 'allUsers',
-  //   role: gcs.acl.READER_ROLE
-  // }, function (err, aclObject) {
   var data = req.body.image.replace(/^data:image\/\w+;base64,/, '');
   // var fd = fs.openSync(path.join(__dirname, '..', '/Images/', image_name), 'w');
-
+  //
   fs.writeFile(file_path, data, {
     encoding: 'base64'
   }, function (err) {
@@ -45,30 +42,21 @@ router.post('/upload', (req, res) => {
         image_url: null
       });
     else {
-      res.send({
-        status: "OK",
-        image_url: "http://thesocialnotework-api.appspot.com/file/image/" + image_name
+      imgur.upload(file_path, function (err, _res) {
+        console.log(_res.data.link);
+        res.send({
+          status: 'OK',
+          image_url: _res.data.link
+        });
       });
     }
-
-    // });
   });
+  //
 
 
+  // });
+  // });
 
-  // fs.createReadStream('/Users/stephen/Photos/birthday-at-the-zoo/panda.jpg')
-  //   .pipe(file.createWriteStream({
-  //     metadata: {
-  //       contentType: 'image/jpeg',
-  //       metadata: {
-  //         custom: 'metadata'
-  //       }
-  //     }
-  //   }))
-  //   .on('error', function(err) {})
-  //   .on('finish', function() {
-  //     // The file upload is complete.
-  //   });
 });
 
 module.exports = router;
diff --git a/server/noteRouter.js b/server/noteRouter.js
index 0f2cad4..a1bf429 100644
--- a/server/noteRouter.js
+++ b/server/noteRouter.js
@@ -131,6 +131,7 @@ router.get('/all', (req, res) => {
             notes.push(n);
           });
         }
+        notes = notes.sort(utils.sort); //SORT BY TIME _ LATEST FIRST
         setTimeout(() => {
           res.send({
             status: "OK",
@@ -218,6 +219,7 @@ router.post('/getPublic', (req, res) => {
           if (Number(n.owner_id) !== Number(req.body.id)) return true;
           return false;
         });
+        notes = notes.sort(utils.sort); //SORT BY TIME _ LATEST FIRST
         if (req.body.filter) {
           if (req.body.filter.location) {
             notes = notes.filter((note) => {
diff --git a/server/server.js b/server/server.js
index c91d0ed..f731c3a 100644
--- a/server/server.js
+++ b/server/server.js
@@ -15,7 +15,13 @@ class Server {
     }));
 
     // parse application/json
-    this.app.use(bodyParser.json());
+    this.app.use(bodyParser.json({
+      limit: '50mb'
+    }));
+    this.app.use(bodyParser.urlencoded({
+      limit: '50mb',
+      extended: true
+    }));
     this.app.use('/api', api);
     this.app.use('/file/image/', express.static('Images'));
 
diff --git a/server/userRouter.js b/server/userRouter.js
index 679196a..cdaada8 100644
--- a/server/userRouter.js
+++ b/server/userRouter.js
@@ -17,6 +17,7 @@ router.post('/upsert', (req, res) => {
       if (err) {
         utils.response_500(res, "DB Error");
       } else {
+        utils.clearCash();
         entity.data.email = req.body.email || entity.data.email;
         entity.data.avatar = req.body.avatar || entity.data.avatar;
         entity.data.password = req.body.password || entity.data.password;
diff --git a/server/utils.js b/server/utils.js
index e6ac1fb..b2233c0 100644
--- a/server/utils.js
+++ b/server/utils.js
@@ -3,8 +3,14 @@ var avatars = {};
 setInterval(() => {
   console.log('Clearing Cash');
   avatars = {};
-}, 10 * 60 * 1000);
+}, 3 * 60 * 1000);
 module.exports = {
+  clearCash: () => {
+    avatars = {};
+  },
+  sort: (a, b) => {
+    return b.created_at - a.created_at;
+  },
   response_400: (res, example, msg) => {
     res.statusCode = 400;
     var r = {