diff --git a/Gruntfile.js b/Gruntfile.js
index 8148437753..20c9c1b758 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -504,6 +504,9 @@ var path           = require('path'),
                             'bower_components/showdown/src/showdown.js',
                             'bower_components/moment/moment.js',
 
+                            'bower_components/jquery-ui/ui/jquery-ui.js',
+                            'bower_components/jquery-file-upload/js/jquery.fileupload.js',
+
                             'core/shared/lib/showdown/extensions/ghostimagepreview.js',
                             'core/shared/lib/showdown/extensions/ghostgfm.js',
                         ]
diff --git a/core/client/assets/lib/uploader.js b/core/client/assets/lib/uploader.js
new file mode 100644
index 0000000000..9f656ea644
--- /dev/null
+++ b/core/client/assets/lib/uploader.js
@@ -0,0 +1,262 @@
+import ghostPaths from 'ghost/utils/ghost-paths';
+
+var UploadUi,
+    upload,
+    Ghost = ghostPaths();
+
+
+UploadUi = function ($dropzone, settings) {
+    var $url = '<div class="js-url"><input class="url js-upload-url" type="url" placeholder="http://"/></div>',
+        $cancel = '<a class="image-cancel js-cancel" title="Delete"><span class="hidden">Delete</span></a>',
+        $progress =  $('<div />', {
+            'class' : 'js-upload-progress progress progress-success active',
+            'role': 'progressbar',
+            'aria-valuemin': '0',
+            'aria-valuemax': '100'
+        }).append($('<div />', {
+            'class': 'js-upload-progress-bar bar',
+            'style': 'width:0%'
+        }));
+
+    $.extend(this, {
+        complete: function (result) {
+            var self = this;
+
+            function showImage(width, height) {
+                $dropzone.find('img.js-upload-target').attr({'width': width, 'height': height}).css({'display': 'block'});
+                $dropzone.find('.fileupload-loading').remove();
+                $dropzone.css({'height': 'auto'});
+                $dropzone.delay(250).animate({opacity: 100}, 1000, function () {
+                    $('.js-button-accept').prop('disabled', false);
+                    self.init();
+                });
+            }
+
+            function animateDropzone($img) {
+                $dropzone.animate({opacity: 0}, 250, function () {
+                    $dropzone.removeClass('image-uploader').addClass('pre-image-uploader');
+                    $dropzone.css({minHeight: 0});
+                    self.removeExtras();
+                    $dropzone.animate({height: $img.height()}, 250, function () {
+                        showImage($img.width(), $img.height());
+                    });
+                });
+            }
+
+            function preLoadImage() {
+                var $img = $dropzone.find('img.js-upload-target')
+                    .attr({'src': '', 'width': 'auto', 'height': 'auto'});
+
+                $progress.animate({'opacity': 0}, 250, function () {
+                    $dropzone.find('span.media').after('<img class="fileupload-loading"  src="' + Ghost.subdir + '/ghost/img/loadingcat.gif" />');
+                    if (!settings.editor) {$progress.find('.fileupload-loading').css({'top': '56px'}); }
+                });
+                $dropzone.trigger('uploadsuccess', [result]);
+                $img.one('load', function () {
+                    animateDropzone($img);
+                }).attr('src', result);
+            }
+            preLoadImage();
+        },
+
+        bindFileUpload: function () {
+            var self = this;
+
+            $dropzone.find('.js-fileupload').fileupload().fileupload('option', {
+                url: Ghost.subdir + '/ghost/upload/',
+                headers: {
+                    'X-CSRF-Token': $('meta[name=\'csrf-param\']').attr('content')
+                },
+                add: function (e, data) {
+                    /*jshint unused:false*/
+                    $('.js-button-accept').prop('disabled', true);
+                    $dropzone.find('.js-fileupload').removeClass('right');
+                    $dropzone.find('.js-url').remove();
+                    $progress.find('.js-upload-progress-bar').removeClass('fail');
+                    $dropzone.trigger('uploadstart', [$dropzone.attr('id')]);
+                    $dropzone.find('span.media, div.description, a.image-url, a.image-webcam')
+                        .animate({opacity: 0}, 250, function () {
+                            $dropzone.find('div.description').hide().css({'opacity': 100});
+                            if (settings.progressbar) {
+                                $dropzone.find('div.js-fail').after($progress);
+                                $progress.animate({opacity: 100}, 250);
+                            }
+                            data.submit();
+                        });
+                },
+                dropZone: settings.fileStorage ? $dropzone : null,
+                progressall: function (e, data) {
+                    /*jshint unused:false*/
+                    var progress = parseInt(data.loaded / data.total * 100, 10);
+                    if (!settings.editor) {$progress.find('div.js-progress').css({'position': 'absolute', 'top': '40px'}); }
+                    if (settings.progressbar) {
+                        $dropzone.trigger('uploadprogress', [progress, data]);
+                        $progress.find('.js-upload-progress-bar').css('width', progress + '%');
+                    }
+                },
+                fail: function (e, data) {
+                    /*jshint unused:false*/
+                    $('.js-button-accept').prop('disabled', false);
+                    $dropzone.trigger('uploadfailure', [data.result]);
+                    $dropzone.find('.js-upload-progress-bar').addClass('fail');
+                    if (data.jqXHR.status === 413) {
+                        $dropzone.find('div.js-fail').text('The image you uploaded was larger than the maximum file size your server allows.');
+                    } else if (data.jqXHR.status === 415) {
+                        $dropzone.find('div.js-fail').text('The image type you uploaded is not supported. Please use .PNG, .JPG, .GIF, .SVG.');
+                    } else {
+                        $dropzone.find('div.js-fail').text('Something went wrong :(');
+                    }
+                    $dropzone.find('div.js-fail, button.js-fail').fadeIn(1500);
+                    $dropzone.find('button.js-fail').on('click', function () {
+                        $dropzone.css({minHeight: 0});
+                        $dropzone.find('div.description').show();
+                        self.removeExtras();
+                        self.init();
+                    });
+                },
+                done: function (e, data) {
+                    /*jshint unused:false*/
+                    self.complete(data.result);
+                }
+            });
+        },
+
+        buildExtras: function () {
+            if (!$dropzone.find('span.media')[0]) {
+                $dropzone.prepend('<span class="media"><span class="hidden">Image Upload</span></span>');
+            }
+            if (!$dropzone.find('div.description')[0]) {
+                $dropzone.append('<div class="description">Add image</div>');
+            }
+            if (!$dropzone.find('div.js-fail')[0]) {
+                $dropzone.append('<div class="js-fail failed" style="display: none">Something went wrong :(</div>');
+            }
+            if (!$dropzone.find('button.js-fail')[0]) {
+                $dropzone.append('<button class="js-fail button-add" style="display: none">Try Again</button>');
+            }
+            if (!$dropzone.find('a.image-url')[0]) {
+                $dropzone.append('<a class="image-url" title="Add image from URL"><span class="hidden">URL</span></a>');
+            }
+//                if (!$dropzone.find('a.image-webcam')[0]) {
+//                    $dropzone.append('<a class="image-webcam" title="Add image from webcam"><span class="hidden">Webcam</span></a>');
+//                }
+        },
+
+        removeExtras: function () {
+            $dropzone.find('span.media, div.js-upload-progress, a.image-url, a.image-upload, a.image-webcam, div.js-fail, button.js-fail, a.js-cancel').remove();
+        },
+
+        initWithDropzone: function () {
+            var self = this;
+            //This is the start point if no image exists
+            $dropzone.find('img.js-upload-target').css({'display': 'none'});
+            $dropzone.removeClass('pre-image-uploader image-uploader-url').addClass('image-uploader');
+            this.removeExtras();
+            this.buildExtras();
+            this.bindFileUpload();
+            if (!settings.fileStorage) {
+                self.initUrl();
+                return;
+            }
+            $dropzone.find('a.image-url').on('click', function () {
+                self.initUrl();
+            });
+        },
+        initUrl: function () {
+            var self = this, val;
+            this.removeExtras();
+            $dropzone.addClass('image-uploader-url').removeClass('pre-image-uploader');
+            $dropzone.find('.js-fileupload').addClass('right');
+            if (settings.fileStorage) {
+                $dropzone.append($cancel);
+            }
+            $dropzone.find('.js-cancel').on('click', function () {
+                $dropzone.find('.js-url').remove();
+                $dropzone.find('.js-fileupload').removeClass('right');
+                self.removeExtras();
+                self.initWithDropzone();
+            });
+
+            $dropzone.find('div.description').before($url);
+
+            if (settings.editor) {
+                $dropzone.find('div.js-url').append('<button class="js-button-accept button-save">Save</button>');
+            }
+
+            $dropzone.find('.js-button-accept').on('click', function () {
+                val = $dropzone.find('.js-upload-url').val();
+                $dropzone.find('div.description').hide();
+                $dropzone.find('.js-fileupload').removeClass('right');
+                $dropzone.find('.js-url').remove();
+                if (val === '') {
+                    $dropzone.trigger('uploadsuccess', 'http://');
+                    self.initWithDropzone();
+                } else {
+                    self.complete(val);
+                }
+            });
+
+            // Only show the toggle icon if there is a dropzone mode to go back to
+            if (settings.fileStorage !== false) {
+                $dropzone.append('<a class="image-upload" title="Add image"><span class="hidden">Upload</span></a>');
+            }
+
+            $dropzone.find('a.image-upload').on('click', function () {
+                $dropzone.find('.js-url').remove();
+                $dropzone.find('.js-fileupload').removeClass('right');
+                self.initWithDropzone();
+            });
+
+        },
+        initWithImage: function () {
+            var self = this;
+            // This is the start point if an image already exists
+            $dropzone.removeClass('image-uploader image-uploader-url').addClass('pre-image-uploader');
+            $dropzone.find('div.description').hide();
+            $dropzone.append($cancel);
+            $dropzone.find('.js-cancel').on('click', function () {
+                $dropzone.find('img.js-upload-target').attr({'src': ''});
+                $dropzone.find('div.description').show();
+                $dropzone.delay(2500).animate({opacity: 100}, 1000, function () {
+                    self.init();
+                });
+
+                $dropzone.trigger('uploadsuccess', 'http://');
+                self.initWithDropzone();
+            });
+        },
+
+        init: function () {
+            var imageTarget = $dropzone.find('img.js-upload-target');
+            // First check if field image is defined by checking for js-upload-target class
+            if (!imageTarget[0]) {
+                // This ensures there is an image we can hook into to display uploaded image
+                $dropzone.prepend('<img class="js-upload-target" style="display: none"  src="" />');
+            }
+            $('.js-button-accept').prop('disabled', false);
+            if (imageTarget.attr('src') === '' || imageTarget.attr('src') === undefined) {
+                this.initWithDropzone();
+            } else {
+                this.initWithImage();
+            }
+        }
+    });
+};
+
+
+upload = function (options) {
+    var settings = $.extend({
+        progressbar: true,
+        editor: false,
+        fileStorage: true
+    }, options);
+    return this.each(function () {
+        var $dropzone = $(this),
+            ui;
+
+        ui = new UploadUi($dropzone, settings);
+        ui.init();
+    });
+};
+
+export default upload;