diff --git a/web-service/client/src/Streams.js b/web-service/client/src/Streams.js
index b809643be07c89e3a21de343cbe3badbfe70f3ad..cee93673919fc3edbce555ad6b4a9d1156f228f3 100644
--- a/web-service/client/src/Streams.js
+++ b/web-service/client/src/Streams.js
@@ -1,6 +1,5 @@
 import React, { useState, useEffect } from 'react'
-import Stream from './Stream'
-import testData from './seeds'
+import Thumbnail from './Thumbnail'
 
 /* This file will contain list of streams.
 The user is able to select which stream he/she will WebAuthentication.
@@ -12,47 +11,17 @@ The user will be redirected to Stream.js file
 const Streams = ({clearCookies}) => {
     const [thumbnails, setThumbnails] = useState([]);
     
-    useEffect( async () => {
-        const jsonThumbnails = await fetch('/streams/');
-        const realThumbnails = await jsonThumbnails.json();
-        setThumbnails(realThumbnails);
-        console.log('THUMBNAILS', thumbnails)
+    useEffect( async() => {
+            const jsonThumbnails = await fetch('http://localhost:8080/streams/');
+            const realThumbnails = await jsonThumbnails.json();
+            setThumbnails(realThumbnails);
+            console.log('THUMBNAILS', thumbnails)
     }, [])
     /**
      * Fetch the thumbnails
      * setInterval() fetch every 1 second
      */
 
-    const fetchThumbnails = async () => {
-        const jsonThumbnails = await fetch('/streams/');
-        const realThumbnails = await jsonThumbnails.json();
-        return realThumbnails;
-    }
-
-    const renderThumbnails = async () => {
-        //updates all available thumbnail URIs
-        const thumbs = await fetchThumbnails()
-        setThumbnails((thumbs));
-        console.log(thumbnails[0]);
-        //Problem possibly here, it doesn't encode it correctly?
-        const encodedURL = encodeURI(thumbnails[0]);
-        console.log('ENCODED URL', encodedURL);
-        try{
-            const someData = await fetch(`/stream/rgb?uri=${encodedURL}`)
-            if(!someData){
-                throw new Error('Vitun vitun vittu');
-            }
-            const myBlob = await someData.blob
-            console.log('MYBLOB', myBlob)
-            const objectURL = URL.createObjectURL(myBlob);
-            console.log('URL ', objectURL);
-        } catch(err){
-            console.log('Kurwavaara:', err);
-        }
-        
-        return thumbnails;
-    }
-
 
 
     return(
@@ -61,7 +30,7 @@ const Streams = ({clearCookies}) => {
             <h2>Namibia here we come!</h2>
             <button onClick={clearCookies}>Logout</button>
             <br/>
-            <button onClick={renderThumbnails}></button>
+            <Thumbnail thumbnail={thumbnails[0]}/>
         </div>
     )
 }
diff --git a/web-service/client/src/Thumbnail.js b/web-service/client/src/Thumbnail.js
new file mode 100644
index 0000000000000000000000000000000000000000..373d112bec102721170f473ad6f525952febee9b
--- /dev/null
+++ b/web-service/client/src/Thumbnail.js
@@ -0,0 +1,33 @@
+import React, {Component} from 'react';
+
+const Thumbnail = ({thumbnail}) => {
+    const renderThumbnails = async () => {
+        let returnVal = "err";
+        const encodedURI = encodeURIComponent(thumbnail)
+        console.log(encodedURI)
+        try{
+            const someData = await fetch(`http://localhost:8080/stream/rgb?uri=${encodedURI}`)
+            console.log(someData)
+            if(!someData.ok){
+                throw new Error('Vitun vitun vittu');
+            }
+            const myBlob = await someData.blob()
+            console.log('MYBLOB', myBlob)
+            const objectURL = URL.createObjectURL(myBlob);
+            console.log('URL ', objectURL);
+            return objectURL;
+        } catch(err){
+            console.log('Kurwavaara:', err);
+        }
+        console.log('RETURN VALUE', returnVal)
+        return returnVal;
+    }
+    return (
+        <div>
+            <img src={renderThumbnails()} alt="Hups"></img>
+        </div>
+    )    
+}
+ 
+
+export default Thumbnail;
\ No newline at end of file
diff --git a/web-service/server/package.json b/web-service/server/package.json
index 3270a7958cb845c1bd4bfb5238e479cacd141220..d7685f9f122ec497e544a5984a0d83a8e02515ed 100644
--- a/web-service/server/package.json
+++ b/web-service/server/package.json
@@ -14,6 +14,7 @@
   "author": "Nicolas Pope",
   "license": "ISC",
   "dependencies": {
+    "cors": "^2.8.5",
     "express": "^4.16.4",
     "express-ws": "^4.0.0",
     "jsonwebtoken": "^8.5.1",
diff --git a/web-service/server/src/index.js b/web-service/server/src/index.js
index 93b2cefa2decee22004b50ef0653c696bb633432..f4994a700d8b7822b1e4d9ef7cbaccd63f21f9ae 100644
--- a/web-service/server/src/index.js
+++ b/web-service/server/src/index.js
@@ -5,11 +5,14 @@ const Peer = require('./peer.js');
 const passport = require('passport');
 const passportSetup = require('./passport/passport');
 const jwt = require('jsonwebtoken');
-const keys = require('./passport/keys') 
+const keys = require('./passport/keys')
+const cors = require('cors'); 
 
 // ---- INDEXES ----------------------------------------------------------------
 app.use(passport.initialize());
 app.use(express.static('build'))
+app.use(cors())
+
 
 passport.serializeUser((user, done) => {
     done(null, user);