diff --git a/TwitchDownloaderWPF/ChatRoot.cs b/TwitchDownloaderWPF/ChatRoot.cs
index 81405b1d..87726040 100644
--- a/TwitchDownloaderWPF/ChatRoot.cs
+++ b/TwitchDownloaderWPF/ChatRoot.cs
@@ -79,8 +79,15 @@ public class Comment
     public bool more_replies { get; set; }
 }
 
+public class VideoTime
+{
+    public double start { get; set; }
+    public double end { get; set; }
+}
+
 public class ChatRoot
 {
     public Streamer streamer { get; set; }
     public List<Comment> comments { get; set; }
+    public VideoTime video { get; set; }
 }
\ No newline at end of file
diff --git a/TwitchDownloaderWPF/MainWindow.xaml b/TwitchDownloaderWPF/MainWindow.xaml
index 4a0b2475..e8bfd963 100644
--- a/TwitchDownloaderWPF/MainWindow.xaml
+++ b/TwitchDownloaderWPF/MainWindow.xaml
@@ -17,15 +17,15 @@
             <ColumnDefinition Width="*"/>
             <ColumnDefinition Width="*"/>
             <ColumnDefinition Width="*"/>
+            <!-- <ColumnDefinition Width="*"/> -->
             <ColumnDefinition Width="*"/>
-            <!--  <ColumnDefinition Width="*"/> -->
             <ColumnDefinition Width="10"/>
         </Grid.ColumnDefinitions>
         <Button x:Name="btnVodDownload" Margin="5" Grid.Row="1" Grid.Column="1" Content="VOD Downloader" Click="btnVodDownload_Click" />
         <Button x:Name="btnClipDownload" Margin="5" Grid.Row="1" Grid.Column="2" Content="Clip Downloader" Click="btnClipDownload_Click" />
         <Button x:Name="btnChatDownload" Margin="5" Grid.Row="1" Grid.Column="3" Content="Chat Downloader" Click="btnChatDownload_Click" />
         <Button x:Name="btnChatRender" Margin="5" Grid.Row="1" Grid.Column="4" Content="Chat Render" Click="btnChatRender_Click" />
-        <!--  <Button x:Name="btnQueue" Margin="5" Grid.Row="1" Grid.Column="5" Content="Task Queue" Click="btnQueue_Click" /> -->
+        <!-- <Button x:Name="btnQueue" Margin="5" Grid.Row="1" Grid.Column="5" Content="Task Queue" Click="btnQueue_Click" /> -->
         <Frame Focusable="False" x:Name="Main" Grid.Column="0" Grid.ColumnSpan="6" Grid.Row="2" NavigationUIVisibility="Hidden"/>
 
     </Grid>
diff --git a/TwitchDownloaderWPF/MainWindow.xaml.cs b/TwitchDownloaderWPF/MainWindow.xaml.cs
index c4b308ab..67e29a1e 100644
--- a/TwitchDownloaderWPF/MainWindow.xaml.cs
+++ b/TwitchDownloaderWPF/MainWindow.xaml.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
 using System.Net;
@@ -29,10 +30,14 @@ public partial class MainWindow : Window
         PageChatDownload pageChatDownload = new PageChatDownload();
         PageChatRender pageChatRender = new PageChatRender();
         PageQueue pageQueue = new PageQueue();
+        public ObservableCollection<ITwitchTask> taskList = new ObservableCollection<ITwitchTask>();
+
         public MainWindow()
         {
             InitializeComponent();
             ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
+
+            pageQueue.queueList.ItemsSource = taskList;
         }
 
         private void btnVodDownload_Click(object sender, RoutedEventArgs e)
diff --git a/TwitchDownloaderWPF/PageChatDownload.xaml b/TwitchDownloaderWPF/PageChatDownload.xaml
index 31f709fc..df58e91f 100644
--- a/TwitchDownloaderWPF/PageChatDownload.xaml
+++ b/TwitchDownloaderWPF/PageChatDownload.xaml
@@ -56,6 +56,7 @@
             <StackPanel HorizontalAlignment="Left">
                 <TextBlock Text="Download Format:" HorizontalAlignment="Right" Margin="0,10,0,0"/>
                 <TextBlock Text="Crop Chat:" HorizontalAlignment="Right" Margin="0,10,0,0"/>
