diff --git a/EtherSecurityLookup.html b/EtherSecurityLookup.html
index d9b868a..6087d85 100644
--- a/EtherSecurityLookup.html
+++ b/EtherSecurityLookup.html
@@ -19,13 +19,14 @@ <h4 class="text-center">EtherSecurityLookup</h4>
             <input type="checkbox" name="ext-ethersecuritylookup-twitter_whitelist_checkbox" id="ext-ethersecuritylookup-twitter_whitelist_checkbox">
             <span>Fake Twitter Account Warning</span>
         </label>
-        <div id="ext-ethersecuritylookup-twitter_stats">
+        <div class="ext-ethersecuritylookup-stats">
             <small>Last Updated: <span id="ext-ethersecuritylookup-twitter_whitelist_last_updated">N/A</span></small>
             <br/>
             <small>Whitelisted Accounts: <span id="ext-ethersecuritylookup-twitter_whitelist_count">0</span></small>
         </div>
 
         <br/>
+
         <div id="footer">
             <div class="ext-ethersecuritylookup-center">
                 <a href="https://etherscamdb.info/" target="_blank">EtherScamDb</a> &mdash;
diff --git a/css/EtherSecurityLookup.css b/css/EtherSecurityLookup.css
index 17f0316..f355aed 100644
--- a/css/EtherSecurityLookup.css
+++ b/css/EtherSecurityLookup.css
@@ -14,7 +14,7 @@
       padding: 8px 20px 8px 17px;
       width: 100%;
       font-size: 10pt; }
-    #ext-ethersecuritylookup-popup #content #ext-ethersecuritylookup-twitter_stats {
+    #ext-ethersecuritylookup-popup #content .ext-ethersecuritylookup-stats {
       font-size: 10pt;
       color: #c2c6c7;
       line-height: 10pt;
diff --git a/css/EtherSecurityLookup.css.map b/css/EtherSecurityLookup.css.map
index 0401683..40e6c72 100644
--- a/css/EtherSecurityLookup.css.map
+++ b/css/EtherSecurityLookup.css.map
@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "AAAA,8BAA+B;EAC7B,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,GAAG;EACZ,WAAW,EAAE,OAAO;EACpB,SAAS,EAAE,IAAI;EACf,KAAK,EAAE,KAAK;EAEZ,uCAAS;IACP,OAAO,EAAE,IAAI;IACb,UAAU,EAAE,IAAI;IAEhB,uEAAgC;MAC9B,UAAU,EAAE,MAAM;IAGpB,uEAAgC;MAC9B,aAAa,EAAE,IAAI;MACnB,OAAO,EAAE,iBAAiB;MAC1B,KAAK,EAAE,IAAI;MACX,SAAS,EAAE,IAAI;IAGjB,8EAAuC;MACrC,SAAS,EAAE,IAAI;MACf,KAAK,EAAE,OAAO;MACd,WAAW,EAAE,IAAI;MACjB,YAAY,EAAE,KAAK;EAKvB,sCAAQ;IACN,SAAS,EAAE,GAAG",
+"mappings": "AAAA,8BAA+B;EAC7B,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,GAAG;EACZ,WAAW,EAAE,OAAO;EACpB,SAAS,EAAE,IAAI;EACf,KAAK,EAAE,KAAK;EAEZ,uCAAS;IACP,OAAO,EAAE,IAAI;IACb,UAAU,EAAE,IAAI;IAEhB,uEAAgC;MAC9B,UAAU,EAAE,MAAM;IAGpB,uEAAgC;MAC9B,aAAa,EAAE,IAAI;MACnB,OAAO,EAAE,iBAAiB;MAC1B,KAAK,EAAE,IAAI;MACX,SAAS,EAAE,IAAI;IAGjB,sEAA+B;MAC7B,SAAS,EAAE,IAAI;MACf,KAAK,EAAE,OAAO;MACd,WAAW,EAAE,IAAI;MACjB,YAAY,EAAE,KAAK;EAKvB,sCAAQ;IACN,SAAS,EAAE,GAAG",
 "sources": ["EtherSecurityLookup.scss"],
 "names": [],
 "file": "EtherSecurityLookup.css"
diff --git a/css/EtherSecurityLookup.scss b/css/EtherSecurityLookup.scss
index e2a9343..fc57a95 100644
--- a/css/EtherSecurityLookup.scss
+++ b/css/EtherSecurityLookup.scss
@@ -20,7 +20,7 @@
       font-size: 10pt;
     }
 
