diff --git a/dtbfinder.py b/dtbfinder.py
index ac6a45224..e389b157a 100644
--- a/dtbfinder.py
+++ b/dtbfinder.py
@@ -11,69 +11,95 @@ PAGE_SIZE = 0x1000
 
 
 def utils_load_as():
-    nativelst = native.x86NativeTable
-
     #    virtual_types = xp_sp2_x86_vtypes.ntkrnlmp_types
     #
     #    ntkrnlmp = vtypes.VTypeSymbolTable('ntkrnlmp', virtual_types, nativelst)
 
-    ctx = volatility.framework.contexts.Context(nativelst)
     # ctx.symbol_space.append(nativelst)
     # ctx.symbol_space.append(ntkrnlmp)
     return ctx
 
 
+class DtbTest(object):
+    ptr_size = 4
+    ptr_struct = "I"
+    ptr_reference = 0x300
+
+    def run(self, value, page_offset):
+        ptr = struct.unpack("<" + self.ptr_struct, value)[0]
+        if ptr != 0 and (ptr & 0xFFFFFFFFFFFFF000 == page_offset) and (ptr & 0xFF0 == 0x60):
+            return hex(ptr & 0xFFFFFFFFFFFFF000)
+
+
+class Test32bit(DtbTest):
+    name = "x86 32-bit (Non-PAE)"
+    ptr_size = 4
+    ptr_struct = "I"
+    ptr_reference = 0x300
+
+
+class Test64bit(DtbTest):
+    name = "x64 64-bit"
+    ptr_size = 8
+    ptr_struct = "Q"
+    ptr_reference = 0x1ED
+
+
+class TestPaebit(DtbTest):
+    name = "x86 48-bit (PAE)"
+    ptr_size = 8
+    ptr_struct = "Q"
+    ptr_reference = 0x3
+
+
 class DTBFinder(object):
-    def __init__(self, ctx):
+    def __init__(self, ctx, tests):
         self.ctx = ctx
         self.page_map = {}
+        self.hits = {}
+        self.tests = tests
 
-    def scan(self, pointer_size, pointer_struct, magic):
+    def scan(self):
         for offset in range(self.ctx.memory['data'].minimum_address,
                             self.ctx.memory['data'].maximum_address - PAGE_SIZE,
                             PAGE_SIZE):
-            null = struct.unpack("<" + pointer_struct, self.ctx.memory.read('data', offset, pointer_size))[0]
-            val = self.ctx.memory.read('data', offset + (magic * pointer_size), pointer_size)
-            test_val = struct.unpack("<" + pointer_struct, val)[0] & 0xFFFFFFFFFFFFF000
-            mask = struct.unpack("<" + pointer_struct, val)[0] & 0xFFF
-            offsetstr = ("{0:#0" + str((pointer_size * 2) + 2) + "x}").format(offset)
-            testvalstr = ("{0:#0" + str((pointer_size * 2) + 2) + "x}").format(test_val)
-            if offset == test_val and offset != 0:
-                if (mask & 0xFF0) == 0x60:
-                    print("MATCH at", offsetstr, "with magic", magic, "with mask", "{0:#04x}".format(mask))
-
-    def scan32(self):
-        self.scan(4, "I", 0x300)
-
-    def scan64(self):
-        self.scan(8, "Q", 0x1ED)
-
-    def scanpae(self):
-        self.scan(8, "Q", 0x3)
+            for test in self.tests:
+                val = test.run(
+                    self.ctx.memory.read('data', offset + (test.ptr_reference * test.ptr_size), test.ptr_size), offset)
+                if val:
+                    self.hits[test.name] = self.hits.get(test.name, []) + [val]
 
 
 if __name__ == '__main__':
 
     parser = argparse.ArgumentParser()
-    parser.add_argument("--32bit", action = "store_true", dest = "bit32", help = "32-bit tests")
-    parser.add_argument("--64bit", action = "store_true", dest = "bit64", help = "64-bit tests")
-    parser.add_argument("--pae", action = "store_true", help = "pae tests")
+    parser.add_argument("--32bit", action = "store_false", dest = "bit32", help = "Disable 32-bit run")
+    parser.add_argument("--64bit", action = "store_false", dest = "bit64", help = "Disable 64-bit run")
+    parser.add_argument("--pae", action = "store_false", help = "Disable pae run")
     parser.add_argument("-f", "--file", metavar = "FILE", action = "store", help = "FILE to read for testing")
 
     args = parser.parse_args()
 
-    ctx = utils_load_as()
+    nativelst = native.x86NativeTable
+    ctx = volatility.framework.contexts.Context(nativelst)
     data = layers.physical.FileLayer(ctx, 'name', 'data', filename = args.file)
     ctx.memory.add_layer(data)
 
-    df = DTBFinder(ctx)
-    # display_dtb(ctx, int(sys.argv[2], 16))
-    if args.bit64:
-        print("[*] Start 64-bit scan")
-        df.scan64()
+    tests = []
     if args.bit32:
-        print("[*] Start 32-bit scan")
-        df.scan32()
+        tests.append(Test32bit())
+    if args.bit64:
+        tests.append(Test64bit())
     if args.pae:
-        print("[*] Start pae scan")
-        df.scanpae()
+        tests.append(TestPaebit())
+
+    df = DTBFinder(ctx, tests)
+    print("[*] Scanning...")
+    df.scan()
+    print("[*] Results")
+    print(df.hits)
+    print("[*] OS Guess")
+    guesses = []
+    for key in df.hits:
+        guesses.append((len(df.hits[key]), key))
+    print(max(guesses)[1])