diff --git a/Modules/BetterCms.Module.Viddler/BetterCms.Module.Viddler.csproj b/Modules/BetterCms.Module.Viddler/BetterCms.Module.Viddler.csproj
index 6f80b5c6d..7fc45b23d 100644
--- a/Modules/BetterCms.Module.Viddler/BetterCms.Module.Viddler.csproj
+++ b/Modules/BetterCms.Module.Viddler/BetterCms.Module.Viddler.csproj
@@ -119,6 +119,8 @@
     <Compile Include="Command\SaveVideos\SaveVideosCommand.cs" />
     <Compile Include="Command\SaveVideos\SaveVideosRequest.cs" />
     <Compile Include="Command\SaveVideos\SaveVideosResponse.cs" />
+    <Compile Include="Command\SaveVideo\SaveVideoCommand.cs" />
+    <Compile Include="Command\SaveVideo\SaveVideoRequest.cs" />
     <Compile Include="Command\UplaodVideos\GetVideoUploadCommand.cs" />
     <Compile Include="Command\UplaodVideos\GetVideoUploadRequest.cs" />
     <Compile Include="Command\ViddlerData\GetViddlerDataForUploadCommand.cs" />
diff --git a/Modules/BetterCms.Module.Viddler/Command/SaveVideo/SaveVideoCommand.cs b/Modules/BetterCms.Module.Viddler/Command/SaveVideo/SaveVideoCommand.cs
new file mode 100644
index 000000000..bf9eb6577
--- /dev/null
+++ b/Modules/BetterCms.Module.Viddler/Command/SaveVideo/SaveVideoCommand.cs
@@ -0,0 +1,46 @@
+using System;
+
+using BetterCms.Core.Mvc.Commands;
+using BetterCms.Module.MediaManager.Models;
+using BetterCms.Module.Root.Mvc;
+using BetterCms.Module.Viddler.Models;
+using BetterCms.Module.Viddler.Services;
+
+namespace BetterCms.Module.Viddler.Command.Videos.SaveVideos
+{
+    internal class SaveVideoCommand : CommandBase, ICommand<SaveVideoRequest, Video>
+    {
+        private readonly IViddlerService viddlerService;
+
+        public SaveVideoCommand(IViddlerService viddlerService)
+        {
+            this.viddlerService = viddlerService;
+        }
+
+        public Video Execute(SaveVideoRequest request)
+        {
+            var sesionId = viddlerService.GetSessionId();
+            var data = viddlerService.GetVideoDetails(sesionId, request.VideoId);
+            var video = new Video
+                {
+                    OriginalFileName = data.Title,
+                    OriginalFileExtension = string.Empty,
+                    FileUri = new Uri(viddlerService.GetPlayerUrl(data.Id)),
+                    PublicUrl = viddlerService.GetVideoUrl(data.Id),
+                    Size = data.Length,
+                    IsTemporary = true,
+                    IsUploaded = data.IsReady,
+                    Title = data.Title,
+                    Type = MediaType.Video,
+                    ContentType = MediaContentType.File,
+                    PublishedOn = DateTime.Now,
+                    Description = data.Description,
+                    VideoId = data.Id,
+                    ThumbnailUrl = data.ThumbnailUrl,
+                };
+            Repository.Save(video);
+            UnitOfWork.Commit();
+            return video;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Modules/BetterCms.Module.Viddler/Command/SaveVideo/SaveVideoRequest.cs b/Modules/BetterCms.Module.Viddler/Command/SaveVideo/SaveVideoRequest.cs
new file mode 100644
index 000000000..be52636e6
--- /dev/null
+++ b/Modules/BetterCms.Module.Viddler/Command/SaveVideo/SaveVideoRequest.cs
@@ -0,0 +1,7 @@
+namespace BetterCms.Module.Viddler.Command.Videos.SaveVideos
+{
+    public class SaveVideoRequest
+    {
+        public string VideoId { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Modules/BetterCms.Module.Viddler/Command/SaveVideos/SaveVideosCommand.cs b/Modules/BetterCms.Module.Viddler/Command/SaveVideos/SaveVideosCommand.cs
index 93073a499..1c1803093 100644
--- a/Modules/BetterCms.Module.Viddler/Command/SaveVideos/SaveVideosCommand.cs
+++ b/Modules/BetterCms.Module.Viddler/Command/SaveVideos/SaveVideosCommand.cs
@@ -4,78 +4,96 @@
 
 using BetterCms.Core.Mvc.Commands;
 using BetterCms.Module.MediaManager.Models;
+using BetterCms.Module.MediaManager.Models.Extensions;
 using BetterCms.Module.MediaManager.ViewModels.MediaManager;
 using BetterCms.Module.Root.Mvc;
-using BetterCms.Module.Viddler.Services;
+using BetterCms.Module.Viddler.Models;
 
 namespace BetterCms.Module.Viddler.Command.Videos.SaveVideos
 {
     internal class SaveVideosCommand : CommandBase, ICommand<SaveVideosRequest, SaveVideosResponse>
     {
-        private readonly IViddlerService viddlerService;
-
-        public SaveVideosCommand(IViddlerService viddlerService)
-        {
-            this.viddlerService = viddlerService;
-        }
-
         public SaveVideosResponse Execute(SaveVideosRequest request)
         {
-            var response = new SaveVideosResponse() { SelectedFolderId = request.FolderId };
-            MediaFolder folder = null;
-            if (!request.FolderId.HasDefaultValue())
+            var response = new SaveVideosResponse { SelectedFolderId = request.SelectedFolderId ?? Guid.Empty, ReuploadMediaId = request.ReuploadMediaId };
+
+            if (request.UploadedFiles != null && request.UploadedFiles.Count > 0)
             {
-                folder = Repository.AsProxy<MediaFolder>(request.FolderId);
-                if (folder.IsDeleted)
+                MediaFolder folder = null;
+
+                if (request.SelectedFolderId != null && request.SelectedFolderId.Value != Guid.Empty)
                 {
-                    response.FolderIsDeleted = true;
-                    return response;
+                    folder = Repository.AsProxy<MediaFolder>(request.SelectedFolderId.Value);
+                    if (folder.IsDeleted)
+                    {
+                        response.FolderIsDeleted = true;
+                        return response;
+                    }
                 }
-            }
 
-            List<Models.Video> medias = new List<Models.Video>();
-            UnitOfWork.BeginTransaction();
+                UnitOfWork.BeginTransaction();
 
-            // TODO: implement.
+                var files = new List<Video>();
+                if (request.ReuploadMediaId.HasDefaultValue())
+                {
+                    foreach (var fileId in request.UploadedFiles)
+                    {
+                        if (!fileId.HasDefaultValue())
+                        {
+                            var file = Repository.FirstOrDefault<Video>(fileId);
+                            if (folder != null && (file.Folder == null || file.Folder.Id != folder.Id))
+                            {
+                                file.Folder = folder;
+                            }
+                            file.IsTemporary = false;
+                            file.PublishedOn = DateTime.Now;
+                            Repository.Save(file);
+                            files.Add(file);
+                        }
+                    }
+                }
+                else
+                {
+                    // Re-upload performed.
+                    var fileId = request.UploadedFiles.FirstOrDefault();
+                    if (!fileId.HasDefaultValue())
+                    {
+                        var originalMedia = Repository.First<Video>(request.ReuploadMediaId);
+                        Repository.Save(originalMedia.CreateHistoryItem());
 
-            // Title = video.Title,
-            // IsArchived = false,
-            // Type = MediaType.Video,
-            // ContentType = MediaContentType.File,
-            // Folder = folder,
-            // PublishedOn = DateTime.Now,
-            // Description = video.Description,
-            //
-            // OriginalFileName = video.Title,
-            // OriginalFileExtension = null,
-            // FileUri = new Uri(viddlerService.GetPlayerUrl(video.Id)),
-            // PublicUrl = viddlerService.GetVideoUrl(video.Id),
-            // Size = 0,
-            // IsTemporary = false,
-            // IsUploaded = video.Is_Transcoding == 0,
-            // IsCanceled = false,
-            //
-            // VideoId = video.Id,
-            // ThumbnailUrl = video.Thumbnails.GetThumbnailUrl(300, 300),
+                        var file = Repository.FirstOrDefault<Video>(fileId);
+                        file.CopyDataTo(originalMedia);
+                        originalMedia.IsTemporary = false;
+                        originalMedia.PublishedOn = DateTime.Now;
+                        files.Add(originalMedia);
+                    }
+                }
 
-            UnitOfWork.Commit();
+                UnitOfWork.Commit();
 
-            response.Medias =
-                medias.Select(
-                    file =>
-                    (MediaFileViewModel)
-                    new MediaVideoViewModel
-                        {
-                            Id = file.Id,
-                            Name = file.Title,
-                            Type = file.Type,
-                            Version = file.Version,
-                            ContentType = MediaContentType.File,
-                            PublicUrl = file.PublicUrl,
-                            FileExtension = file.OriginalFileExtension,
-                            IsProcessing = !file.IsUploaded.HasValue,
-                            IsFailed = file.IsUploaded.HasValue && !file.IsUploaded.Value
-                        }).ToList();
+                // Notify.
+                foreach (var mediaFile in files)
+                {
+                    Events.MediaManagerEvents.Instance.OnMediaFileUpdated(mediaFile);
+                }
+
+                response.Medias =
+                    files.Select(
+                        file =>
+                        (MediaFileViewModel)
+                        new MediaVideoViewModel
+                            {
+                                Id = file.Id,
+                                Name = file.Title,
+                                Type = file.Type,
+                                Version = file.Version,
+                                ContentType = MediaContentType.File,
+                                PublicUrl = file.PublicUrl,
+                                FileExtension = file.OriginalFileExtension,
+                                IsProcessing = !file.IsUploaded.HasValue,
+                                IsFailed = file.IsUploaded.HasValue && !file.IsUploaded.Value
+                            }).ToList();
+            }
 
             return response;
         }
diff --git a/Modules/BetterCms.Module.Viddler/Command/SaveVideos/SaveVideosRequest.cs b/Modules/BetterCms.Module.Viddler/Command/SaveVideos/SaveVideosRequest.cs
index 6f919f6a5..9bd5bdebd 100644
--- a/Modules/BetterCms.Module.Viddler/Command/SaveVideos/SaveVideosRequest.cs
+++ b/Modules/BetterCms.Module.Viddler/Command/SaveVideos/SaveVideosRequest.cs
@@ -5,7 +5,12 @@ namespace BetterCms.Module.Viddler.Command.Videos.SaveVideos
 {
     public class SaveVideosRequest
     {
-        public Guid FolderId { get; set; }
-        public List<string> VideosIds { get; set; }
+        public Guid RootFolderId { get; set; }
+
+        public Guid ReuploadMediaId { get; set; }
+
+        public Guid? SelectedFolderId { get; set; }
+
+        public IList<Guid> UploadedFiles { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Modules/BetterCms.Module.Viddler/Command/SaveVideos/SaveVideosResponse.cs b/Modules/BetterCms.Module.Viddler/Command/SaveVideos/SaveVideosResponse.cs
index 31c008e3c..a8cb1d908 100644
--- a/Modules/BetterCms.Module.Viddler/Command/SaveVideos/SaveVideosResponse.cs
+++ b/Modules/BetterCms.Module.Viddler/Command/SaveVideos/SaveVideosResponse.cs
@@ -18,5 +18,6 @@ public SaveVideosResponse()
 
         public bool FolderIsDeleted { get; set; }
 
+        public Guid ReuploadMediaId { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Modules/BetterCms.Module.Viddler/Controllers/VideosController.cs b/Modules/BetterCms.Module.Viddler/Controllers/VideosController.cs
index d98152367..b43feef2b 100644
--- a/Modules/BetterCms.Module.Viddler/Controllers/VideosController.cs
+++ b/Modules/BetterCms.Module.Viddler/Controllers/VideosController.cs
@@ -94,31 +94,40 @@ public ActionResult ViddlerUploadMockup(string uploadtoken, string callback, str
         /// <returns>The response.</returns>
         public WrappedJsonResult VideoUploaded(string video_id, string token, string uploadToken)
         {
-            if (HttpRuntime.Cache[token] != null)
+            // TODO: check return parameter name from Viddler - token or uploadToken?
+            if (HttpRuntime.Cache[token] == null)
             {
-                HttpRuntime.Cache.Remove(token);
+                return null;
+            }
+            HttpRuntime.Cache.Remove(token);
 
-                // TODO: implement callback from Viddler.
-                var media = new MediaFile() { OriginalFileName = "some file name" };
-                return new WrappedJsonResult
-                {
-                    Data = new
+            var video = GetCommand<SaveVideoCommand>().ExecuteCommand(
+                new SaveVideoRequest
                     {
-                        Success = true,
-                        Id = media.Id,
-                        FileName = media.OriginalFileName,
-                        FileSize = media.Size,
-                        Version = media.Version,
-                        Type = MediaType.Video,
-                        IsProcessing = !media.IsUploaded.HasValue,
-                        IsFailed = media.IsUploaded == false,
-                    },
-                    JsonRequestBehavior = JsonRequestBehavior.AllowGet
-                };
+                        VideoId = video_id
+                    });
+
+            if (video == null)
+            {
+                return null;
             }
 
-            // Failed.
-            return null;
+            return new WrappedJsonResult
+                {
+                    Data =
+                        new
+                            {
+                                Success = true,
+                                Id = video.Id,
+                                FileName = video.Title,
+                                FileSize = video.Size,
+                                Version = video.Version,
+                                Type = MediaType.Video,
+                                IsProcessing = !video.IsUploaded.HasValue,
+                                IsFailed = video.IsUploaded == false,
+                            },
+                    JsonRequestBehavior = JsonRequestBehavior.AllowGet
+                };
         }
 
         /// <summary>
diff --git a/Modules/BetterCms.Module.Viddler/Registration/VideosJsModuleIncludeDescriptor.cs b/Modules/BetterCms.Module.Viddler/Registration/VideosJsModuleIncludeDescriptor.cs
index fb4cd5fa1..9cb98403f 100644
--- a/Modules/BetterCms.Module.Viddler/Registration/VideosJsModuleIncludeDescriptor.cs
+++ b/Modules/BetterCms.Module.Viddler/Registration/VideosJsModuleIncludeDescriptor.cs
@@ -19,7 +19,7 @@ public VideosJsModuleIncludeDescriptor(ModuleDescriptor module)
         {
             Links = new IActionProjection[]
                 {
-                    new JavaScriptModuleLinkTo<VideosController>(this, "uploadVideoDialogUrl", c => c.UploadVideos(null, null)),
+                    new JavaScriptModuleLinkTo<VideosController>(this, "uploadVideoDialogUrl", c => c.UploadVideos("{0}", "{1}")),
                     new JavaScriptModuleLinkTo<VideosController>(this, "getUploadDataUrl", c => c.GetViddlerDataForUpload()),
                     new JavaScriptModuleLinkTo<VideosController>(this, "saveUploadedVideosUrl", c => c.SaveVideos(null)),
                 };
diff --git a/Modules/BetterCms.Module.Viddler/Scripts/bcms.viddler.videos.js b/Modules/BetterCms.Module.Viddler/Scripts/bcms.viddler.videos.js
index 04023cc75..a2f7e13f1 100644
--- a/Modules/BetterCms.Module.Viddler/Scripts/bcms.viddler.videos.js
+++ b/Modules/BetterCms.Module.Viddler/Scripts/bcms.viddler.videos.js
@@ -360,17 +360,17 @@ bettercms.define('bcms.viddler.videos', ['bcms.jquery', 'bcms', 'bcms.dynamicCon
             };
         }
 
-        module.uploadVideo = function(rootFolderId, onSaveCallback, reuploadMediaId) {
+        module.uploadVideo = function(folderId, onSaveCallback, reuploadMediaId) {
             var options = {
                 uploads: new UploadsViewModel(),
-                rootFolderId: rootFolderId,
+                rootFolderId: folderId,
                 reuploadMediaId: reuploadMediaId
             };
             options.uploads.filesToAccept('video/*');
             modal.open({
                 title: globalization.uploadFilesDialogTitle,
                 onLoad: function (dialog) {
-                    var url = $.format(links.uploadVideoDialogUrl, rootFolderId, reuploadMediaId);
+                    var url = $.format(links.uploadVideoDialogUrl, folderId, reuploadMediaId);
                     dynamicContent.setContentFromUrl(dialog, url, {
                         done: function () {
                             VideoUpload(dialog, options);