diff --git a/src/invidious.cr b/src/invidious.cr
index 19029fd7..315bb3f3 100644
--- a/src/invidious.cr
+++ b/src/invidious.cr
@@ -296,193 +296,7 @@ end
 Invidious::Routing.get "/", Invidious::Routes::Home
 Invidious::Routing.get "/privacy", Invidious::Routes::Privacy
 Invidious::Routing.get "/licenses", Invidious::Routes::Licenses
-
-# Videos
-
-get "/watch" do |env|
-  locale = LOCALES[env.get("preferences").as(Preferences).locale]?
-  region = env.params.query["region"]?
-
-  if env.params.query.to_s.includes?("%20") || env.params.query.to_s.includes?("+")
-    url = "/watch?" + env.params.query.to_s.gsub("%20", "").delete("+")
-    next env.redirect url
-  end
-
-  if env.params.query["v"]?
-    id = env.params.query["v"]
-
-    if env.params.query["v"].empty?
-      error_message = "Invalid parameters."
-      env.response.status_code = 400
-      next templated "error"
-    end
-
-    if id.size > 11
-      url = "/watch?v=#{id[0, 11]}"
-      env.params.query.delete_all("v")
-      if env.params.query.size > 0
-        url += "&#{env.params.query}"
-      end
-
-      next env.redirect url
-    end
-  else
-    next env.redirect "/"
-  end
-
-  plid = env.params.query["list"]?.try &.gsub(/[^a-zA-Z0-9_-]/, "")
-  continuation = process_continuation(PG_DB, env.params.query, plid, id)
-
-  nojs = env.params.query["nojs"]?
-
-  nojs ||= "0"
-  nojs = nojs == "1"
-
-  preferences = env.get("preferences").as(Preferences)
-
-  user = env.get?("user").try &.as(User)
-  if user
-    subscriptions = user.subscriptions
-    watched = user.watched
-    notifications = user.notifications
-  end
-  subscriptions ||= [] of String
-
-  params = process_video_params(env.params.query, preferences)
-  env.params.query.delete_all("listen")
-
-  begin
-    video = get_video(id, PG_DB, region: params.region)
-  rescue ex : VideoRedirect
-    next env.redirect env.request.resource.gsub(id, ex.video_id)
-  rescue ex
-    error_message = ex.message
-    env.response.status_code = 500
-    logger.puts("#{id} : #{ex.message}")
-    next templated "error"
-  end
-
-  if preferences.annotations_subscribed &&
-     subscriptions.includes?(video.ucid) &&
-     (env.params.query["iv_load_policy"]? || "1") == "1"
-    params.annotations = true
-  end
-  env.params.query.delete_all("iv_load_policy")
-
-  if watched && !watched.includes? id
-    PG_DB.exec("UPDATE users SET watched = array_append(watched, $1) WHERE email = $2", id, user.as(User).email)
-  end
-
-  if notifications && notifications.includes? id
-    PG_DB.exec("UPDATE users SET notifications = array_remove(notifications, $1) WHERE email = $2", id, user.as(User).email)
-    env.get("user").as(User).notifications.delete(id)
-    notifications.delete(id)
-  end
-
-  if nojs
-    if preferences
-      source = preferences.comments[0]
-      if source.empty?
-        source = preferences.comments[1]
-      end
-
-      if source == "youtube"
-        begin
-          comment_html = JSON.parse(fetch_youtube_comments(id, PG_DB, nil, "html", locale, preferences.thin_mode, region))["contentHtml"]
-        rescue ex
-          if preferences.comments[1] == "reddit"
-            comments, reddit_thread = fetch_reddit_comments(id)
-            comment_html = template_reddit_comments(comments, locale)
-
-            comment_html = fill_links(comment_html, "https", "www.reddit.com")
-            comment_html = replace_links(comment_html)
-          end
-        end
-      elsif source == "reddit"
-        begin
-          comments, reddit_thread = fetch_reddit_comments(id)
-          comment_html = template_reddit_comments(comments, locale)
-
-          comment_html = fill_links(comment_html, "https", "www.reddit.com")
-          comment_html = replace_links(comment_html)
-        rescue ex
-          if preferences.comments[1] == "youtube"
-            comment_html = JSON.parse(fetch_youtube_comments(id, PG_DB, nil, "html", locale, preferences.thin_mode, region))["contentHtml"]
-          end
-        end
-      end
-    else
-      comment_html = JSON.parse(fetch_youtube_comments(id, PG_DB, nil, "html", locale, preferences.thin_mode, region))["contentHtml"]
-    end
-
-    comment_html ||= ""
-  end
-
-  fmt_stream = video.fmt_stream
-  adaptive_fmts = video.adaptive_fmts
-
-  if params.local
-    fmt_stream.each { |fmt| fmt["url"] = JSON::Any.new(URI.parse(fmt["url"].as_s).full_path) }
-    adaptive_fmts.each { |fmt| fmt["url"] = JSON::Any.new(URI.parse(fmt["url"].as_s).full_path) }
-  end
-
-  video_streams = video.video_streams
-  audio_streams = video.audio_streams
-
-  # Older videos may not have audio sources available.
-  # We redirect here so they're not unplayable
-  if audio_streams.empty? && !video.live_now
-    if params.quality == "dash"
-      env.params.query.delete_all("quality")
-      env.params.query["quality"] = "medium"
-      next env.redirect "/watch?#{env.params.query}"
-    elsif params.listen
-      env.params.query.delete_all("listen")
-      env.params.query["listen"] = "0"
-      next env.redirect "/watch?#{env.params.query}"
-    end
-  end
-
-  captions = video.captions
-
-  preferred_captions = captions.select { |caption|
-    params.preferred_captions.includes?(caption.name.simpleText) ||
-      params.preferred_captions.includes?(caption.languageCode.split("-")[0])
-  }
-  preferred_captions.sort_by! { |caption|
-    (params.preferred_captions.index(caption.name.simpleText) ||
-      params.preferred_captions.index(caption.languageCode.split("-")[0])).not_nil!
-  }
-  captions = captions - preferred_captions
-
-  aspect_ratio = "16:9"
-
-  thumbnail = "/vi/#{video.id}/maxres.jpg"
-
-  if params.raw
-    if params.listen
-      url = audio_streams[0]["url"].as_s
-
-      audio_streams.each do |fmt|
-        if fmt["bitrate"].as_i == params.quality.rchop("k").to_i
-          url = fmt["url"].as_s
-        end
-      end
-    else
-      url = fmt_stream[0]["url"].as_s
-
-      fmt_stream.each do |fmt|
-        if fmt["quality"].as_s == params.quality
-          url = fmt["url"].as_s
-        end
-      end
-    end
-
-    next env.redirect url
-  end
-
-  templated "watch"
-end
+Invidious::Routing.get "/watch", Invidious::Routes::Watch
 
 get "/embed/" do |env|
   locale = LOCALES[env.get("preferences").as(Preferences).locale]?
