diff --git a/mysecrets.py b/mysecrets.py
index cfe569e..b09cb03 100755
--- a/mysecrets.py
+++ b/mysecrets.py
@@ -4,6 +4,10 @@ import string
 import random
 import web
 from web import form
+from urllib import urlopen
+from urlparse import urlparse
+from contextlib import closing
+
 
 db = web.database(dbn='mysql', user='mysecrets', pw='horsebatteries', 
   db='mysecrets')
@@ -23,21 +27,45 @@ create = form.Form(
   form.Password('password'),
 )
 
+def get_domain(base_url):
+  with closing(urlopen('https://mxr.mozilla.org/mozilla/source/netwerk/dns/src/effective_tld_names.dat?raw=1')) as tldFile:
+    tlds = [line.strip() for line in tldFile if line[0] not in "/\n"]
+
+  urlElements = base_url.split('.')
+
+  for i in range(-len(urlElements),0):
+    lastIElements = urlElements[i:]
+    #    i=-3: ["abcde","co","uk"]
+    #    i=-2: ["co","uk"]
+    #    i=-1: ["uk"] etc
+
+    candidate = ".".join(lastIElements) # abcde.co.uk, co.uk, uk
+    wildcardCandidate = ".".join(["*"]+lastIElements[1:]) # *.co.uk, *.uk, *
+    exceptionCandidate = "!"+candidate
+
+    if (exceptionCandidate in tlds):
+      return ".".join(urlElements[i:]) 
+    if (candidate in tlds or wildcardCandidate in tlds):
+      return ".".join(urlElements[i-1:])
+      
+  return base_url
+  
+
 def mkpass(size=10):
   validChars = string.ascii_letters + string.digits
   validChars = validChars.strip("oO01l")
 
   return string.join([random.choice(validChars) for x in range(size)],"")
 
-def get_pair_from_url(base_url):
-  return db.select('passwords', where='base_url LIKE "%'+base_url+'%"', order='id DESC')
+def get_pair_from_url(domain):
+  return db.select('passwords', where='base_url LIKE "%'+domain+'%"', order='id DESC')
 
-def get_generated_from_url(base_url):
-  gen = db.select('generated', where='base_url LIKE "%'+base_url+'%"', order='id DESC')
+def get_generated_from_url(domain):
+  gen = db.select('generated', where='base_url LIKE "%'+domain+'%"', order='id DESC')
 
   while not len(gen) > 0:
-    db.insert('generated', base_url = base_url, password = mkpass())
-    gen = db.select('generated', where='base_url LIKE "%'+base_url+'%"')
+    db.insert('generated', base_url = domain, password = mkpass())
+    gen = db.select('generated', where='base_url LIKE "%'+domain+'%"')
 
   return gen
 
@@ -73,18 +101,20 @@ class index:
 
       body = []      
 
-      body.append('<h1>'+i.base_url+'</h1>\n')
+      domain = get_domain(i.base_url)
 
-      selected = get_pair_from_url(i.base_url)
-      generated = get_generated_from_url(i.base_url)
+      body.append('<h1>'+domain+'</h1>\n')
+
+      selected = get_pair_from_url(domain)
+      generated = get_generated_from_url(domain)
 
       if selected:
         body.append('<h2>Existing:</h2>\n<ul>')
         for pair in selected:
-          body.append('<li>'+pair.username+', '+pair.password+'</li>\n')
+          body.append('<li class="pair">'+pair.username+' '+pair.password+'</li>\n')
         body.append('</ul>')
 
-      body.append('<h2>Generated:</h2>\n<p>' + generated[0].password + '</p>\n')
+      body.append('<h2>Suggested:</h2>\n<p>' + generated[0].password + '</p>\n')
       body.append('<h2>Create:</h2>\n')
 
       body.append('<form class="form" method="get" action="/secret/create">\n'+ \
@@ -120,7 +150,91 @@ class index:
 
       return render.page('Generated', body)
 
-      
+    if method == 'js-overlay':
+      return '''\
+        (function() {
+          function cleanHouse() {
+           elements = document.querySelectorAll('.myS');
+           for (i=0; i<elements.length; i++) {
+            elements[i].parentNode.removeChild(elements[i]);
+           }
+          }
+
+          cleanHouse();
+
+          s=document.createElement('style');
+          s.id='myS-style';
+          s.type='text/css';
+          s.className+='myS';
+          s.innerHTML='\
+            .myS{\
+              font-family:Georgia;\
+              color:#000;\
+              text-align:center;\
+              text-size:14px;\
+            }\
+            .myS p {\
+              padding:10px;\
+            }\
+            .myS a {\
+              text-decoration:none;\
+              color:#00F;\
+            }\
+            .myS a:hover{\
+              text-decoration:underline;\
+            }\
+            .myS a.close:hover {\
+              border:1px solid #F00;\
+              text-decoration:none;\
+              color:#F00;\
+            }\
+          ';
+          document.body.appendChild(s);
+
+          o=document.createElement('div');
+          o.id='myS-overlay';
+          o.className+='myS';
+          o.style.position='fixed';
+          o.style.left=o.style.right=o.style.top=o.style.bottom='0%';
+          o.style.zIndex='1337';
+          o.style.backgroundColor='rgba(0,0,0,0.7)';
+          document.body.appendChild(o);
+
+          i=document.createElement('div');
+          i.id='myS-inner';
+          i.className+='myS';
+          i.style.position='relative';
+          i.style.margin='0em auto';
+          i.style.width='360px';
+          i.style.height='530px';
+          i.style.marginTop='20px';
+          i.style.backgroundColor='rgba(255,255,255,1)';
+          o.appendChild(i);
+
+          f=document.createElement('iframe');
+          f.id='myS-iframe';
+          f.className+='myS';
+          f.width=320;
+          f.height=480;
+          f.style.overflow='auto';
+          f.src='https://amdavidson.net/secret/new?base_url='+document.domain;
+          i.appendChild(f);
+
+          e=document.createElement('p');
+          e.className+='myS';
+          e.onclick=function(){cleanHouse();};
+          e.innerHTML='<a class="close">Close</a>';
+          i.appendChild(e);
+
+        })();'''
+
+    if method == 'js':
+      return '''\
+        (function() {
+          window.open('https://amdavidson.net/secret/new?base_url='+document.domain,'mySecret','status=no,directories=no,location=no,resizable=no,menubar=no,width=320,height=480,toolbar=no');
+        })();
+        '''
+
     else:
       return render.page('mySecrets', '<p>These are mySecrets. There is nothing for you here.</p>')