diff --git a/migrations/20190325001339_releases.js b/migrations/20190325001339_releases.js
index 6d76dc6e..901697bd 100644
--- a/migrations/20190325001339_releases.js
+++ b/migrations/20190325001339_releases.js
@@ -184,7 +184,6 @@ exports.up = knex => Promise.resolve()
 
         table.string('shoot_id');
         table.string('entry_id');
-        table.unique(['site_id', 'shoot_id']);
         table.unique(['site_id', 'entry_id']);
 
         table.string('url', 1000);
diff --git a/public/img/logos/naughtyamerica/2chickssametime.png b/public/img/logos/naughtyamerica/2chickssametime.png
new file mode 100644
index 00000000..f72fdb63
Binary files /dev/null and b/public/img/logos/naughtyamerica/2chickssametime.png differ
diff --git a/public/img/logos/naughtyamerica/americandaydreams.png b/public/img/logos/naughtyamerica/americandaydreams.png
new file mode 100644
index 00000000..6fd441aa
Binary files /dev/null and b/public/img/logos/naughtyamerica/americandaydreams.png differ
diff --git a/public/img/logos/naughtyamerica/analcollege.png b/public/img/logos/naughtyamerica/analcollege.png
new file mode 100644
index 00000000..433b5e32
Binary files /dev/null and b/public/img/logos/naughtyamerica/analcollege.png differ
diff --git a/public/img/logos/naughtyamerica/asian1on1.png b/public/img/logos/naughtyamerica/asian1on1.png
new file mode 100644
index 00000000..31c86cdc
Binary files /dev/null and b/public/img/logos/naughtyamerica/asian1on1.png differ
diff --git a/public/img/logos/naughtyamerica/assmasterpiece.png b/public/img/logos/naughtyamerica/assmasterpiece.png
new file mode 100644
index 00000000..b4c9fc97
Binary files /dev/null and b/public/img/logos/naughtyamerica/assmasterpiece.png differ
diff --git a/public/img/logos/naughtyamerica/bigcockbully.png b/public/img/logos/naughtyamerica/bigcockbully.png
new file mode 100644
index 00000000..34827a2e
Binary files /dev/null and b/public/img/logos/naughtyamerica/bigcockbully.png differ
diff --git a/public/img/logos/naughtyamerica/bigcockhero.png b/public/img/logos/naughtyamerica/bigcockhero.png
new file mode 100644
index 00000000..317dc72c
Binary files /dev/null and b/public/img/logos/naughtyamerica/bigcockhero.png differ
diff --git a/public/img/logos/naughtyamerica/diaryofamilf.png b/public/img/logos/naughtyamerica/diaryofamilf.png
new file mode 100644
index 00000000..7a26fe8b
Binary files /dev/null and b/public/img/logos/naughtyamerica/diaryofamilf.png differ
diff --git a/public/img/logos/naughtyamerica/diaryofananny.png b/public/img/logos/naughtyamerica/diaryofananny.png
new file mode 100644
index 00000000..0a6e9ef0
Binary files /dev/null and b/public/img/logos/naughtyamerica/diaryofananny.png differ
diff --git a/public/img/logos/naughtyamerica/dirtywivesclub.png b/public/img/logos/naughtyamerica/dirtywivesclub.png
new file mode 100644
index 00000000..0c71f936
Binary files /dev/null and b/public/img/logos/naughtyamerica/dirtywivesclub.png differ
diff --git a/public/img/logos/naughtyamerica/fasttimes.png b/public/img/logos/naughtyamerica/fasttimes.png
new file mode 100644
index 00000000..2106cf98
Binary files /dev/null and b/public/img/logos/naughtyamerica/fasttimes.png differ
diff --git a/public/img/logos/naughtyamerica/housewife1on1.png b/public/img/logos/naughtyamerica/housewife1on1.png
new file mode 100644
index 00000000..31c622ce
Binary files /dev/null and b/public/img/logos/naughtyamerica/housewife1on1.png differ
diff --git a/public/img/logos/naughtyamerica/ihaveawife.png b/public/img/logos/naughtyamerica/ihaveawife.png
new file mode 100644
index 00000000..d0bceefa
Binary files /dev/null and b/public/img/logos/naughtyamerica/ihaveawife.png differ
diff --git a/public/img/logos/naughtyamerica/insidenaughtyamerica.png b/public/img/logos/naughtyamerica/insidenaughtyamerica.png
new file mode 100644
index 00000000..09ef5cd8
Binary files /dev/null and b/public/img/logos/naughtyamerica/insidenaughtyamerica.png differ
diff --git a/public/img/logos/naughtyamerica/lasluts.png b/public/img/logos/naughtyamerica/lasluts.png
new file mode 100644
index 00000000..bc03daeb
Binary files /dev/null and b/public/img/logos/naughtyamerica/lasluts.png differ
diff --git a/public/img/logos/naughtyamerica/latinadultery.png b/public/img/logos/naughtyamerica/latinadultery.png
new file mode 100644
index 00000000..c4b45d4b
Binary files /dev/null and b/public/img/logos/naughtyamerica/latinadultery.png differ
diff --git a/public/img/logos/naughtyamerica/latinastepmom.png b/public/img/logos/naughtyamerica/latinastepmom.png
new file mode 100644
index 00000000..916e5add
Binary files /dev/null and b/public/img/logos/naughtyamerica/latinastepmom.png differ
diff --git a/public/img/logos/naughtyamerica/lesbiangirlongirl.png b/public/img/logos/naughtyamerica/lesbiangirlongirl.png
new file mode 100644
index 00000000..83333bca
Binary files /dev/null and b/public/img/logos/naughtyamerica/lesbiangirlongirl.png differ
diff --git a/public/img/logos/naughtyamerica/livegymcam.png b/public/img/logos/naughtyamerica/livegymcam.png
new file mode 100644
index 00000000..c436aac0
Binary files /dev/null and b/public/img/logos/naughtyamerica/livegymcam.png differ
diff --git a/public/img/logos/naughtyamerica/livenaughtymilf.png b/public/img/logos/naughtyamerica/livenaughtymilf.png
new file mode 100644
index 00000000..97627345
Binary files /dev/null and b/public/img/logos/naughtyamerica/livenaughtymilf.png differ
diff --git a/public/img/logos/naughtyamerica/livenaughtynurse.png b/public/img/logos/naughtyamerica/livenaughtynurse.png
new file mode 100644
index 00000000..ecc1ccd2
Binary files /dev/null and b/public/img/logos/naughtyamerica/livenaughtynurse.png differ
diff --git a/public/img/logos/naughtyamerica/livenaughtysecretary.png b/public/img/logos/naughtyamerica/livenaughtysecretary.png
new file mode 100644
index 00000000..c580871a
Binary files /dev/null and b/public/img/logos/naughtyamerica/livenaughtysecretary.png differ
diff --git a/public/img/logos/naughtyamerica/livenaughtystudent.png b/public/img/logos/naughtyamerica/livenaughtystudent.png
new file mode 100644
index 00000000..9a667812
Binary files /dev/null and b/public/img/logos/naughtyamerica/livenaughtystudent.png differ
diff --git a/public/img/logos/naughtyamerica/livenaughtyteacher.png b/public/img/logos/naughtyamerica/livenaughtyteacher.png
new file mode 100644
index 00000000..5faf95ac
Binary files /dev/null and b/public/img/logos/naughtyamerica/livenaughtyteacher.png differ
diff --git a/public/img/logos/naughtyamerica/livepartygirl.png b/public/img/logos/naughtyamerica/livepartygirl.png
new file mode 100644
index 00000000..8dbaa52c
Binary files /dev/null and b/public/img/logos/naughtyamerica/livepartygirl.png differ
diff --git a/public/img/logos/naughtyamerica/milfsugarbabesclassic.png b/public/img/logos/naughtyamerica/milfsugarbabesclassic.png
new file mode 100644
index 00000000..afc601ac
Binary files /dev/null and b/public/img/logos/naughtyamerica/milfsugarbabesclassic.png differ
diff --git a/public/img/logos/naughtyamerica/momshoney.png b/public/img/logos/naughtyamerica/momshoney.png
new file mode 100644
index 00000000..d760df0b
Binary files /dev/null and b/public/img/logos/naughtyamerica/momshoney.png differ
diff --git a/public/img/logos/naughtyamerica/mydadshotgirlfriend.png b/public/img/logos/naughtyamerica/mydadshotgirlfriend.png
new file mode 100644
index 00000000..866b06c7
Binary files /dev/null and b/public/img/logos/naughtyamerica/mydadshotgirlfriend.png differ
diff --git a/public/img/logos/naughtyamerica/mydaughtershotfriend.png b/public/img/logos/naughtyamerica/mydaughtershotfriend.png
new file mode 100644
index 00000000..ed480782
Binary files /dev/null and b/public/img/logos/naughtyamerica/mydaughtershotfriend.png differ
diff --git a/public/img/logos/naughtyamerica/myfirstsexteacher.png b/public/img/logos/naughtyamerica/myfirstsexteacher.png
new file mode 100644
index 00000000..9d10fc39
Binary files /dev/null and b/public/img/logos/naughtyamerica/myfirstsexteacher.png differ
diff --git a/public/img/logos/naughtyamerica/myfriendshotgirl.png b/public/img/logos/naughtyamerica/myfriendshotgirl.png
new file mode 100644
index 00000000..1a7962df
Binary files /dev/null and b/public/img/logos/naughtyamerica/myfriendshotgirl.png differ
diff --git a/public/img/logos/naughtyamerica/myfriendshotmom.png b/public/img/logos/naughtyamerica/myfriendshotmom.png
new file mode 100644
index 00000000..21b90029
Binary files /dev/null and b/public/img/logos/naughtyamerica/myfriendshotmom.png differ
diff --git a/public/img/logos/naughtyamerica/mygirlfriendsbustyfriend.png b/public/img/logos/naughtyamerica/mygirlfriendsbustyfriend.png
new file mode 100644
index 00000000..71bca2e7
Binary files /dev/null and b/public/img/logos/naughtyamerica/mygirlfriendsbustyfriend.png differ
diff --git a/public/img/logos/naughtyamerica/mygirllovesanal.png b/public/img/logos/naughtyamerica/mygirllovesanal.png
new file mode 100644
index 00000000..721a9e6c
Binary files /dev/null and b/public/img/logos/naughtyamerica/mygirllovesanal.png differ
diff --git a/public/img/logos/naughtyamerica/mynaughtylatinmaid.png b/public/img/logos/naughtyamerica/mynaughtylatinmaid.png
new file mode 100644
index 00000000..badf4cd2
Binary files /dev/null and b/public/img/logos/naughtyamerica/mynaughtylatinmaid.png differ
diff --git a/public/img/logos/naughtyamerica/mynaughtymassage.png b/public/img/logos/naughtyamerica/mynaughtymassage.png
new file mode 100644
index 00000000..f6617a7d
Binary files /dev/null and b/public/img/logos/naughtyamerica/mynaughtymassage.png differ
diff --git a/public/img/logos/naughtyamerica/mysistershotfriend.png b/public/img/logos/naughtyamerica/mysistershotfriend.png
new file mode 100644
index 00000000..788d1461
Binary files /dev/null and b/public/img/logos/naughtyamerica/mysistershotfriend.png differ
diff --git a/public/img/logos/naughtyamerica/mywifeismypornstar.png b/public/img/logos/naughtyamerica/mywifeismypornstar.png
new file mode 100644
index 00000000..980cbfd0
Binary files /dev/null and b/public/img/logos/naughtyamerica/mywifeismypornstar.png differ
diff --git a/public/img/logos/naughtyamerica/mywifeshotfriend.png b/public/img/logos/naughtyamerica/mywifeshotfriend.png
new file mode 100644
index 00000000..a54cc435
Binary files /dev/null and b/public/img/logos/naughtyamerica/mywifeshotfriend.png differ
diff --git a/public/img/logos/naughtyamerica/naughtyamerica.png b/public/img/logos/naughtyamerica/naughtyamerica.png
new file mode 100644
index 00000000..59c07315
Binary files /dev/null and b/public/img/logos/naughtyamerica/naughtyamerica.png differ
diff --git a/public/img/logos/naughtyamerica/naughtyathletics.png b/public/img/logos/naughtyamerica/naughtyathletics.png
new file mode 100644
index 00000000..5e1ddc54
Binary files /dev/null and b/public/img/logos/naughtyamerica/naughtyathletics.png differ
diff --git a/public/img/logos/naughtyamerica/naughtybookworms.png b/public/img/logos/naughtyamerica/naughtybookworms.png
new file mode 100644
index 00000000..729e20da
Binary files /dev/null and b/public/img/logos/naughtyamerica/naughtybookworms.png differ
diff --git a/public/img/logos/naughtyamerica/naughtycountrygirls.png b/public/img/logos/naughtyamerica/naughtycountrygirls.png
new file mode 100644
index 00000000..5a7ff263
Binary files /dev/null and b/public/img/logos/naughtyamerica/naughtycountrygirls.png differ
diff --git a/public/img/logos/naughtyamerica/naughtyflipside.png b/public/img/logos/naughtyamerica/naughtyflipside.png
new file mode 100644
index 00000000..bca1d1a9
Binary files /dev/null and b/public/img/logos/naughtyamerica/naughtyflipside.png differ
diff --git a/public/img/logos/naughtyamerica/naughtyoffice.png b/public/img/logos/naughtyamerica/naughtyoffice.png
new file mode 100644
index 00000000..aadaac61
Binary files /dev/null and b/public/img/logos/naughtyamerica/naughtyoffice.png differ
diff --git a/public/img/logos/naughtyamerica/naughtyrichgirls.png b/public/img/logos/naughtyamerica/naughtyrichgirls.png
new file mode 100644
index 00000000..aeeaa72f
Binary files /dev/null and b/public/img/logos/naughtyamerica/naughtyrichgirls.png differ
diff --git a/public/img/logos/naughtyamerica/naughtyweddings.png b/public/img/logos/naughtyamerica/naughtyweddings.png
new file mode 100644
index 00000000..8a6249aa
Binary files /dev/null and b/public/img/logos/naughtyamerica/naughtyweddings.png differ
diff --git a/public/img/logos/naughtyamerica/neighboraffair.png b/public/img/logos/naughtyamerica/neighboraffair.png
new file mode 100644
index 00000000..b8c34971
Binary files /dev/null and b/public/img/logos/naughtyamerica/neighboraffair.png differ
diff --git a/public/img/logos/naughtyamerica/network.png b/public/img/logos/naughtyamerica/network.png
index 1bada75c..064dfef2 100644
Binary files a/public/img/logos/naughtyamerica/network.png and b/public/img/logos/naughtyamerica/network.png differ
diff --git a/public/img/logos/naughtyamerica/openfamily.png b/public/img/logos/naughtyamerica/openfamily.png
new file mode 100644
index 00000000..8a6e3dd7
Binary files /dev/null and b/public/img/logos/naughtyamerica/openfamily.png differ
diff --git a/public/img/logos/naughtyamerica/perfectfuckingstrangersclassic.png b/public/img/logos/naughtyamerica/perfectfuckingstrangersclassic.png
new file mode 100644
index 00000000..dae5e246
Binary files /dev/null and b/public/img/logos/naughtyamerica/perfectfuckingstrangersclassic.png differ
diff --git a/public/img/logos/naughtyamerica/seducedbyacougar.png b/public/img/logos/naughtyamerica/seducedbyacougar.png
new file mode 100644
index 00000000..d259b844
Binary files /dev/null and b/public/img/logos/naughtyamerica/seducedbyacougar.png differ
diff --git a/public/img/logos/naughtyamerica/showmybf.png b/public/img/logos/naughtyamerica/showmybf.png
new file mode 100644
index 00000000..7e14d47d
Binary files /dev/null and b/public/img/logos/naughtyamerica/showmybf.png differ
diff --git a/public/img/logos/naughtyamerica/sleazystepdad.png b/public/img/logos/naughtyamerica/sleazystepdad.png
new file mode 100644
index 00000000..35af505b
Binary files /dev/null and b/public/img/logos/naughtyamerica/sleazystepdad.png differ
diff --git a/public/img/logos/naughtyamerica/slutstepmom.png b/public/img/logos/naughtyamerica/slutstepmom.png
new file mode 100644
index 00000000..313a892a
Binary files /dev/null and b/public/img/logos/naughtyamerica/slutstepmom.png differ
diff --git a/public/img/logos/naughtyamerica/slutstepsister.png b/public/img/logos/naughtyamerica/slutstepsister.png
new file mode 100644
index 00000000..5f9fad6d
Binary files /dev/null and b/public/img/logos/naughtyamerica/slutstepsister.png differ
diff --git a/public/img/logos/naughtyamerica/socalcoeds.png b/public/img/logos/naughtyamerica/socalcoeds.png
new file mode 100644
index 00000000..ffd1536e
Binary files /dev/null and b/public/img/logos/naughtyamerica/socalcoeds.png differ
diff --git a/public/img/logos/naughtyamerica/teenslovecream.png b/public/img/logos/naughtyamerica/teenslovecream.png
new file mode 100644
index 00000000..e281ec65
Binary files /dev/null and b/public/img/logos/naughtyamerica/teenslovecream.png differ
diff --git a/public/img/logos/naughtyamerica/thepassenger.png b/public/img/logos/naughtyamerica/thepassenger.png
new file mode 100644
index 00000000..de2d1b01
Binary files /dev/null and b/public/img/logos/naughtyamerica/thepassenger.png differ
diff --git a/public/img/logos/naughtyamerica/tonightsfuck.png b/public/img/logos/naughtyamerica/tonightsfuck.png
new file mode 100644
index 00000000..2046e889
Binary files /dev/null and b/public/img/logos/naughtyamerica/tonightsfuck.png differ
diff --git a/public/img/logos/naughtyamerica/tonightsgirlfriendclassic.png b/public/img/logos/naughtyamerica/tonightsgirlfriendclassic.png
new file mode 100644
index 00000000..dad07cb8
Binary files /dev/null and b/public/img/logos/naughtyamerica/tonightsgirlfriendclassic.png differ
diff --git a/public/img/logos/naughtyamerica/watchyourmom.png b/public/img/logos/naughtyamerica/watchyourmom.png
new file mode 100644
index 00000000..0627949a
Binary files /dev/null and b/public/img/logos/naughtyamerica/watchyourmom.png differ
diff --git a/public/img/logos/naughtyamerica/watchyourwife.png b/public/img/logos/naughtyamerica/watchyourwife.png
new file mode 100644
index 00000000..9ed7d401
Binary files /dev/null and b/public/img/logos/naughtyamerica/watchyourwife.png differ
diff --git a/public/img/logos/naughtyamerica/wivesonvacation.png b/public/img/logos/naughtyamerica/wivesonvacation.png
new file mode 100644
index 00000000..d61fa16c
Binary files /dev/null and b/public/img/logos/naughtyamerica/wivesonvacation.png differ
diff --git a/src/releases.js b/src/releases.js
index ea977533..be802527 100644
--- a/src/releases.js
+++ b/src/releases.js
@@ -223,12 +223,16 @@ async function fetchTagReleases(queryObject, options = {}) {
 async function storeReleaseAssets(release, releaseId) {
     await createReleaseMediaDirectory(release, releaseId);
 
-    await Promise.all([
-        associateTags(release, releaseId),
-        storePhotos(release, releaseId),
-        storePoster(release, releaseId),
-        storeTrailer(release, releaseId),
-    ]);
+    try {
+        await Promise.all([
+            associateTags(release, releaseId),
+            storePhotos(release, releaseId),
+            storePoster(release, releaseId),
+            storeTrailer(release, releaseId),
+        ]);
+    } catch (error) {
+        console.log(release, error);
+    }
 }
 
 async function storeRelease(release) {
diff --git a/src/scrapers/naughtyamerica.js b/src/scrapers/naughtyamerica.js
index a055472c..6fcb8ec6 100644
--- a/src/scrapers/naughtyamerica.js
+++ b/src/scrapers/naughtyamerica.js
@@ -5,9 +5,6 @@ const bhttp = require('bhttp');
 const cheerio = require('cheerio');
 const moment = require('moment');
 
-const knex = require('../knex');
-const { matchTags } = require('../tags');
-
 function titleExtractor(pathname) {
     const components = pathname.split('/')[2].split('-');
     const entryId = components.slice(-1)[0];
@@ -34,6 +31,9 @@ function scrapeLatest(html, site) {
 
         const duration = Number(element.find('.scene-runtime').text().slice(0, -4)) * 60;
 
+        const posterString = sceneLinkElement.find('img[data-srcset]').attr('data-srcset') || sceneLinkElement.find('img[data-src]').attr('data-src');
+        const poster = `https:${posterString.match(/[\w/.]+$/)[0]}`;
+
         return {
             url,
             entryId,
@@ -41,6 +41,7 @@ function scrapeLatest(html, site) {
             actors,
             date,
             duration,
+            poster,
             rating: null,
             site,
         };
@@ -63,18 +64,17 @@ async function scrapeScene(html, url, site) {
 
     const duration = Number(sceneElement.find('.duration-ratings .duration').text().slice(10, -4)) * 60;
 
+    const poster = `https:${$('video, dl8-video').attr('poster')}`;
+    const photos = $('.contain-scene-images.desktop-only a').map((index, el) => `https:${$(el).attr('href')}`).toArray();
+
+    const trailerEl = $('source');
+    const trailerSrc = trailerEl.attr('src');
+    const trailerType = trailerEl.attr('type');
+
     const siteName = sceneElement.find('a.site-title').text();
-    const siteId = siteName.replace(/[\s']+/g, '').toLowerCase();
+    const channel = siteName.replace(/[\s']+/g, '').toLowerCase();
 
-    const rawTags = $('.categories a.cat-tag').map((tagIndex, tagElement) => $(tagElement).text()).toArray();
-
-    const [channelSite, tags] = await Promise.all([
-        knex('sites')
-            .where({ slug: siteId })
-            .orWhere({ name: siteName })
-            .first(),
-        matchTags(rawTags),
-    ]);
+    const tags = $('.categories a.cat-tag').map((tagIndex, tagElement) => $(tagElement).text()).toArray();
 
     return {
         url,
@@ -85,8 +85,15 @@ async function scrapeScene(html, url, site) {
         date,
         duration,
         tags,
+        photos,
+        poster,
+        trailer: {
+            src: trailerSrc,
+            type: trailerType,
+        },
         rating: null,
-        site: channelSite || site,
+        site,
+        channel,
     };
 }