-    #ext-ethersecuritylookup-twitter_stats {
+    .ext-ethersecuritylookup-stats {
       font-size: 10pt;
       color: #c2c6c7;
       line-height: 10pt;
diff --git a/images/esl-green.png b/images/esl-green.png
new file mode 100644
index 0000000..5ac7d1a
Binary files /dev/null and b/images/esl-green.png differ
diff --git a/js/TwitterFakeAccount.js b/js/TwitterFakeAccount.js
index ee262a6..4807a36 100644
--- a/js/TwitterFakeAccount.js
+++ b/js/TwitterFakeAccount.js
@@ -92,42 +92,43 @@ var objWorker = new Worker(chrome.runtime.getURL('/js/workers/TwitterFakeAccount
 var arrCheckedUsers = [];
 var intTweetCounter = 0;
 
-console.log("--------- worker");
-console.log(objWorker);
-
-observeDOM( document.getElementsByTagName('body')[0] ,function(){
-    if (document.getElementById("permalink-overlay")) {
-        var arrTweets = objTwitterFakeAccount.getTweets();
-
-        intTweetCounter = arrTweets.length;
-
-        var arrTweetData = [];
-        for(var intCounter=0; intCounter<arrTweets.length; intCounter++) {
-            var arrTmpTweetData = {
-                "userId": arrTweets[intCounter].getAttribute("data-user-id"),
-                "name": arrTweets[intCounter].getAttribute("data-screen-name"),
-                "tweet_id": arrTweets[intCounter].getAttribute("data-tweet-id")
-            };
-
-            //See if we've already checked the userid
-            if(arrCheckedUsers.indexOf(arrTmpTweetData.userId) !== -1) {
-                console.log(arrCheckedUsers[arrTmpTweetData.userId]);
-                if(arrCheckedUsers[arrTmpTweetData.userId].is_imposter === false) {
-                    console.log(arrTmpTweetData.name +" is ok");
-                    continue;
-                } else {
-                    objTweetData.similar_to = arrCheckedUsers[arrTmpTweetData.userId].similar_to;
-                    console.log(arrTmpTweetData.name +" is NOT ok");
-                    //objTwitterFakeAccount.doWarningAlert(objTweetData);
-                    continue;
+chrome.runtime.sendMessage({func: "getTwitterWhitelistStatus"}, function(objResponse) {
+    if(objResponse.resp) {
+        observeDOM( document.getElementsByTagName('body')[0] ,function(){
+            if (document.getElementById("permalink-overlay")) {
+                var arrTweets = objTwitterFakeAccount.getTweets();
+
+                intTweetCounter = arrTweets.length;
+
+                var arrTweetData = [];
+                for(var intCounter=0; intCounter<arrTweets.length; intCounter++) {
+                    var arrTmpTweetData = {
+                        "userId": arrTweets[intCounter].getAttribute("data-user-id"),
+                        "name": arrTweets[intCounter].getAttribute("data-screen-name"),
+                        "tweet_id": arrTweets[intCounter].getAttribute("data-tweet-id")
+                    };
+
+                    //See if we've already checked the userid
+                    if(arrCheckedUsers.indexOf(arrTmpTweetData.userId) !== -1) {
+                        console.log(arrCheckedUsers[arrTmpTweetData.userId]);
+                        if(arrCheckedUsers[arrTmpTweetData.userId].is_imposter === false) {
+                            console.log(arrTmpTweetData.name +" is ok");
+                            continue;
+                        } else {
+                            objTweetData.similar_to = arrCheckedUsers[arrTmpTweetData.userId].similar_to;
+                            console.log(arrTmpTweetData.name +" is NOT ok");
+                            //objTwitterFakeAccount.doWarningAlert(objTweetData);
+                            continue;
+                        }
+                    }
+
+                    arrTweets[intCounter].id = "ext-ethersecuritylookup-tweet-"+arrTweets[intCounter].getAttribute("data-tweet-id");
+                    arrTweetData.push(arrTmpTweetData);
                 }
-            }
-
-            arrTweets[intCounter].id = "ext-ethersecuritylookup-tweet-"+arrTweets[intCounter].getAttribute("data-tweet-id");
-            arrTweetData.push(arrTmpTweetData);
-        }
 
-        objWorker.postMessage(JSON.stringify(arrTweetData));
+                objWorker.postMessage(JSON.stringify(arrTweetData));
+            }
+        });
     }
 });
 
diff --git a/js/api.js b/js/api.js
new file mode 100644
index 0000000..420cbba
--- /dev/null
+++ b/js/api.js
@@ -0,0 +1,25 @@
+chrome.runtime.onMessage.addListener(
+    function(request, sender, sendResponse) {
+        var strOption = request.func;
+        var strResponse = "";
+
+        switch(strOption) {
+            case 'getTwitterWhitelistStatus' :
+                //This option is enabled by default
+                if(localStorage.getItem("ext-ethersecuritylookup-twitter_whitelist") === null) {
+                    strResponse = 1;
+                } else {
+                    var strTwitterWhitelist = localStorage.getItem("ext-ethersecuritylookup-twitter_whitelist");
+                    var objTwitterWhitelist = JSON.parse(strTwitterWhitelist);
+                    strResponse = objTwitterWhitelist.status;
+                }
+            break;
+            default: {
+                strResponse = "not_supported";
+            break;
+            }
+        }
+
+        sendResponse({resp:strResponse});
+    }
+);
\ No newline at end of file
diff --git a/js/app/EtherSecurityLookup.js b/js/app/EtherSecurityLookup.js
index c8f023c..43d381a 100644
--- a/js/app/EtherSecurityLookup.js
+++ b/js/app/EtherSecurityLookup.js
@@ -2,13 +2,14 @@ document.getElementById("ext-manifest_version").innerText = chrome.runtime.getMa
 
 class EslTools {
 
-    async getListFromGithub(objTwitterWhitelist)
+    async getListFromGithub(objRepo)
     {
+        console.log("Getting "+ objRepo.repo);
         try {
-            let objResponse = await fetch(objTwitterWhitelist.repo);
+            let objResponse = await fetch(objRepo.repo);
             return objResponse.json();
         } catch(objError) {
-            console.error("Failed to get Twitter list: "+ objTwitterWhitelist.repo, objError);
+            console.error("Failed to get Twitter list: "+ objRepo.repo, objError);
         }
     }
 
@@ -33,7 +34,7 @@ class TwitterLists {
     {
         this.getStats();
 
-        setInterval(function() {
+        window.setInterval(function() {
             this.refreshWhitelist();
         }.bind(this), 50000);
     }
@@ -54,8 +55,12 @@ class TwitterLists {
                 "repo": "https://gist.githubusercontent.com/409H/740c10d340ec01e265ba4add2e4430a7/raw/f975cf74174a999292c954eb9e1da7cc70956a49/esl-twitter.whitelist.json",
                 "users": []
             };
+            this.refreshWhitelist(true);
         } else {
             var objTwitterWhitelist = JSON.parse(strTwitterWhitelist);
+            if((Math.floor(Date.now() / 1000)) - 600 >= objTwitterWhitelist.timestamp) {
+                this.refreshWhitelist(true);
+            }
         }
 
         return objTwitterWhitelist;
@@ -64,11 +69,20 @@ class TwitterLists {
     /**
      * Fetches the whitelist json from the repo and puts it in localstorage
      */
-    refreshWhitelist()
+    refreshWhitelist(blInit = false)
     {
         var objEslTools = new EslTools();
 
-        var objTwitterWhitelist = this.getWhitelistStructure();
+        if(blInit) {
+            var objTwitterWhitelist = {
+                "status": true,
+                "timestamp": 0,
+                "repo": "https://gist.githubusercontent.com/409H/740c10d340ec01e265ba4add2e4430a7/raw/f975cf74174a999292c954eb9e1da7cc70956a49/esl-twitter.whitelist.json",
+                "users": []
+            };
+        } else {
+            var objTwitterWhitelist = this.getWhitelistStructure();
+        }
 
         if(objTwitterWhitelist.status) {
             objEslTools.getListFromGithub(objTwitterWhitelist).then(function (objList) {
@@ -86,11 +100,9 @@ class TwitterLists {
      */
     getStats()
     {
-        console.log("GET STATS");
         var objTwitterWhitelist = this.getWhitelistStructure();
         var objEslTools = new EslTools();
 
-        console.log(objTwitterWhitelist);
         document.getElementById("ext-ethersecuritylookup-twitter_whitelist_checkbox").checked = objTwitterWhitelist.status;
         document.getElementById("ext-ethersecuritylookup-twitter_whitelist_last_updated").innerText = objEslTools.timeDifference(Math.floor(Date.now()/1000), objTwitterWhitelist.timestamp);
         document.getElementById("ext-ethersecuritylookup-twitter_whitelist_count").innerText = Object.keys(objTwitterWhitelist.users).length;
@@ -102,37 +114,21 @@ class TwitterLists {
     toggleOption()
     {
         var objTwitterWhitelist = this.getWhitelistStructure();
-        console.log("Check:"+ document.getElementById('ext-ethersecuritylookup-twitter_whitelist_checkbox').checked);
-        console.log(typeof document.getElementById('ext-ethersecuritylookup-twitter_whitelist_checkbox').checked);
         if(document.getElementById('ext-ethersecuritylookup-twitter_whitelist_checkbox').checked) {
             objTwitterWhitelist.status = true;
         } else {
             objTwitterWhitelist.status = false;
         }
 
-        console.log(objTwitterWhitelist);
         localStorage.setItem("ext-ethersecuritylookup-twitter_whitelist", JSON.stringify(objTwitterWhitelist));
     }
 }
 
+// Init Twitter lists and add an event listener to the checkbox to toggle it on/off.
 var objTwitterLists = new TwitterLists();
 var objTwitterWhitelist = document.getElementById('ext-ethersecuritylookup-twitter_whitelist_checkbox');
 if(objTwitterWhitelist) {
     objTwitterWhitelist.addEventListener('change', function() {
         this.toggleOption();
     }.bind(objTwitterLists), false);
-}
-
-class DomainBlacklist {
-
-    constructor()
-    {
-        this.refreshBlacklist();
-    }
-
-    refreshBlacklist()
-    {
-
-    }
-
 }
\ No newline at end of file
diff --git a/js/workers/TwitterFakeAccount.js b/js/workers/TwitterFakeAccount.js
index 53b8471..7847575 100644
--- a/js/workers/TwitterFakeAccount.js
+++ b/js/workers/TwitterFakeAccount.js
@@ -82,60 +82,6 @@ class TwitterFakeAccount
             }
         }
 
-        //Add it to the array so we don't have to do any checks again
-        this.arrViewWhitelistedUserIds.push(intUserId);
-        return {
-            "result":false
-        };
-
-        //Userid is whitelisted!
-        if ((intUserId in this.objWhitelistedHandles)) {
-            //Add it to the array so we don't have to do any checks again
-            this.arrViewWhitelistedUserIds.push(intUserId);
-            return {
-                "result":false
-            };
-        }
-
-        //Userid has already been checked.
-        if(this.arrViewWhitelistedUserIds.length > 0) {
-            if(this.arrViewWhitelistedUserIds.indexOf(intUserId) !== -1) {
-                //console.log(intUserId +" has already been checked.");
-                return {
-                    "result":false
-                };
-            }
-        }
-
-        //The userid has already been tested a positive match
-        if(this.arrViewBlacklistedUserIds.length > 0) {
-            if (this.arrViewBlacklistedUserIds.indexOf(intUserId) !== -1) {
-                return {
-                    "result": true,
-                    "similar_to": this.arrViewBlacklistedUserIds[intUserId].similar_to
-                };
-            }
-        }
-
-        //Check the username against the whitelist with levenshtein edit distance
-        for(var intKey in this.objWhitelistedHandles) {
-            //console.log(strUsername + " checking against: "+ this.objWhitelistedHandles[intKey]);
-            var intHolisticMetric = this.levenshtein(strUsername, this.objWhitelistedHandles[intKey]);
-            if (intHolisticMetric <= this.intMaxEditDistance) {
-                //Add it to the array so we don't have to do Levenshtein again
-                this.arrViewBlacklistedUserIds[intUserId] = {
-                    "holistic": intHolisticMetric,
-                    "similar_to": this.objWhitelistedHandles[intKey]
-                };
-                return {
-                    "result":true,
-                    "similar_to":this.objWhitelistedHandles[intKey]
-                };
-            }
-        }
-
-        //Add it to the array so we don't have to do any checks again
-        this.arrViewWhitelistedUserIds.push(intUserId);
         return {
             "result":false
         };
diff --git a/manifest.json b/manifest.json
index 3952127..34f392f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -36,6 +36,12 @@
     ]
   }],
 
+  "background": {
+    "scripts": [
+      "js/api.js"
+    ]
+  },
+
   "web_accessible_resources": [
     "js/workers/TwitterFakeAccount.js"
   ],