diff --git a/gridworks b/gridworks
index d92ee2b45..52b4188a7 100755
--- a/gridworks
+++ b/gridworks
@@ -450,6 +450,8 @@ test() {
 }
 
 ui_test() {
+    INTERACTIVE=$1
+    
     windmill_prepare
     
     GRIDWORKS_DATA_DIR="${GRIDWORKS_TEST_DIR}/temp"
@@ -468,7 +470,12 @@ ui_test() {
     echo ""
     
     echo "Starting Windmill..."
-    $WINDMILL firefox http://${GRIDWORKS_HOST}:${GRIDWORKS_PORT}/ test=$GRIDWORKS_TEST_DIR/windmill exit > /dev/null
+    if [ "$INTERACTIVE" == "" ] ; then
+        $WINDMILL firefox http://${GRIDWORKS_HOST}:${GRIDWORKS_PORT}/ test=$GRIDWORKS_TEST_DIR/windmill/python exit > /dev/null
+        #$WINDMILL firefox http://${GRIDWORKS_HOST}:${GRIDWORKS_PORT}/ jsdir=$GRIDWORKS_TEST_DIR/windmill/js exit > /dev/null
+    else
+        $WINDMILL firefox http://${GRIDWORKS_HOST}:${GRIDWORKS_PORT}/ > /dev/null
+    fi
     
     echo ""
     echo "Killing Gridworks"
diff --git a/tests/windmill/js/basic.js b/tests/windmill/js/basic.js
new file mode 100644
index 000000000..bf821eb6e
--- /dev/null
+++ b/tests/windmill/js/basic.js
@@ -0,0 +1,17 @@
+// Generated by the windmill services transformer
+var test_recordingSuite0 = new function() {
+    this.test_actions = [
+{"params": {"link": "Food"}, "method": "click"},
+{"params": {"timeout": "20000"}, "method": "waits.forPageLoad"},
+{"params": {"xpath": "//div[@id='body']/div[1]/div[2]/table/tbody/tr[1]/td[3]/table/tbody/tr/td[2]/a", "timeout": "8000"}, "method": "waits.forElement"},
+{"params": {"xpath": "//div[@id='body']/div[1]/div[2]/table/tbody/tr[1]/td[3]/table/tbody/tr/td[2]/a"}, "method": "click"},
+{"params": {"xpath": "Error - Could not find a reliable locator for this node."}, "method": "click"},
+{"params": {"xpath": "/html/body/div[5]/div/div[2]/div/table/tbody/tr[2]/td[1]/div/textarea"}, "method": "click"},
+{"params": {"xpath": "/html/body/div[5]/div/div[2]/div/table/tbody/tr[2]/td[1]/div/textarea", "text": "value.split(\",\")[0]"}, "method": "type"},
+{"params": {"xpath": "Error - Could not find a reliable locator for this node."}, "method": "click"},
+{"params": {"link": "BEEF"}, "method": "click"},
+{"params": {"xpath": "//div[@id='body']/div[1]/div[2]/table/tbody/tr[1]/td[4]/table/tbody/tr/td[2]/a"}, "method": "click"},
+{"params": {"xpath": "Error - Could not find a reliable locator for this node."}, "method": "click"},
+{"params": {"xpath": "//div[@id='body']/div[1]/div[1]/span/span"}, "method": "click"}
+    ];
+}
diff --git a/tests/windmill/test_basic_functions.py b/tests/windmill/python/test_basic_functions.py
similarity index 100%
rename from tests/windmill/test_basic_functions.py
rename to tests/windmill/python/test_basic_functions.py