diff --git a/src/Monitor/Service/MediaFiles.php b/src/Base/Service/MediaFiles.php
similarity index 99%
rename from src/Monitor/Service/MediaFiles.php
rename to src/Base/Service/MediaFiles.php
index 841ce06..c8bc847 100644
--- a/src/Monitor/Service/MediaFiles.php
+++ b/src/Base/Service/MediaFiles.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Monitor\Service;
+namespace App\Base\Service;
 
 use Aimeos\Map;
 use App\Download\Framework\Entity\Download;
diff --git a/src/Download/Action/Handler/DownloadSeasonHandler.php b/src/Download/Action/Handler/DownloadSeasonHandler.php
index 9e33649..cb04da9 100644
--- a/src/Download/Action/Handler/DownloadSeasonHandler.php
+++ b/src/Download/Action/Handler/DownloadSeasonHandler.php
@@ -3,17 +3,12 @@
 namespace App\Download\Action\Handler;
 
 use Aimeos\Map;
+use App\Base\Service\MediaFiles;
 use App\Download\Action\Command\DownloadMediaCommand;
 use App\Download\Action\Command\DownloadSeasonCommand;
 use App\Download\Action\Result\DownloadMediaResult;
 use App\Download\Action\Result\DownloadSeasonResult;
 use App\Download\DownloadOptionEvaluator;
-use App\Download\Framework\Repository\DownloadRepository;
-use App\Download\Downloader\DownloaderInterface;
-use App\Monitor\Action\Command\MonitorTvEpisodeCommand;
-use App\Monitor\Action\Handler\MonitorTvEpisodeHandler;
-use App\Monitor\Framework\Entity\Monitor;
-use App\Monitor\Service\MediaFiles;
 use App\Tmdb\Tmdb;
 use App\Torrentio\Action\Command\GetTvShowOptionsCommand;
 use App\Torrentio\Action\Handler\GetTvShowOptionsHandler;
diff --git a/src/Download/Downloader/ProcessDownloader.php b/src/Download/Downloader/ProcessDownloader.php
index 4ef843e..6b93fb8 100644
--- a/src/Download/Downloader/ProcessDownloader.php
+++ b/src/Download/Downloader/ProcessDownloader.php
@@ -2,8 +2,8 @@
 
 namespace App\Download\Downloader;
 
+use App\Base\Service\MediaFiles;
 use App\Download\Framework\Entity\Download;
-use App\Monitor\Service\MediaFiles;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Cache\Adapter\RedisAdapter;
 use Symfony\Component\Process\Exception\ProcessFailedException;
