diff --git a/components/video/card.vue b/components/video/card.vue
index c2fcdc6..b1336f6 100644
--- a/components/video/card.vue
+++ b/components/video/card.vue
@@ -10,12 +10,12 @@
                     <div class="relative overflow-hidden w-full pb-16/9">
                         <picture>
                             <source
-                                :sizes="thumbnailSizes"
-                                :data-srcset="thumbnailSrcset"
+                                :sizes="video.thumbnail.sizes"
+                                :data-srcset="video.thumbnail.srcset"
                                 type="image/jpg"
                             >
                             <img
-                                :data-src="video.thumbnails.default.url"
+                                :data-src="video.thumbnail.src"
                                 :alt="video.name"
                                 class="lazyload absolute h-full w-full object-cover"
                             >
@@ -64,8 +64,6 @@
 
 import 'lazysizes'
 
-// import { getVideoEndpoint } from '~/helpers/app-derived.js'
-
 export default {
     props: {
         video: {
@@ -74,26 +72,6 @@ export default {
         }
     },
     computed: {
-        thumbnailSizes () {
-            let maxWidth = 0
-            Object.entries(this.video.thumbnails).forEach(([thumbnailKey, thumbnail]) => {
-                if (thumbnail.width > maxWidth) maxWidth = thumbnail.width
-            })
-
-            // example:
-            // "(max-width: 640px) 100vw, 640px"
-            return `(max-width: ${maxWidth}px) 100vw, ${maxWidth}px`
-        },
-        thumbnailSrcset () {
-            // console.log('this.video', this.video)
-
-            // example:
-            // https://vumbnail.com/358629078.jpg 640w, https://vumbnail.com/358629078_large.jpg 640w, https://vumbnail.com/358629078_medium.jpg 200w, https://vumbnail.com/358629078_small.jpg 100w
-            return Object.entries(this.video.thumbnails).map(([thumbnailKey, thumbnail]) => {
-                // console.log('thumbnail', thumbnail)
-                return `${thumbnail.url} ${thumbnail.width}w`
-            }).join(', ')
-        },
         pill () {
             // if this video has a banchmark tag
             // then pill is 'Benchmark'
diff --git a/helpers/build-video-list.js b/helpers/build-video-list.js
index 94d3e6f..6f2dab4 100644
--- a/helpers/build-video-list.js
+++ b/helpers/build-video-list.js
@@ -87,6 +87,30 @@ const generateVideoTags = function ( video ) {
     return videoTags
 }
 
+const makeThumbnailData = function ( thumbnails ) {
+
+    let maxWidth = 0
+    Object.entries( thumbnails ).forEach(([thumbnailKey, thumbnail]) => {
+        if (thumbnail.width > maxWidth) maxWidth = thumbnail.width
+    })
+
+    const sizes = `(max-width: ${maxWidth}px) 100vw, ${maxWidth}px`
+
+    const srcset = Object.entries( thumbnails ).map(([thumbnailKey, thumbnail]) => {
+        // console.log('thumbnail', thumbnail)
+        return `${thumbnail.url} ${thumbnail.width}w`
+    }).join(', ')
+
+
+    const src = thumbnails.default.url
+
+    return {
+        sizes,
+        srcset,
+        src
+    }
+}
+
 export default async function ( applist ) {
 
     // Fetch Commits
@@ -139,14 +163,15 @@ export default async function ( applist ) {
             lastUpdated,
             apps,
             slug,
-            channel:{
+            channel: {
                 name: fetchedVideos[videoId].rawData.snippet.channelTitle,
                 id: fetchedVideos[videoId].rawData.snippet.channelId
             },
             // Convert tags set into array
             tags: Array.from(tags),
             timestamps: fetchedVideos[videoId].timestamps,
-            thumbnails: fetchedVideos[videoId].rawData.snippet.thumbnails,
+            // thumbnails: fetchedVideos[videoId].rawData.snippet.thumbnails,
+            thumbnail: makeThumbnailData( fetchedVideos[videoId].rawData.snippet.thumbnails ),
             endpoint: getVideoEndpoint({
                 slug
             })