diff --git a/src/Controller/DownloadController.php b/src/Controller/DownloadController.php
index d955046..18579e4 100644
--- a/src/Controller/DownloadController.php
+++ b/src/Controller/DownloadController.php
@@ -3,6 +3,7 @@
 namespace App\Controller;
 
 use App\Download\Action\Input\DownloadMediaInput;
+use App\Download\Framework\Repository\DownloadRepository;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Messenger\MessageBusInterface;
@@ -11,6 +12,7 @@ use Symfony\Component\Routing\Attribute\Route;
 class DownloadController extends AbstractController
 {
     public function __construct(
+        private DownloadRepository $downloadRepository,
         private MessageBusInterface $bus,
     ) {}
 
@@ -18,6 +20,15 @@ class DownloadController extends AbstractController
     public function download(
         DownloadMediaInput $input,
     ): Response {
+        $download = $this->downloadRepository->insert(
+            $input->url,
+            $input->title,
+            $input->filename,
+            $input->imdbId,
+            $input->mediaType,
+            "",
+        );
+        $input->downloadId = $download->getId();
         try {
             $this->bus->dispatch($input->toCommand());
         } catch (\Throwable $exception) {
diff --git a/src/Download/Action/Command/DownloadMediaCommand.php b/src/Download/Action/Command/DownloadMediaCommand.php
index 10730b2..98b27ca 100644
--- a/src/Download/Action/Command/DownloadMediaCommand.php
+++ b/src/Download/Action/Command/DownloadMediaCommand.php
@@ -15,5 +15,6 @@ class DownloadMediaCommand implements CommandInterface
         public string $filename,
         public string $mediaType,
         public string $imdbId,
+        public ?int $downloadId = null,
     ) {}
 }
\ No newline at end of file
diff --git a/src/Download/Action/Handler/DownloadMediaHandler.php b/src/Download/Action/Handler/DownloadMediaHandler.php
index cfaada3..9d1ceeb 100644
--- a/src/Download/Action/Handler/DownloadMediaHandler.php
+++ b/src/Download/Action/Handler/DownloadMediaHandler.php
@@ -21,14 +21,19 @@ readonly class DownloadMediaHandler implements HandlerInterface
 
     public function handle(CommandInterface $command): ResultInterface
     {
-        $download = $this->downloadRepository->insert(
-            $command->url,
-            $command->title,
-            $command->filename,
-            $command->imdbId,
-            $command->mediaType,
-            ""
-        );
+        if (null === $command->downloadId) {
+            $download = $this->downloadRepository->insert(
+                $command->url,
+                $command->title,
+                $command->filename,
+                $command->imdbId,
+                $command->mediaType,
+                ""
+            );
+        } else {
+            $download = $this->downloadRepository->find($command->downloadId);
+        }
+
 
         try {
             $this->downloadRepository->updateStatus($download->getId(), 'In Progress');
diff --git a/src/Download/Action/Input/DownloadMediaInput.php b/src/Download/Action/Input/DownloadMediaInput.php
index 1565776..c7acce5 100644
--- a/src/Download/Action/Input/DownloadMediaInput.php
+++ b/src/Download/Action/Input/DownloadMediaInput.php
@@ -25,6 +25,8 @@ class DownloadMediaInput implements InputInterface
 
         #[SourceRequest('imdbId')]
         public string $imdbId,
+
+        public ?int $downloadId = null,
     ) {}
 
     public function toCommand(): CommandInterface
@@ -35,6 +37,7 @@ class DownloadMediaInput implements InputInterface
             $this->filename,
             $this->mediaType,
             $this->imdbId,
+            $this->downloadId,
         );
     }
 }
\ No newline at end of file
diff --git a/templates/broadcast/Download.stream.html.twig b/templates/broadcast/Download.stream.html.twig
index 4ee1c83..0bbd270 100644
--- a/templates/broadcast/Download.stream.html.twig
+++ b/templates/broadcast/Download.stream.html.twig
@@ -11,7 +11,13 @@
                         <span class="w-4 inline-block text-center text-gray-50">{{ entity.progress }}</span>
                     </span>
                 </td>
-            </tr id="ad_download_{{ entity.id }}">
+            </tr>
+        </template>
+    </turbo-stream>
+
+    <turbo-stream action="prepend" target="alert_list">
+        <template>
+            <twig:Alert title="Success" message="{{ entity.title }} has been added to the Download queue" alert_id="{{ entity.id }}" data-controller="alert" />
         </template>
     </turbo-stream>
 {% endblock %}
@@ -20,16 +26,14 @@
     {% if entity.status != "Complete" %}
         <turbo-stream action="update" target="ad_download_{{ id }}">
             <template>