+                <!-- <TextBlock HorizontalAlignment="Right" Margin="0,29,0,0">Embed Emotes <Hyperlink ToolTipService.ShowDuration="30000"><Hyperlink.ToolTip>Embeds emotes into the JSON file so in the future when an emote is removed from Twitch or a 3rd party, it will still render correctly. Useful for archival purposes, file size will be larger.</Hyperlink.ToolTip>(?)</Hyperlink>:</TextBlock> -->
             </StackPanel>
             <StackPanel>
                 <StackPanel Margin="5,12,0,0" Orientation="Horizontal">
@@ -78,6 +79,7 @@
                         <xctk:IntegerUpDown Margin="3,-1,0,0" Value="0" Name="numEndSecond" />
                     </StackPanel>
                 </StackPanel>
+                <!-- <CheckBox x:Name="checkEmbed" Margin="5,8,0,0"></CheckBox> -->
             </StackPanel>
         </StackPanel>
         <Button x:Name="btnDownload" Grid.Row="3" Grid.Column="2" Grid.ColumnSpan="2" Content="Download" Height="50" Width="100" Margin="0,0,0,20" VerticalAlignment="Bottom" Click="btnDownload_Click"/>
diff --git a/TwitchDownloaderWPF/PageChatDownload.xaml.cs b/TwitchDownloaderWPF/PageChatDownload.xaml.cs
index ecba5db5..7f888891 100644
--- a/TwitchDownloaderWPF/PageChatDownload.xaml.cs
+++ b/TwitchDownloaderWPF/PageChatDownload.xaml.cs
@@ -183,11 +183,14 @@ private void BackgroundDownloadManager_DoWork(object sender, DoWorkEventArgs e)
                 double videoStart = clipInfo.offset;
                 double videoDuration = clipInfo.duration;
                 JObject result = new JObject();
+                JObject video = new JObject();
                 JArray comments = new JArray();
                 JObject streamer = new JObject();
 
                 streamer["name"] = clipInfo.streamer_name;
                 streamer["id"] = clipInfo.streamer_id;
