diff --git a/bin/bench b/bin/bench
new file mode 100755
index 00000000..3fa2d2a8
--- /dev/null
+++ b/bin/bench
@@ -0,0 +1,29 @@
+#! /bin/sh
+#
+# Creates an app in `./bench` that posts results to http://phonegap-bench.heroku.com with current PhoneGap/Android sha.
+#
+# USAGE
+#   ./bin/bench
+#
+
+# clobber any existing bench
+if [ -e ./bench ]
+then
+    rm -rf ./bench
+fi
+
+# create a benching app
+./bin/create ./bench com.phonegap.bench PhoneGapBench
+
+# grab the latest bench www code
+git clone git@github.com:brianleroux/phonegap-bench.git
+
+# copy it into the app
+cat ./phonegap-bench/www/index.html > ./bench/assets/www/index.html
+#cat ~/Desktop/phonegap-bench/www/index.html > ./bench/assets/www/index.html
+
+# clean up
+rm -rf ./phonegap-bench
+
+# launch to the first device found
+./bin/debug ./bench
diff --git a/bin/create b/bin/create
index d0bed3f9..8351ebd9 100755
--- a/bin/create
+++ b/bin/create
@@ -5,6 +5,8 @@
 # USAGE
 #   ./create [path package activity]
 #
+set -e
+
 PROJECT_PATH=${1:-"./example"}
 PACKAGE=${2:-"com.phonegap.example"}
 ACTIVITY=${3:-"PhoneGapExample"}
diff --git a/bin/test b/bin/test
index 257b4fce..21e511ef 100755
--- a/bin/test
+++ b/bin/test
@@ -1,4 +1,6 @@
 #! /bin/sh
+set -e
+
 VERSION=$(cat ./VERSION)
 
 # get the latest mobile-spec
diff --git a/bin/tests/debug.coffee b/bin/tests/debug.coffee
new file mode 100644
index 00000000..e69de29b