-                <tr id="ad_download_{{ entity.id }}">
-                    <td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-800 dark:text-stone-800 min-w-[45ch] max-w-[45ch] truncate">
-                        {{ entity.title }}
-                    </td>
-                    <td class="px-6 py-4 whitespace-nowrap text-sm text-end text-gray-800 dark:text-gray-50">
-                        <span class="p-1.5 bg-purple-600 rounded-full">
-                            <span class="w-4 inline-block text-center text-gray-50">{{ entity.progress }}</span>
-                        </span>
-                    </td>
-                </tr>
+                <td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-800 dark:text-stone-800 min-w-[45ch] max-w-[45ch] truncate">
+                    {{ entity.title }}
+                </td>
+                <td class="px-6 py-4 whitespace-nowrap text-sm text-end text-gray-800 dark:text-gray-50">
+                    <span class="p-1.5 bg-purple-600 rounded-full">
+                        <span class="w-4 inline-block text-center text-gray-50">{{ entity.progress }}</span>
+                    </span>
+                </td>
             </template>
         </turbo-stream>
     {% else %}
@@ -42,18 +46,20 @@
             </template>
         </turbo-stream>
 
-{#        <turbo-stream action="prepend" target="complete_downloads_list">#}
-{#            <template>#}
-{#                <div class="result_group download-item" id="cd_download_{{ entity.id }}">#}
-{#                    <div class="title">{{ entity.title }}</div>#}
-{#                    <div class="filename">{{ entity.filename }}</div>#}
-{#                    <div class="status">#}
-{#                        <span class="pill {{ status_color_map[entity.status] }} status-badge">{{ entity.status }}</span>#}
-{#                        <span class="pill progress">{{ entity.progress }}%</span>#}
-{#                    </div>#}
-{#                </div>#}
-{#            </template>#}
-{#        </turbo-stream>#}
+        <turbo-stream action="prepend" target="recent_downloads">
+            <template>
+                <tr id="recent_download_{{ entity.id }}">
+                    <td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-800 dark:text-stone-800 min-w-[45ch] max-w-[45ch] truncate">
+                        {{ entity.title }}
+                    </td>
+                    <td class="px-6 py-4 whitespace-nowrap text-sm text-end text-gray-800 dark:text-gray-50">
+                    <span class="p-1.5 bg-purple-600 rounded-full">
+                        <span class="w-4 inline-block text-center text-gray-50">{{ entity.progress }}</span>
+                    </span>
+                    </td>
+                </tr>
+            </template>
+        </turbo-stream>
     {% endif %}
 {% endblock %}
 
diff --git a/templates/components/ActiveDownloadList.html.twig b/templates/components/ActiveDownloadList.html.twig
index ec422e9..908de9e 100644
--- a/templates/components/ActiveDownloadList.html.twig
+++ b/templates/components/ActiveDownloadList.html.twig
@@ -1,5 +1,5 @@
 <div{{ attributes }} class="min-w-48">
-    <table class="divide-y divide-gray-200 dark:divide-gray-50 dark:bg-gray-50 table-fixed" {{ turbo_stream_listen('App\\Download\\Framework\\Entity\\Download') }}>
+    <table id="active_downloads" class="divide-y divide-gray-200 dark:divide-gray-50 dark:bg-gray-50 table-fixed" {{ turbo_stream_listen('App\\Download\\Framework\\Entity\\Download') }}>
         <thead>
         <tr class="dark:bg-gray-50">
             <th scope="col"
@@ -20,9 +20,9 @@
                         {{ download.title }}
                     </td>
                     <td class="px-6 py-4 whitespace-nowrap text-sm text-end text-gray-800 dark:text-gray-50">
-                                    <span class="p-1.5 bg-purple-600 rounded-full">
-                                        <span class="w-4 inline-block text-center text-gray-50">{{ download.progress }}</span>
-                                    </span>
+                        <span class="p-1.5 bg-purple-600 rounded-full">
+                            <span class="w-4 inline-block text-center text-gray-50">{{ download.progress }}</span>
+                        </span>
                     </td>
                 </tr>
             {% endfor %}
diff --git a/templates/index/index.html.twig b/templates/index/index.html.twig
index c4b1ade..bf0c2af 100644
--- a/templates/index/index.html.twig
+++ b/templates/index/index.html.twig
@@ -11,7 +11,7 @@
             </twig:Card>
 
             <twig:Card title="Recent Downloads" class="w-full">
-                <table class="divide-y divide-gray-200 dark:divide-gray-50 dark:bg-gray-50 table-fixed">
+                <table id="recent_downloads" class="divide-y divide-gray-200 dark:divide-gray-50 dark:bg-gray-50 table-fixed">
                     <thead>
                     <tr class="dark:bg-gray-50">
                         <th scope="col"