+                video["start"] = videoStart;
+                video["end"] = videoStart + videoDuration;
 
                 while (latestMessage < (videoStart + videoDuration))
                 {
@@ -201,7 +204,7 @@ private void BackgroundDownloadManager_DoWork(object sender, DoWorkEventArgs e)
 
                     foreach (var comment in res["comments"])
                     {
-                        if (latestMessage < (videoStart + videoDuration))
+                        if (latestMessage < (videoStart + videoDuration) && comment["content_offset_seconds"].ToObject<double>() > videoStart)
                             comments.Add(comment);
 
                         latestMessage = comment["content_offset_seconds"].ToObject<double>();
@@ -221,6 +224,7 @@ private void BackgroundDownloadManager_DoWork(object sender, DoWorkEventArgs e)
 
                 result["streamer"] = streamer;
                 result["comments"] = comments;
+                result["video"] = video;
 
                 using (StreamWriter sw = new StreamWriter(clipInfo.path))
                 {
diff --git a/TwitchDownloaderWPF/PageChatRender.xaml.cs b/TwitchDownloaderWPF/PageChatRender.xaml.cs
index 607036e6..a350e3ae 100644
--- a/TwitchDownloaderWPF/PageChatRender.xaml.cs
+++ b/TwitchDownloaderWPF/PageChatRender.xaml.cs
@@ -91,6 +91,13 @@ private void BackgroundRenderManager_DoWork(object sender, DoWorkEventArgs e)
             try
             {
                 chatJson = JsonConvert.DeserializeObject<ChatRoot>(File.ReadAllText(renderOptions.json_path));
+                if (chatJson.streamer == null)
+                {
+                    JObject json = JObject.Parse(File.ReadAllText(renderOptions.json_path));
+                    chatJson.streamer = new Streamer();
+                    chatJson.streamer.name = json["video"]["user_name"].ToString();
+                    chatJson.streamer.id = json["video"]["user_id"].ToObject<int>();
+                }
                 chatJson.streamer.name = GetStreamerName(chatJson.streamer.id);
             }
             catch (JsonSerializationException)
@@ -203,7 +210,7 @@ private void BackgroundRenderManager_DoWork(object sender, DoWorkEventArgs e)
             }
 
             (sender as BackgroundWorker).ReportProgress(0, new Progress("Rendering Video 0%"));
-            RenderVideo(renderOptions, new Queue<TwitchComment>(finalComments.ToArray()), chatJson.comments, sender);
+            RenderVideo(renderOptions, new Queue<TwitchComment>(finalComments.ToArray()), chatJson, sender);
 
             (sender as BackgroundWorker).ReportProgress(0, new Progress("Cleaning up..."));
             try
@@ -268,14 +275,24 @@ private SKColor GenerateUserColor(SKColor userColor, SKColor background_color)
             return userColor;
         }
 
-        private void RenderVideo(RenderOptions renderOptions, Queue<TwitchComment> finalComments, List<Comment> comments, object sender)
+        private void RenderVideo(RenderOptions renderOptions, Queue<TwitchComment> finalComments, ChatRoot chatJson, object sender)
         {
             SKBitmap bufferBitmap = new SKBitmap(renderOptions.chat_width, renderOptions.chat_height);
             SKCanvas bufferCanvas = new SKCanvas(bufferBitmap);
             SKPaint gifBackgroundPaint = new SKPaint();
             SKPaint gifPaint = new SKPaint();
-            int videoStart = (int)Math.Floor(comments.First().content_offset_seconds);
-            int duration = (int)Math.Ceiling(comments.Last().content_offset_seconds) - videoStart;
+            int videoStart;
+            int duration;
+            if (chatJson.video != null)
+            {
+                videoStart = (int)Math.Floor(chatJson.video.start);
+                duration = (int)Math.Ceiling(chatJson.video.end) - videoStart;
+            }
+            else
+            {
+                videoStart = (int)Math.Floor(chatJson.comments.First().content_offset_seconds);
+                duration = (int)Math.Ceiling(chatJson.comments.Last().content_offset_seconds) - videoStart;
+            }
             List<GifEmote> displayedGifs = new List<GifEmote>();
             Stopwatch stopwatch = new Stopwatch();
 
@@ -1368,6 +1385,12 @@ private bool ValidateInputs()
                 }
             }
 
+            if (Int32.Parse(textHeight.Text) % 2 != 0 && Int32.Parse(textWidth.Text) % 2 != 0)
+            {
+                AppendLog("ERROR: Height and Width must be even");
+                return false;
+            }
+
             return true;
         }
 
diff --git a/TwitchDownloaderWPF/PageQueue.xaml b/TwitchDownloaderWPF/PageQueue.xaml
index c61708f2..1f7bee60 100644
--- a/TwitchDownloaderWPF/PageQueue.xaml
+++ b/TwitchDownloaderWPF/PageQueue.xaml
@@ -17,5 +17,21 @@
             <ColumnDefinition Width="*"/>
             <ColumnDefinition Width="20"/>
         </Grid.ColumnDefinitions>
+
+        <ItemsControl x:Name="queueList" Grid.Column="1" Grid.ColumnSpan="3">
+            <ItemsControl.ItemTemplate>
+                <DataTemplate>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <Image Grid.Column="0" Source="{Binding Preview}"></Image>
+                        <TextBlock Grid.Column="1" Grid.ColumnSpan="2" Text="{Binding Title}"></TextBlock>
+                    </Grid>
+                </DataTemplate>
+            </ItemsControl.ItemTemplate>
+        </ItemsControl>
     </Grid>
 </Page>
