diff --git a/dnspy3-server.py b/dnspy3-server.py
index 2af43b2..939b6e7 100644
--- a/dnspy3-server.py
+++ b/dnspy3-server.py
@@ -9,7 +9,7 @@ api = Api(app)
 
 class Domain():
     def __init__(self, domain):
-        self.whois = utils.whois.WhoIS(domain).__dict__
+        self.whois = utils.whoisData.WhoIS(domain).__dict__
         self.dns = utils.dns.DNS(domain).__dict__
 
 
@@ -28,8 +28,6 @@ class DNSLookup(Resource):
 
 api.add_resource(DNSLookup, '/lookup', '/lookup/<string:domain>')
 
-print(dir())
-
 
 @app.route('/')
 def index():
diff --git a/utils/__init__.py b/utils/__init__.py
index 54f4c73..50ad142 100644
--- a/utils/__init__.py
+++ b/utils/__init__.py
@@ -1,2 +1,2 @@
 from . import dns
-from . import whois
+from . import whoisData
diff --git a/utils/whois.py b/utils/whois.py
deleted file mode 100644
index adccd88..0000000
--- a/utils/whois.py
+++ /dev/null
@@ -1,12 +0,0 @@
-class WhoIS():
-    def __init__(self, domain):
-        self.domain = domain
-        self.getWhois()
-
-    def getWhois(self):
-        self.registrar = 'Synergy Wholesale'
-        self.status = ['clientDeleteProhibited https://icann.org/epp#clientDeleteProhibited', 'clientTransferProhibited https://icann.org/epp#clientTransferProhibited', 'clientUpdateProhibited https://icann.org/epp#clientUpdateProhibited',
-                       'serverDeleteProhibited https://icann.org/epp#serverDeleteProhibited', 'serverTransferProhibited https://icann.org/epp#serverTransferProhibited', 'serverUpdateProhibited https://icann.org/epp#serverUpdateProhibited']
-        self.registrant = {'name': 'Test Case', 'email': 'tcase@test.com',
-                           'eligibilitytype': 'Company', 'eligibilityid': '123456789'}
-        self.nameservers = ['ns1.dommain.tld', 'ns2.domain.tld']
diff --git a/utils/whoisData.py b/utils/whoisData.py
new file mode 100644
index 0000000..adf46a6
--- /dev/null
+++ b/utils/whoisData.py
@@ -0,0 +1,14 @@
+import whois
+
+
+class WhoIS():
+    def __init__(self, domain):
+        self.getWhois(domain)
+
+    def getWhois(self, domain):
+        whoisData = whois.whois.Whois(domain).query()
+        whoisData = whois.parser.Parser(domain, whoisData[1]).parse()
+        self.registrar = whoisData.get('Registrar')
+        self.status = whoisData.get('Status')
+        self.registrant = whoisData.get('RegistrantName')
+        self.nameservers = whoisData.get('NameServer')