diff --git a/.gitignore b/.gitignore
index 6a2bf47..f5dd7da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -88,3 +88,6 @@ ENV/
 
 # Rope project settings
 .ropeproject
+
+static/Filmid/
+static/filmid/
diff --git a/api/karumedia/controllers.py b/api/karumedia/controllers.py
index a43a0be..dd3b5f9 100644
--- a/api/karumedia/controllers.py
+++ b/api/karumedia/controllers.py
@@ -48,6 +48,7 @@ class MoviesCollection(BaseResource):
                     "synopsis": metadata["plot_outline"],
                     "mpa_rating": metadata["certification"],
                     "genres": metadata["genres"],
+                    "yt_trailer_code": metadata["yt_trailer_code"],
                     "state": "ok"
                 }
                 try:
diff --git a/metainfo-dl.py b/metainfo-dl.py
index 5b03984..8ac9d4f 100644
--- a/metainfo-dl.py
+++ b/metainfo-dl.py
@@ -7,13 +7,17 @@ import requests
 from pprint import pprint
 import re
 import logging
-from logging import info, debug, warning
+from logging import info, debug, warning, error
 import subprocess
 
 logging.basicConfig(level=logging.DEBUG)
 
 movie_dir = "/media/kraam/Videod/Filmid/Nimed"
 
+YTKEY = os.environ.get("YTKEY")
+if not YTKEY:
+    error("YTKEY not set")
+    exit(1)
 
 imdb = Imdb()
 
@@ -42,7 +46,7 @@ def write_metadata(movie_dir, mm):
                 "genres": mm.genres,
                 "plots": mm.plots,
                 "imdb_id":str(mm.imdb_id)}
-    
+
     info("opening metadata.json in {} for {}".format(movie_dir, metadata["title"]))
     with open(movie_dir+"/metadata.json", "w") as f:
         info("writing metadata for {}".format(metadata["title"]))
@@ -76,14 +80,30 @@ def download_trailer(movie_dir, metadata):
     subprocess.call(['wget', trailer[2],
                      "-O", movie_dir+"/trailer.mp4"])
 
+def add_yt_trailer_code(md):
+    params = {"key": YTKEY,
+              "part":"id", "maxResults":1,
+              "q":"{} ({}) trailer".format(md.get("title"), md.get("year", ""))}
+    r = requests.get("https://www.googleapis.com/youtube/v3/search", params=params)
+    md["yt_trailer_code"] = r.json()["items"][0]["id"]["videoId"]
+    return md
+
 def metadata_update_needed(metadata_file):
     with open(metadata_file, "r") as f:
         md = json.loads(f.read())
         if "imdb_id" not in md:
             return True
+        elif "yt_trailer_code" not in md:
+            md = add_yt_trailer_code(md)
+            print(md.get("title"), md.get("yt_trailer_code"))
+            fd = open(metadata_file, "w")
+            fd.write(json.dumps(md, indent=4, sort_keys=True))
+            fd.close()
         else:
             return False
 
+
+
 for movie in os.listdir(movie_dir):
     #print(movie)
     if os.path.isfile(movie_dir+"/"+movie+"/metadata.json") \
@@ -103,6 +123,3 @@ for movie in os.listdir(movie_dir):
     except:
         logging.exception("Poster download failed")
     #download_trailer(movie_dir+"/"+movie, mm)
-
-
-