diff --git a/TwitchDownloaderWPF/PageVodDownload.xaml b/TwitchDownloaderWPF/PageVodDownload.xaml
index 7c413be0..7584aabe 100644
--- a/TwitchDownloaderWPF/PageVodDownload.xaml
+++ b/TwitchDownloaderWPF/PageVodDownload.xaml
@@ -86,7 +86,7 @@
             </StackPanel>
         </StackPanel>
         <Button x:Name="btnDownload" Content="Download" Height="50" Width="100" Click="btnDownload_Click" Grid.Row="3" Grid.Column="2" Grid.ColumnSpan="2" HorizontalAlignment="Center" Margin="0,0,0,10" VerticalAlignment="Bottom"/>
-        <!-- <Button x:Name="btnQueue" Content="Queue" Height="25" Width="60" Margin="5,4,0,10" Grid.Row="3" Grid.Column="3" HorizontalAlignment="Center"/> -->
+        <Button x:Name="btnQueue" Content="Queue" Height="25" Width="60" Click="btnQueue_Click" Margin="5,4,0,10" Grid.Row="3" Grid.Column="3" HorizontalAlignment="Center" Visibility="Hidden"/>
         <!-- RIGHT -->
         <StackPanel Grid.Column="4" Grid.Row="2" Grid.RowSpan="2">
             <TextBlock Text="Log:"/>
diff --git a/TwitchDownloaderWPF/PageVodDownload.xaml.cs b/TwitchDownloaderWPF/PageVodDownload.xaml.cs
index 30e47645..3e6dfa82 100644
--- a/TwitchDownloaderWPF/PageVodDownload.xaml.cs
+++ b/TwitchDownloaderWPF/PageVodDownload.xaml.cs
@@ -30,6 +30,7 @@
 using TwitchDownloader.Properties;
 using TwitchDownloader.Tasks;
 using Xabe.FFmpeg.Events;
+using System.Collections.ObjectModel;
 
 namespace TwitchDownloaderWPF
 {
@@ -59,7 +60,7 @@ private void SetEnabled(bool isEnabled)
             numEndMinute.IsEnabled = isEnabled;
             numEndSecond.IsEnabled = isEnabled;
             btnDownload.IsEnabled = isEnabled;
-            //btnQueue.IsEnabled = isEnabled;
+            btnQueue.IsEnabled = isEnabled;
         }
         private void Hyperlink_RequestNavigate(object sender, RequestNavigateEventArgs e)
         {
@@ -172,6 +173,7 @@ private async void btnDownload_Click(object sender, RoutedEventArgs e)
                     options.filename = saveFileDialog.FileName;
 
                     TaskVodDownload currentDownload = new TaskVodDownload(options);
+                    currentDownload.Preview = imgThumbnail.Source;
                     Progress<ProgressReport> uploadProgress = new Progress<ProgressReport>(OnProgressChanged);
 
                     SetImage("Images/ppOverheat.gif", true);
@@ -341,6 +343,36 @@ private void checkCFR_Changed(object sender, RoutedEventArgs e)
             Settings.Default.EncodeCFR = (bool)checkCFR.IsChecked;
             Settings.Default.Save();
         }
+
+        private void btnQueue_Click(object sender, RoutedEventArgs e)
+        {
+            bool isValid = ValidateInput();
+
+            if (isValid)
+            {
+                SaveFileDialog saveFileDialog = new SaveFileDialog();
+
+                saveFileDialog.Filter = "MP4 Files | *.mp4";
+                saveFileDialog.RestoreDirectory = true;
+
+                if (saveFileDialog.ShowDialog() == true)
+                {
+                    SetEnabled(false);
+                    DownloadOptions options = new DownloadOptions();
+                    options.UpdateValues(this);
+                    options.filename = saveFileDialog.FileName;
+
+                    TaskVodDownload currentDownload = new TaskVodDownload(options);
+                    currentDownload.Preview = imgThumbnail.Source;
+                    ObservableCollection<ITwitchTask> taskList = ((MainWindow)Window.GetWindow(this)).taskList;
+                    taskList.Add(currentDownload);
+                }
+            }
+            else
+            {
+                AppendLog("ERROR: Invalid Crop Inputs");
+            }
+        }
     }
 }
 