diff --git a/src/invidious/routes/base_route.cr b/src/invidious/routes/base_route.cr
index 576c1746..c6e6667e 100644
--- a/src/invidious/routes/base_route.cr
+++ b/src/invidious/routes/base_route.cr
@@ -1,7 +1,8 @@
 abstract class Invidious::Routes::BaseRoute
   private getter config : Config
+  private getter logger : Invidious::LogHandler
 
-  def initialize(@config)
+  def initialize(@config, @logger)
   end
 
   abstract def handle(env)
diff --git a/src/invidious/routes/watch.cr b/src/invidious/routes/watch.cr
new file mode 100644
index 00000000..4eee7793
--- /dev/null
+++ b/src/invidious/routes/watch.cr
@@ -0,0 +1,186 @@
+class Invidious::Routes::Watch < Invidious::Routes::BaseRoute
+  def handle(env)
+    locale = LOCALES[env.get("preferences").as(Preferences).locale]?
+    region = env.params.query["region"]?
+
+    if env.params.query.to_s.includes?("%20") || env.params.query.to_s.includes?("+")
+      url = "/watch?" + env.params.query.to_s.gsub("%20", "").delete("+")
+      return env.redirect url
+    end
+
+    if env.params.query["v"]?
+      id = env.params.query["v"]
+
+      if env.params.query["v"].empty?
+        error_message = "Invalid parameters."
+        env.response.status_code = 400
+        return templated "error"
+      end
+
+      if id.size > 11
+        url = "/watch?v=#{id[0, 11]}"
+        env.params.query.delete_all("v")
+        if env.params.query.size > 0
+          url += "&#{env.params.query}"
+        end
+
+        return env.redirect url
+      end
+    else
+      return env.redirect "/"
+    end
+
+    plid = env.params.query["list"]?.try &.gsub(/[^a-zA-Z0-9_-]/, "")
+    continuation = process_continuation(PG_DB, env.params.query, plid, id)
+
+    nojs = env.params.query["nojs"]?
+
+    nojs ||= "0"
+    nojs = nojs == "1"
+
+    preferences = env.get("preferences").as(Preferences)
+
+    user = env.get?("user").try &.as(User)
+    if user
+      subscriptions = user.subscriptions
+      watched = user.watched
+      notifications = user.notifications
+    end
+    subscriptions ||= [] of String
+
+    params = process_video_params(env.params.query, preferences)
+    env.params.query.delete_all("listen")
+
+    begin
+      video = get_video(id, PG_DB, region: params.region)
+    rescue ex : VideoRedirect
+      return env.redirect env.request.resource.gsub(id, ex.video_id)
+    rescue ex
+      error_message = ex.message
+      env.response.status_code = 500
+      logger.puts("#{id} : #{ex.message}")
+      return templated "error"
+    end
+
+    if preferences.annotations_subscribed &&
+       subscriptions.includes?(video.ucid) &&
+       (env.params.query["iv_load_policy"]? || "1") == "1"
+      params.annotations = true
+    end
+    env.params.query.delete_all("iv_load_policy")
+
+    if watched && !watched.includes? id
+      PG_DB.exec("UPDATE users SET watched = array_append(watched, $1) WHERE email = $2", id, user.as(User).email)
+    end
+
+    if notifications && notifications.includes? id
+      PG_DB.exec("UPDATE users SET notifications = array_remove(notifications, $1) WHERE email = $2", id, user.as(User).email)
+      env.get("user").as(User).notifications.delete(id)
+      notifications.delete(id)
+    end
+
+    if nojs
+      if preferences
+        source = preferences.comments[0]
+        if source.empty?
+          source = preferences.comments[1]
+        end
+
+        if source == "youtube"
+          begin
+            comment_html = JSON.parse(fetch_youtube_comments(id, PG_DB, nil, "html", locale, preferences.thin_mode, region))["contentHtml"]
+          rescue ex
+            if preferences.comments[1] == "reddit"
+              comments, reddit_thread = fetch_reddit_comments(id)
+              comment_html = template_reddit_comments(comments, locale)
+
+              comment_html = fill_links(comment_html, "https", "www.reddit.com")
+              comment_html = replace_links(comment_html)
+            end
+          end
+        elsif source == "reddit"
+          begin
+            comments, reddit_thread = fetch_reddit_comments(id)
+            comment_html = template_reddit_comments(comments, locale)
+
+            comment_html = fill_links(comment_html, "https", "www.reddit.com")
+            comment_html = replace_links(comment_html)
+          rescue ex
+            if preferences.comments[1] == "youtube"
+              comment_html = JSON.parse(fetch_youtube_comments(id, PG_DB, nil, "html", locale, preferences.thin_mode, region))["contentHtml"]
+            end
+          end
+        end
+      else
+        comment_html = JSON.parse(fetch_youtube_comments(id, PG_DB, nil, "html", locale, preferences.thin_mode, region))["contentHtml"]
+      end
+
+      comment_html ||= ""
+    end
+
+    fmt_stream = video.fmt_stream
+    adaptive_fmts = video.adaptive_fmts
+
+    if params.local
+      fmt_stream.each { |fmt| fmt["url"] = JSON::Any.new(URI.parse(fmt["url"].as_s).full_path) }
+      adaptive_fmts.each { |fmt| fmt["url"] = JSON::Any.new(URI.parse(fmt["url"].as_s).full_path) }
+    end
+
+    video_streams = video.video_streams
+    audio_streams = video.audio_streams
+
+    # Older videos may not have audio sources available.
+    # We redirect here so they're not unplayable
+    if audio_streams.empty? && !video.live_now
+      if params.quality == "dash"
+        env.params.query.delete_all("quality")
+        env.params.query["quality"] = "medium"
+        return env.redirect "/watch?#{env.params.query}"
+      elsif params.listen
+        env.params.query.delete_all("listen")
+        env.params.query["listen"] = "0"
+        return env.redirect "/watch?#{env.params.query}"
+      end
+    end
+
+    captions = video.captions
+
+    preferred_captions = captions.select { |caption|
+      params.preferred_captions.includes?(caption.name.simpleText) ||
+        params.preferred_captions.includes?(caption.languageCode.split("-")[0])
+    }
+    preferred_captions.sort_by! { |caption|
+      (params.preferred_captions.index(caption.name.simpleText) ||
+        params.preferred_captions.index(caption.languageCode.split("-")[0])).not_nil!
+    }
+    captions = captions - preferred_captions
+
+    aspect_ratio = "16:9"
+
+    thumbnail = "/vi/#{video.id}/maxres.jpg"
+
+    if params.raw
+      if params.listen
+        url = audio_streams[0]["url"].as_s
+
+        audio_streams.each do |fmt|
+          if fmt["bitrate"].as_i == params.quality.rchop("k").to_i
+            url = fmt["url"].as_s
+          end
+        end
+      else
+        url = fmt_stream[0]["url"].as_s
+
+        fmt_stream.each do |fmt|
+          if fmt["quality"].as_s == params.quality
+            url = fmt["url"].as_s
+          end
+        end
+      end
+
+      return env.redirect url
+    end
+
+    templated "watch"
+  end
+end
diff --git a/src/invidious/routing.cr b/src/invidious/routing.cr
index a096db44..c09dda38 100644
--- a/src/invidious/routing.cr
+++ b/src/invidious/routing.cr
@@ -1,7 +1,7 @@
 module Invidious::Routing
   macro get(path, controller)
     get {{ path }} do |env|
-      controller_instance = {{ controller }}.new(config)
+      controller_instance = {{ controller }}.new(config, logger)
       controller_instance.handle(env)
     end
   end