diff --git a/pyccuracy/pyccuracy_core.py b/pyccuracy/pyccuracy_core.py
index a72770a..9b1b77d 100644
--- a/pyccuracy/pyccuracy_core.py
+++ b/pyccuracy/pyccuracy_core.py
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 from os.path import join, abspath, dirname
+from windmill_browser_driver import WindmillBrowserDriver
 
 from pyoc.ioc import IoC
 from pyoc.config import InPlaceConfig
@@ -196,6 +197,7 @@ def __select_browser_driver(self, lang, driver_name):
         available_drivers = {
             "selenium": SeleniumBrowserDriver,
             "webdriver": WebdriverBrowserDriver,
+            "windmill" : WindmillBrowserDriver,
             }
 
         selected_driver = available_drivers.get(driver_name, None)
@@ -246,3 +248,4 @@ def __init__(self,
         self.report_file_dir = report_file_dir        
         self.report_file_name = report_file_name
         self.write_report = write_report
+
diff --git a/pyccuracy/windmill_browser_driver.py b/pyccuracy/windmill_browser_driver.py
new file mode 100644
index 0000000..3c244c4
--- /dev/null
+++ b/pyccuracy/windmill_browser_driver.py
@@ -0,0 +1,24 @@
+from windmill.authoring import WindmillTestClient
+from browser_driver import *
+from windmill.bin.admin_lib import configure_global_settings, setup
+import windmill
+
+class WindmillBrowserDriver(BrowserDriver):
+
+    def __init__(self, browser_to_run, tests_dir):
+        super(type(self),self).__init__(browser_to_run, tests_dir)
+        self.__port__ = 4444
+        self.__host__ = "localhost"
+        configure_global_settings()
+        windmill.settings['TEST_URL'] = 'localhost'#self.test_url
+        if hasattr(self,"windmill_settings"):
+            for (setting,value) in self.windmill_settings.iteritems():
+                windmill.settings[setting] = value
+        
+#        self.client = WindmillTestClient(__name__)
+
+#        self.controller = windmill.test_authoring.Controller('%s:%s' %(self.__host__,self.__port__))
+#        self.controller.enable_unittest = True
+#        self.controller.enable_assertions = False
+
+