diff --git a/TwitchDownloaderWPF/RenderObjects.cs b/TwitchDownloaderWPF/RenderObjects.cs
index e975b2df..ebfdd538 100644
--- a/TwitchDownloaderWPF/RenderObjects.cs
+++ b/TwitchDownloaderWPF/RenderObjects.cs
@@ -179,6 +179,15 @@ public GifEmote(Point Offset, string Name, SKCodec Codec, int ImageScale, List<S
             total_duration = durations.Count * 10;
         }
 
+        for (int i = 0; i < durations.Count; i++)
+        {
+            if (durations[i] == 0)
+            {
+                total_duration += 10;
+                durations[i] = 10;
+            }
+        }
+
         width = image_frames.First().Width;
         height = image_frames.First().Height;
 
diff --git a/TwitchDownloaderWPF/Tasks/ITwitchTask.cs b/TwitchDownloaderWPF/Tasks/ITwitchTask.cs
index 6658e5de..a9a91e62 100644
--- a/TwitchDownloaderWPF/Tasks/ITwitchTask.cs
+++ b/TwitchDownloaderWPF/Tasks/ITwitchTask.cs
@@ -4,15 +4,17 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Windows.Media;
 using TwitchDownloader.Tasks;
 
 namespace TwitchDownloader
 {
-    interface ITwitchTask
+    public interface ITwitchTask
     {
+        string Title { get; set; }
+        string Information { get; set; }
+        ImageSource Preview { get; set; }
         CancellationTokenSource CancellationTokenSource { get; set; }
-        string getTitle();
-        string getInformation();
         Task runTask(IProgress<ProgressReport> progress);
         void cancelTask();
     }
diff --git a/TwitchDownloaderWPF/Tasks/TaskVodDownload.cs b/TwitchDownloaderWPF/Tasks/TaskVodDownload.cs
index 35d713bc..4611e72a 100644
--- a/TwitchDownloaderWPF/Tasks/TaskVodDownload.cs
+++ b/TwitchDownloaderWPF/Tasks/TaskVodDownload.cs
@@ -9,6 +9,7 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Windows.Media;
 using Xabe.FFmpeg;
 using Xabe.FFmpeg.Model;
 
@@ -21,6 +22,9 @@ public CancellationTokenSource CancellationTokenSource
             get;
             set;
         }
+        public string Title { get; set; }
+        public string Information { get; set; }
+        public ImageSource Preview { get; set; }
 
         public DownloadOptions downloadOptions;
 
@@ -29,16 +33,6 @@ public void cancelTask()
             CancellationTokenSource.Cancel();
         }
 