diff --git a/src/Monitor/Action/Handler/MonitorMovieHandler.php b/src/Monitor/Action/Handler/MonitorMovieHandler.php
index 02232e2..e190c26 100644
--- a/src/Monitor/Action/Handler/MonitorMovieHandler.php
+++ b/src/Monitor/Action/Handler/MonitorMovieHandler.php
@@ -25,7 +25,6 @@ readonly class MonitorMovieHandler implements HandlerInterface
     public function __construct(
         private MonitorRepository $movieMonitorRepository,
         private GetMovieOptionsHandler $getMovieOptionsHandler,
-        private MonitorOptionEvaluator $monitorOptionEvaluator,
         private EntityManagerInterface $entityManager,
         private MessageBusInterface $bus,
         private LoggerInterface $logger,
diff --git a/src/Monitor/Action/Handler/MonitorTvSeasonHandler.php b/src/Monitor/Action/Handler/MonitorTvSeasonHandler.php
index 97665d6..c7b698a 100644
--- a/src/Monitor/Action/Handler/MonitorTvSeasonHandler.php
+++ b/src/Monitor/Action/Handler/MonitorTvSeasonHandler.php
@@ -3,12 +3,12 @@
 namespace App\Monitor\Action\Handler;
 
 use Aimeos\Map;
+use App\Base\Service\MediaFiles;
 use App\Monitor\Action\Command\MonitorTvEpisodeCommand;
 use App\Monitor\Action\Command\MonitorTvSeasonCommand;
 use App\Monitor\Action\Result\MonitorTvSeasonResult;
 use App\Monitor\Framework\Entity\Monitor;
 use App\Monitor\Framework\Repository\MonitorRepository;
-use App\Monitor\Service\MediaFiles;
 use App\Tmdb\Tmdb;
 use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
diff --git a/src/Monitor/Action/Handler/MonitorTvShowHandler.php b/src/Monitor/Action/Handler/MonitorTvShowHandler.php
index c988ed8..cec13ec 100644
--- a/src/Monitor/Action/Handler/MonitorTvShowHandler.php
+++ b/src/Monitor/Action/Handler/MonitorTvShowHandler.php
@@ -3,12 +3,12 @@
 namespace App\Monitor\Action\Handler;
 
 use Aimeos\Map;
+use App\Base\Service\MediaFiles;
 use App\Monitor\Action\Command\MonitorMovieCommand;
 use App\Monitor\Action\Command\MonitorTvEpisodeCommand;
 use App\Monitor\Action\Result\MonitorTvShowResult;
 use App\Monitor\Framework\Entity\Monitor;
 use App\Monitor\Framework\Repository\MonitorRepository;
-use App\Monitor\Service\MediaFiles;
 use App\Tmdb\Tmdb;
 use Carbon\Carbon;
 use DateTimeImmutable;
diff --git a/src/Monitor/Service/MonitorOptionEvaluator.php b/src/Monitor/Service/MonitorOptionEvaluator.php
deleted file mode 100644
index b595709..0000000
--- a/src/Monitor/Service/MonitorOptionEvaluator.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-
-namespace App\Monitor\Service;
-
-use Aimeos\Map;
-use App\Monitor\Framework\Entity\Monitor;
-use App\Torrentio\Result\TorrentioResult;
-
-class MonitorOptionEvaluator
-{
-    /**
-     * @param Monitor $monitor
-     * @param TorrentioResult[] $results
-     * @return TorrentioResult|null
-     * @throws \Throwable
-     */
-    public function evaluateOptions(Monitor $monitor, array $results): ?TorrentioResult
-    {
-        $sizeLow = 000;
-        $sizeHigh = 4096;
-
-        $bestMatches = [];
-        $matches = [];
-
-        $userPreferences = $monitor->getUser()->getUserPreferenceValues();
-
-        foreach ($results as $result) {
-            if (!in_array($userPreferences['language'], $result->languages)) {
-                continue;
-            }
-
-            if ($result->resolution === $userPreferences['resolution']
-                && $result->codec === $userPreferences['codec']
-            ) {
-                $bestMatches[] = $result;
-            }
-
-            if ($userPreferences['resolution'] === '2160p'
-                && $userPreferences['codec'] === $result->codec
-                && $result->resolution === '1080p'
-            ) {
-                $matches[] = $result;
-            }
-
-            if ($userPreferences['codec'] === 'h264'
-                && $userPreferences['resolution'] === $result->resolution
-                && $result->codec === 'h265'
-            ) {
-                $matches[] = $result;
-            }
-
-            if (($userPreferences['codec'] === null )
-                && ($userPreferences['resolution'] === null )) {
-                $matches[] = $result;
-            }
-        }
-
-        $sizeMatches = [];
-
-        foreach ($bestMatches as $result) {
-            if (str_contains($result->size, 'GB')) {
-                $size = (int) trim(str_replace('GB', '', $result->size)) * 1024;
-            } else {
-                $size = (int) trim(str_replace('MB', '', $result->size));
-            }
-
-            if ($size > $sizeLow && $size < $sizeHigh) {
-                $sizeMatches[] = $result;
-            }
-        }
-
-        if (!empty($sizeMatches)) {
-            return Map::from($sizeMatches)->usort(fn($a, $b) => $a->seeders <=> $b->seeders)->last();
-        }
-
-        foreach ($matches as $result) {
-            $size = 0;
-            if (str_contains($result->size, 'GB')) {
-                $size = (int) trim(str_replace('GB', '', $result->size)) * 1024;
-            } else {
-                $size = (int) trim(str_replace('MB', '', $result->size));
-            }
-
-            if ($size > $sizeLow && $size < $sizeHigh) {
-                $sizeMatches[] = $result;
-            }
-        }
-
-        if (!empty($sizeMatches)) {
-            return Map::from($sizeMatches)->usort(fn($a, $b) => $a->seeders <=> $b->seeders)->last();
-        }
-
-        return null;
-    }
-}
diff --git a/src/Search/Action/Handler/GetMediaInfoHandler.php b/src/Search/Action/Handler/GetMediaInfoHandler.php
index 24ae107..85bf597 100644
--- a/src/Search/Action/Handler/GetMediaInfoHandler.php
+++ b/src/Search/Action/Handler/GetMediaInfoHandler.php
@@ -2,6 +2,7 @@
 
 namespace App\Search\Action\Handler;
 
+use App\Base\Service\MediaFiles;
 use App\Search\Action\Command\GetMediaInfoCommand;
 use App\Search\Action\Result\GetMediaInfoResult;
 use App\Tmdb\Tmdb;
@@ -14,12 +15,17 @@ class GetMediaInfoHandler implements HandlerInterface
 {
     public function __construct(
         private readonly Tmdb $tmdb,
+        private readonly MediaFiles $mediaFiles
     ) {}
 
     public function handle(CommandInterface $command): ResultInterface
     {
         $media = $this->tmdb->mediaDetails($command->imdbId, $command->mediaType);
 
+        foreach ($media->episodes[$command->season] as $key => $episode) {
+            $media->episodes[$command->season][$key]['file'] = $this->mediaFiles->episodeExists($media->title, $command->season, $episode['episode_number']);
+        }
+
         return new GetMediaInfoResult($media, $command->season);
     }
 }
diff --git a/src/Torrentio/Action/Handler/GetMovieOptionsHandler.php b/src/Torrentio/Action/Handler/GetMovieOptionsHandler.php
index 51b9398..cc69ef1 100644
--- a/src/Torrentio/Action/Handler/GetMovieOptionsHandler.php
+++ b/src/Torrentio/Action/Handler/GetMovieOptionsHandler.php
@@ -2,7 +2,7 @@
 
 namespace App\Torrentio\Action\Handler;
 
-use App\Monitor\Service\MediaFiles;
+use App\Base\Service\MediaFiles;
 use App\Tmdb\Tmdb;
 use App\Torrentio\Action\Result\GetMovieOptionsResult;
 use App\Torrentio\Client\Torrentio;
diff --git a/src/Torrentio/Action/Handler/GetTvShowOptionsHandler.php b/src/Torrentio/Action/Handler/GetTvShowOptionsHandler.php
index 1ef80a8..825d0e6 100644
--- a/src/Torrentio/Action/Handler/GetTvShowOptionsHandler.php
+++ b/src/Torrentio/Action/Handler/GetTvShowOptionsHandler.php
@@ -2,7 +2,7 @@
 
 namespace App\Torrentio\Action\Handler;
 
-use App\Monitor\Service\MediaFiles;
+use App\Base\Service\MediaFiles;
 use App\Tmdb\Tmdb;
 use App\Torrentio\Action\Command\GetTvShowOptionsCommand;
 use App\Torrentio\Action\Result\GetTvShowOptionsResult;
diff --git a/src/Twig/Extensions/UtilExtension.php b/src/Twig/Extensions/UtilExtension.php
index fe80928..436b67a 100644
--- a/src/Twig/Extensions/UtilExtension.php
+++ b/src/Twig/Extensions/UtilExtension.php
@@ -2,12 +2,9 @@
 
 namespace App\Twig\Extensions;
 
-use App\Monitor\Framework\Entity\Monitor;
-use App\Monitor\Service\MediaFiles;
+use App\Base\Service\MediaFiles;
 use App\Torrentio\Action\Result\GetTvShowOptionsResult;
-use App\Torrentio\Result\TorrentioResult;
 use ChrisUllyott\FileSize;
-use Tmdb\Model\Tv\Episode;
 use Twig\Attribute\AsTwigFilter;
 use Twig\Attribute\AsTwigFunction;
 
diff --git a/templates/components/TvEpisodeList.html.twig b/templates/components/TvEpisodeList.html.twig
index ecff6af..e58fde7 100644
--- a/templates/components/TvEpisodeList.html.twig
+++ b/templates/components/TvEpisodeList.html.twig
@@ -39,6 +39,31 @@
                                 <small class="py-1 px-1.5 mr-1 grow-0 font-bold bg-gray-700 rounded-lg font-normal text-white" title="Air date {{ episode['name'] }}">
                                     {{ episode['air_date']|date(null, 'UTC') }}
                                 </small>
+
+                                {% if episode['file'] != false %}
+                                    <span data-controller="popover">
+                                        <template data-popover-target="content">
+                                            <div data-popover-target="card" class="absolute z-40 p-1 bg-stone-400 p-1 text-black rounded-md m-1 animate-fade">
+                                                <p class="font-bold text-sm text-left">Existing file(s) for this episode:</p>
+                                                <ul class="list-disc ml-3">
+                                                    <li class="font-normal">{{ episode['file'].realPath|strip_media_path }} &mdash; <strong>{{ episode['file'].size|filesize }}</strong></li>
+                                                </ul>
+                                            </div>
+                                        </template>
+                                        <small
+                                                class="py-1 px-1.5 mr-1 grow-0 font-bold bg-blue-600 rounded-lg text-center text-white"
+                                                data-action="mouseenter->popover#show mouseleave->popover#hide"
+                                        >
+                                            exists
+                                        </small>
+                                    </span>
+                                {% endif %}
+
+                                {% if episode['file'] == false %}
+                                    <small class="py-1 px-1.5 mr-1 grow-0 font-bold bg-rose-600 rounded-lg text-white" title="Episode has not been downloaded yet.">
+                                        missing
+                                    </small>
+                                {% endif %}
                             </div>
                         </div>
                         <div class="flex flex-col gap-4 justify-between">