-        public string getInformation()
-        {
-            return downloadOptions.title;
-        }
-
-        public string getTitle()
-        {
-            return downloadOptions.title;
-        }
-
         public Task runTask(IProgress<ProgressReport> progress)
         {
             CancellationTokenSource = new CancellationTokenSource();
@@ -92,6 +86,7 @@ public Task runTask(IProgress<ProgressReport> progress)
             progress.Report(new ProgressReport() { reportType = ReportType.Message, data = "Combining Parts (2/3)" });
             progress.Report(new ProgressReport() { reportType = ReportType.Percent, data = 0 });
 
+            /*
             if (videoPartsList[0].Contains("muted"))
             {
                 string inputFileMuted = Path.Combine(downloadFolder, videoPartsList[0]);
@@ -110,20 +105,26 @@ public Task runTask(IProgress<ProgressReport> progress)
             }
 
             string inputFile = Path.Combine(downloadFolder, options.id + ".txt");
-            string outputFile = Path.Combine(downloadFolder, "output.ts");
             Task<IConversionResult> combineResult = new Conversion().Start(String.Format("-f concat -safe 0 -i \"{0}\" -c copy \"{1}\"", inputFile, outputFile));
-            Task.WaitAll(combineResult);
+            Task.WaitAll(combineResult);*/
 
-            foreach (var part in videoPartsList)
+            string outputFile = Path.Combine(downloadFolder, "output.mp4");
+            using (FileStream outputStream = new FileStream(outputFile, FileMode.Create, FileAccess.Write))
             {
-                string file = Path.Combine(downloadFolder, part);
-                if (File.Exists(file))
+                foreach (var part in videoPartsList)
                 {
-                    try
+                    string file = Path.Combine(downloadFolder, part);
+                    if (File.Exists(file))
                     {
-                        File.Delete(file);
+                        byte[] writeBytes = File.ReadAllBytes(file);
+                        outputStream.Write(writeBytes, 0, writeBytes.Length);
+
+                        try
+                        {
+                            File.Delete(file);
+                        }
+                        catch { }
                     }
-                    catch { }
                 }
             }
 
@@ -135,7 +136,7 @@ public Task runTask(IProgress<ProgressReport> progress)
                     StartInfo =
                     {
                         FileName = "ffmpeg.exe",
-                        Arguments = $"-i \"" + Path.Combine(downloadFolder, "output.ts") + "\" -vf vfrdet -ss 0 -t 600 -f null -",
+                        Arguments = $"-i \"" + Path.Combine(downloadFolder, "output.mp4") + "\" -vf vfrdet -ss 0 -t 600 -f null -",
                         UseShellExecute = false,
                         CreateNoWindow = true,
                         RedirectStandardInput = true,
@@ -172,7 +173,7 @@ public Task runTask(IProgress<ProgressReport> progress)
             else
                 progress.Report(new ProgressReport() { reportType = ReportType.Message, data = "Finalizing MP4 (3/3)" });
             string outputConvert = options.filename;
-            Task<IMediaInfo> info = MediaInfo.Get(Path.Combine(downloadFolder, "output.ts"));
+            Task<IMediaInfo> info = MediaInfo.Get(Path.Combine(downloadFolder, "output.mp4"));
             Task.WaitAll(info);
             double seekTime = options.crop_begin;
             double seekDuration = Math.Round(info.Result.Duration.TotalSeconds - seekTime - options.crop_end);
@@ -180,18 +181,18 @@ public Task runTask(IProgress<ProgressReport> progress)
             if (isVFR)
             {
                 int newFps = (int)Math.Ceiling(info.Result.VideoStreams.First().FrameRate);
-                conversionResult = Conversion.New().Start(String.Format("-y -i \"{0}\" -ss {1} -analyzeduration {2} -t {3} -crf 20 -filter:v fps=fps={4} \"{5}\"", Path.Combine(downloadFolder, "output.ts"), seekTime.ToString(), Int32.MaxValue, seekDuration.ToString(), newFps, outputConvert));
+                conversionResult = Conversion.New().Start(String.Format("-y -i \"{0}\" -ss {1} -analyzeduration {2} -t {3} -crf 20 -filter:v fps=fps={4} \"{5}\"", Path.Combine(downloadFolder, "output.mp4"), seekTime.ToString(), Int32.MaxValue, seekDuration.ToString(), newFps, outputConvert));
             }
             else
             {
-                conversionResult = Conversion.New().Start(String.Format("-y -i \"{0}\" -ss {1} -analyzeduration {2} -t {3} -avoid_negative_ts make_zero -acodec copy -vcodec copy \"{4}\"", Path.Combine(downloadFolder, "output.ts"), seekTime.ToString(), Int32.MaxValue, seekDuration.ToString(), outputConvert));
+                conversionResult = Conversion.New().Start(String.Format("-y -i \"{0}\" -ss {1} -analyzeduration {2} -t {3} -avoid_negative_ts make_zero -c:v copy -f mp4 \"-bsf:a\" aac_adtstoasc \"{4}\"", Path.Combine(downloadFolder, "output.mp4"), seekTime.ToString(), Int32.MaxValue, seekDuration.ToString(), outputConvert));
             }
 
             Task.WaitAll(conversionResult);
             if (Directory.Exists(downloadFolder))
                 DeleteDirectory(downloadFolder);
 
-            return Task.CompletedTask; ;
+            return Task.CompletedTask;
         }
 
         private void Cleanup()
@@ -300,6 +301,8 @@ public static void DeleteDirectory(string target_dir)
         public TaskVodDownload(DownloadOptions DownloadOptions)
         {
             downloadOptions = DownloadOptions;
+            Title = downloadOptions.title;
+            Information = "This is a test description :)";
         }
     }
 }