diff --git a/.gitignore b/.gitignore
index a50c246a..448482cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 .DS_Store
 AIRAliases.js
 AIRIntrospector.js
+/lib/
+.c9settings.xml
\ No newline at end of file
diff --git a/README.md b/README.md
index d6df31d0..b7ac8bc0 100644
--- a/README.md
+++ b/README.md
@@ -13,14 +13,16 @@ A very light clientside JSON document store.
 	adaptor ......... device browsers supported ............ desktop browsers supported ....
 	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	webkitsqlite .... iPhone OS, Android 2.0, Palm webOS ... Safari, Chrome ................
-	gearssqlite ..... Android 1.5, 1.7 ..................... Whenever gears is present .....
+	gearssqlite ..... Android 1.5, 1.6, BlackBerry 5.0+..... Whenever gears is present .....
 	domStorage ...... iPhone OS, Android 2.0, Palm webOS ... IE, Firefox, Safari, Chrome ...
 	cookie .......... Presumably all of em ................. Presumably all of em ..........
     userdata ........ IE ................................... IE ............................
     air-async ....... Adobe Air ............................ Adobe Air .....................
     air ............. Adobe Air ............................ Adobe Air .....................
-    blackberry ...... BlackBerry 4.7 and higher ............ N/A ...........................
+    blackberry ...... BlackBerry 4.7 and higher w/ PhoneGap. N/A ...........................
     couchdb ......... All .................................. All ........................... 
+    server .......... All .................................. All ...........................
+    auto ............ All .................................. All ...........................
 
 INSTALL
 ===
@@ -35,11 +37,25 @@ Lawnchair does not assume how you want to use it. At a minimum will be required
 - One of the adaptor js files can found in `./src/adaptors`.
 - Adobe AIR adaptor example xml config files can be found in `./util`.
 - CouchDB adaptor requires the http://localhost:5984/_utils/script/couch.js lib.
+- Server adaptor requires a server-side API; see top of ServerAdaptor.js for more details.
+- Auto adaptor (actual filename is BeachfrontAdaptor) tries to detect and load other adaptor.
 
-Its probably a good idea to concat/minify the js you require. Its a common request to 
+Its probably a good idea to concat/minify the js you require (see below). Its a common request to 
 provide a single file that does some sort of feature detection which, in theory, is nice 
 but in practice its far more efficient to only load what you need (especially on mobile).
 
+BUILDING
+===
+Run ./build from your terminal and provide the list of adapters you want to include in your final
+Lawnchair build. Does a bit of fuzzy (suffix) matching for you. Examples:
+
+    ./build air blackberry
+    ./build webkit dom
+
+The first will build a Lawnchair with both AIR adapters plus the BlackBerry one. The second will
+build a Lawnchair with WebKitSQLite support as well as DOMStorage support. 
+
+
 TESTING
 ===
 
diff --git a/build b/build
new file mode 100755
index 00000000..bdc32960
--- /dev/null
+++ b/build
@@ -0,0 +1,41 @@
+#!/bin/bash
+# Help
+
+help() {
+    echo "------ usage --------------------------------------------------";
+    echo "| build [adapter1 [adapter 2 [...]]]                          |";
+    echo "------ description --------------------------------------------";
+    echo "| Builds lawnchair with the specified adapters. Does a        |";
+    echo "| wildcard suffix search based on the adapter arguments you   |";
+    echo "| provide. Builds to lc-prod.js in current directory.         |";
+    echo "|----- list of adapters --------------------------------------|";
+    echo "| AIRSqlite                                                   |";
+    echo "| AIRSqliteAsync                                              |";
+    echo "| BlackBerry                                                  |";
+    echo "| Cookie                                                      |";
+    echo "| Couch                                                       |";
+    echo "| DOMStorage                                                  |";
+    echo "| GearsSQLite                                                 |";
+    echo "| Server                                                      |";
+    echo "| UserData                                                    |";
+    echo "| WebKitSqlite                                                |";
+    echo "---------------------------------------------------------------";
+}
+if [ $# -lt 1 ]
+then
+    help;
+    echo "ERROR: You need to provide at least one adapter as argument.";
+else
+    echo "Including base Lawnchair JS...";
+    adapterSrc="src/Lawnchair.js src/adaptors/LawnchairAdaptorHelpers.js";
+    for arg in "$@"
+    do
+        for file in $(find src/adaptors -type f -iname $arg*)
+        do
+            echo "Adding adapter '$file' to lc_prod.js...";
+            adapterSrc="$adapterSrc $file";
+        done
+    done
+    cat $adapterSrc > lc_prod.js;
+    echo "... done.";
+fi 
diff --git a/spec/public/adaptors/air-async.html b/spec/public/adaptors/air-async.html
index c33e002e..3cf32d3b 100644
--- a/spec/public/adaptors/air-async.html
+++ b/spec/public/adaptors/air-async.html
@@ -12,7 +12,8 @@
 	<script src="../../../src/Lawnchair.js" type="text/javascript" charset="utf-8"></script>
 	
 	<script type="text/javascript" charset="utf-8">
-		store = new Lawnchair({table:'test', adaptor:'air-async'});
+	    adapter='air-async';
+		store = new Lawnchair({adaptor:adapter,table:'test'},function(){});
 	</script>
 	<!--
 		because string callbacks aren't supported, we need to rewrite the tests
diff --git a/spec/public/adaptors/air.html b/spec/public/adaptors/air.html
index 242a9dbc..f63c44b2 100644
--- a/spec/public/adaptors/air.html
+++ b/spec/public/adaptors/air.html
@@ -12,7 +12,8 @@
 	<script src="../../../src/Lawnchair.js" type="text/javascript" charset="utf-8"></script>
 	
 	<script type="text/javascript" charset="utf-8">
-		store = new Lawnchair({table:'test', adaptor:'air'});
+	    adapter='air';
+		store = new Lawnchair({adaptor:adapter,table:'test'},function(){});
 	</script>
 	<!--
 		because string callbacks aren't supported, we need to rewrite the tests
diff --git a/spec/public/adaptors/blackberrystorage.html b/spec/public/adaptors/blackberrystorage.html
index d159d353..84fa1f53 100644
--- a/spec/public/adaptors/blackberrystorage.html
+++ b/spec/public/adaptors/blackberrystorage.html
@@ -12,7 +12,8 @@
 	<script src="../../../src/Lawnchair.js" type="text/javascript" charset="utf-8"></script>
 	
 	<script type="text/javascript" charset="utf-8">
-		store = new Lawnchair({adaptor:'blackberry'});
+	    adapter='blackberry';
+		store = new Lawnchair({adaptor:adapter},function(){});
 	</script>
 	<script src="../lawnchair-spec.js" type="text/javascript" charset="utf-8"></script>
 </head>
diff --git a/spec/public/adaptors/cookie.html b/spec/public/adaptors/cookie.html
index 366e9e67..69a7a675 100644
--- a/spec/public/adaptors/cookie.html
+++ b/spec/public/adaptors/cookie.html
@@ -11,7 +11,8 @@
 	<script src="../../../src/Lawnchair.js" type="text/javascript" charset="utf-8"></script>
 	
 	<script type="text/javascript" charset="utf-8">
-		store = new Lawnchair({adaptor:'cookie'});
+	    adapter='cookie';
+		store = new Lawnchair({adaptor:adapter},function(){});
 	</script>
 	<script src="../lawnchair-spec.js" type="text/javascript" charset="utf-8"></script>
 </head>
diff --git a/spec/public/adaptors/couch.html b/spec/public/adaptors/couch.html
index 9d83ec05..28ea621e 100644
--- a/spec/public/adaptors/couch.html
+++ b/spec/public/adaptors/couch.html
@@ -10,7 +10,8 @@
 	<script src="../../../src/adaptors/CouchAdaptor.js" type="text/javascript" charset="utf-8"></script>
 	<script src="../../../src/Lawnchair.js" type="text/javascript" charset="utf-8"></script>
 	<script type="text/javascript" charset="utf-8">
-		store = new Lawnchair({adaptor:'couch', name:'test-store'});
+	    adapter='couch';
+		store = new Lawnchair({adaptor:adapter,name:'test-store'},function(){});
 	</script>
 	<script src="../lawnchair-spec.js" type="text/javascript" charset="utf-8"></script>
 </head>
diff --git a/spec/public/adaptors/dom-session.html b/spec/public/adaptors/dom-session.html
index 95f31507..698b5104 100644
--- a/spec/public/adaptors/dom-session.html
+++ b/spec/public/adaptors/dom-session.html
@@ -10,7 +10,8 @@
 	<script src="../../../src/Lawnchair.js" type="text/javascript" charset="utf-8"></script>
 	
 	<script type="text/javascript" charset="utf-8">
-		store = new Lawnchair({storage:sessionStorage, adaptor:'dom'});
+	    adapter='dom';
+		store = new Lawnchair({adaptor:adapter, storage:sessionStorage},function(){});
 	</script>
 	<script src="../lawnchair-spec.js" type="text/javascript" charset="utf-8"></script>
 	
diff --git a/spec/public/adaptors/dom.html b/spec/public/adaptors/dom.html
index fef59fe6..a6a3dfb8 100644
--- a/spec/public/adaptors/dom.html
+++ b/spec/public/adaptors/dom.html
@@ -11,7 +11,8 @@
 	<script src="../../../src/Lawnchair.js" type="text/javascript" charset="utf-8"></script>
 	
 	<script type="text/javascript" charset="utf-8">
-		store = new Lawnchair({adaptor:'dom'});
+	    adapter = 'dom';
+		store = new Lawnchair({adaptor:adapter},function(){});
 	</script>
 	<script src="../lawnchair-spec.js" type="text/javascript" charset="utf-8"></script>
 </head>
diff --git a/spec/public/adaptors/gears.html b/spec/public/adaptors/gears.html
index 24086132..33622174 100644
--- a/spec/public/adaptors/gears.html
+++ b/spec/public/adaptors/gears.html
@@ -10,7 +10,8 @@
 	<script src="../../../src/adaptors/GearsSQLiteAdaptor.js" type="text/javascript" charset="utf-8"></script>
 	<script src="../../../src/Lawnchair.js" type="text/javascript" charset="utf-8"></script>
 	<script type="text/javascript" charset="utf-8">
-		store = new Lawnchair({table:'test', adaptor:'gears'});
+	    adapter = 'gears';
+		store = new Lawnchair({table:'test', adaptor:adapter},function(){});
 	</script>
 	<script src="../lawnchair-spec.js" type="text/javascript" charset="utf-8"></script>
 </head>
diff --git a/spec/public/adaptors/server-examples/session.jsp b/spec/public/adaptors/server-examples/session.jsp
new file mode 100644
index 00000000..147a466c
--- /dev/null
+++ b/spec/public/adaptors/server-examples/session.jsp
@@ -0,0 +1,53 @@
+<%@ page import="java.io.*, java.util.*" %><%
+    // TODO: support client-specified IDs for differentiating between stores.
+	if (request.getParameter("nuke") != null || request.getParameter("all") != null) {
+        // nuke() and all()
+        boolean isNuke = (request.getParameter("nuke") != null);
+        boolean isAll = (request.getParameter("all") != null);
+		Enumeration attributeNames=(request.getSession(false)).getAttributeNames();
+        StringBuffer all = new StringBuffer("[");
+        while(attributeNames.hasMoreElements()){
+            String attributeName=(String) attributeNames.nextElement();
+            if (isNuke) {
+                session.removeAttribute(attributeName);
+            } else {
+                all.append((String)session.getAttribute(attributeName));
+                all.append(",");
+            }
+        }
+        if (isAll) {
+            if (all.length() > 1) all.deleteCharAt(all.length()-1); // trim trailing comma
+            all.append("]");
+            out.print(all.toString());
+        } else {
+            out.print("{}");
+        }
+	} else if (request.getParameter("get") != null) {
+		// get()
+        String key = request.getParameter("get");
+        StringBuffer json = new StringBuffer();
+        json.append((String)session.getAttribute(key));
+        out.print(json.toString());
+    } else if (request.getParameter("remove") != null) {
+        // remove()
+        String key = request.getParameter("remove");
+        StringBuffer json = new StringBuffer();
+        json.append((String)session.getAttribute(key));
+        session.removeAttribute(key);
+        out.print(json.toString());
+	} else if (request.getParameter("save") != null) {
+        // save()
+        String key = request.getParameter("save");
+		// Grab POST data
+		BufferedReader FormBuffer = request.getReader();
+		StringBuffer BodyContent = new StringBuffer();
+		String NextLine = FormBuffer.readLine();
+		while (NextLine != null) {
+			BodyContent.append(NextLine);
+			NextLine = FormBuffer.readLine();
+		}
+		// Save to session attribute
+		session.setAttribute(key, BodyContent.toString());
+		out.print(BodyContent.toString());
+    }
+%>
\ No newline at end of file
diff --git a/spec/public/adaptors/server.html b/spec/public/adaptors/server.html
new file mode 100644
index 00000000..e9f51c3a
--- /dev/null
+++ b/spec/public/adaptors/server.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>Lawnchair Server</title>
+	<link rel="stylesheet" href="../lib/qunit.css" type="text/css" media="screen" title="no title" charset="utf-8">
+	<script src="../lib/qunit.js" type="text/javascript" charset="utf-8"></script>
+    <script src="../lib/json2.js" type="text/javascript" charset="utf-8"></script>
+	
+	<script src="../../../src/adaptors/LawnchairAdaptorHelpers.js" type="text/javascript" charset="utf-8"></script>
+	<script src="../../../src/adaptors/ServerAdaptor.js" type="text/javascript" charset="utf-8"></script>
+	<script src="../../../src/Lawnchair.js" type="text/javascript" charset="utf-8"></script>
+	
+	<script type="text/javascript" charset="utf-8">
+        alert('You must deploy this on a Tomcat instance to get it to work! Relies on a server-side component!');
+		store = new Lawnchair({adaptor:'server', endpoint:'server-examples/session.jsp'});
+	</script>
+	<script src="../lawnchair-spec.js" type="text/javascript" charset="utf-8"></script>
+</head>
+<body>
+	<h1 id="qunit-header">Lawnchair, Server Adapter Specs</h1>
+    <h2 id="qunit-banner"></h2>
+    <h2 id="qunit-userAgent"></h2>
+    <ol id="qunit-tests"></ol>
+</body>
+</html>
diff --git a/spec/public/adaptors/userdata.html b/spec/public/adaptors/userdata.html
index 1edd62d7..aec045d3 100644
--- a/spec/public/adaptors/userdata.html
+++ b/spec/public/adaptors/userdata.html
@@ -11,7 +11,8 @@
 	<script src="../../../src/Lawnchair.js" type="text/javascript" charset="utf-8"></script>
 	
 	<script type="text/javascript" charset="utf-8">
-		store = new Lawnchair({adaptor:'userdata'});
+	    adapter = 'userdata';
+		store = new Lawnchair({adaptor:adapter},function() {});
 	</script>
 	<script src="../lawnchair-spec.js" type="text/javascript" charset="utf-8"></script>
 </head>
diff --git a/spec/public/adaptors/webkit.html b/spec/public/adaptors/webkit.html
index 0751b553..86109806 100644
--- a/spec/public/adaptors/webkit.html
+++ b/spec/public/adaptors/webkit.html
@@ -11,7 +11,8 @@
 	<script src="../../../src/Lawnchair.js" type="text/javascript" charset="utf-8"></script>
 	
 	<script type="text/javascript" charset="utf-8">
-		store = new Lawnchair({table:'test', adaptor:'webkit'});
+	    adapter = 'webkit';
+		store = new Lawnchair({table:'test', adaptor:adapter},function() {});
 	</script>
 	<script src="../lawnchair-spec.js" type="text/javascript" charset="utf-8"></script>
 	
diff --git a/spec/public/index.html b/spec/public/index.html
index 82c80cda..c39b8614 100644
--- a/spec/public/index.html
+++ b/spec/public/index.html
@@ -14,6 +14,7 @@ <h1>Lawnchair! The spec.</h1>
     <li><a href="adaptors/air-async.html">adobe air async</a></li>
     <li><a href="adaptors/blackberrystorage.html">blackberry storage</a></li>
     <li><a href="adaptors/couch.html">couchdb</a></li>
+    <li><a href="adaptors/server.html">server</a></li>
 </ul>
 
 
diff --git a/spec/public/lawnchair-spec.js b/spec/public/lawnchair-spec.js
index 094471fd..8402cc52 100644
--- a/spec/public/lawnchair-spec.js
+++ b/spec/public/lawnchair-spec.js
@@ -1,3 +1,29 @@
+var chain = function(tests, delay) {
+    if (tests instanceof Array) {
+        if (tests.length > 0) {
+            if (typeof delay != 'undefined') {
+                setTimeout(function() {
+                    tests.shift()();
+                    chain(tests, delay);
+                }, delay);
+            } else {
+                var nextTest = tests.shift();
+                var next = window.thisChain = { next: function () {
+                    return chain(tests);
+                } };
+
+                if (typeof nextTest == "string") {
+                    return nextTest;
+                } else {
+                    return function () {
+                        nextTest.apply(next, arguments);
+                    }
+                }
+            }
+        } else QUnit.start();
+    }
+};
+
 module('Lawnchair', {
     setup:function() {
         // I like to make all my variables globals. Starting a new trend.
@@ -8,167 +34,168 @@ module('Lawnchair', {
         me = null;
     }
 });
-
-test('ctor', function() {
-    QUnit.stop();
-    expect(3);
-    // should init and call callback
-    var lc = new Lawnchair({adaptor:store.adaptor}, function() {
-        ok(true, 'should call passed in callback');
-        equals(this, lc, 'this is bound to the instance');
-        start(); 
-    }); 
-    // raise exception if no ctor callback is supplied
-    try {
-        var lc2 = new Lawnchair({adaptor:store.adaptor});    
-    } catch(e) {
-        ok(true, 'exception raised if no callback supplied to init');
-    }
-});
-	
-test( 'nuke()', function() {
-    QUnit.stop();
-    expect(4);
-    store.nuke();
-    store.all(function(r) {
-        equals(r.length, 0, "should have 0 length when using full callback syntax");
-        store.nuke();
-        furtherassertions = function() {
-            same(store.nuke(), store, "should be chainable on nuke");
-            store.save(me);
-            store.nuke();
-            store.all(function(r) {
-                equals(r.length, 0, "should have 0 length after saving, then nuking");
-                start();
+    test('ctor', function() {
+        QUnit.stop();
+        expect(3);
+        // raise exception if no ctor callback is supplied
+        try {
+            var lc2 = new Lawnchair({adaptor:store.adapter});    
+        } catch(e) {
+            ok(true, 'exception raised if no callback supplied to init');
+            // should init and call callback
+            var lc = new Lawnchair({adaptor:adapter}, function() {
+                ok(true, 'should call passed in callback');
+                var elsee = this;
+                setTimeout(function() {
+                    // need to timeout here because ctor doesnt return until after callback is called.
+                    equals(elsee, lc, '"this"" is bound to the instance');
+                    QUnit.start(); 
+                }, 250);
             });
         }
-        store.all('equals(r.length, 0, "should have 0 length when using shorthand syntax"); furtherassertions();');
     });
-});
+	test( 'all()', function() {
+        QUnit.stop();
+        expect(4);
+        store.all(chain([function(r) {
+            ok(true, 'calls callback');
+            ok(r instanceof Array, 'should provide array as parameter');
+            store.save(me, this.next());
+        }, function(r) {
+            store.all(this.next());
+        }, function(r) {
+            equals(r.length, 1, 'array parameter after save has length 1');
+            store.all('window.thisChain.next()(r)');
+        }, function(r) {
+            ok(true, 'should call terse shorthand syntax');
+            QUnit.start();
+        }]));
+    });
+    test( 'nuke()', function() {
+		QUnit.stop();
+        expect(5);
+		store.nuke(chain([function(r) {
+		    ok(true, "should call callback in nuke");
+		    same(store.nuke(this.next()), store, "should be chainable on nuke");
+		}, function(r) {
+		    store.all(this.next());
+    	}, function(r) {
+            equals(r.length, 0, "all should return 0 length following a nuke.");
+            store.save(me, this.next());
+        }, function(r) {
+            store.nuke(this.next());
+        }, function(r) {
+            store.all(this.next());
+        },function(r) {
+            equals(r.length, 0, "should have 0 length after saving, then nuking");
+            store.nuke('window.thisChain.next()(r)');
+        }, function(r) {
+            ok(true, 'should call terse shorthand syntax');
+            QUnit.start();
+        }]));
+	});
     
-test( 'save()', function() {
-    QUnit.stop();
-    expect(4);
-    store.save(me, function() {
-        ok(true, 'should call passed in callback');
-        furtherassertions = function() {
-            store.save({something:'yes'}, function() {
-                store.all(function(r) {
-                    equals(r.length, 2, 'should have length 2 after saving another object using full callback');
-                    var id = 'donotdie';
-                    store.save({key:id, foo:'bar'}, function(o){
-                        equals(o.key, id, 'should preserve key in save callback on object');
-                        start();
-                    });
-                });
-            });
-        };
-        store.all('equals(r.length, 1, "should have length 1 after saving something using shorthand callback"); furtherassertions();');
+    test( 'save()', function() {
+        QUnit.stop();
+        expect(5);
+        var testid = 'donotdie';
+        store.save(me, chain([function(one) {
+            ok(true, 'should call passed in callback');
+            equals(one, me, 'should pass in original saved object in callback');
+            store.save({something:'else'}, this.next());
+        }, "store.all(window.thisChain.next());"
+        , function(two) {
+            equals(two.length, 2, 'should have length 2 after saving two objects');
+            store.save({key:testid, foo:'bar'}, this.next());
+        }, function(three) {
+            equals(three.key, testid, 'should preserve key in save callback on object');
+            store.save({key:testid, foo:'bar'}, 'window.thisChain.next()(r)');
+        }, function(r) {
+            ok(true, 'should call terse shorthand syntax');
+            QUnit.start();
+        }]));
     });
-});
-
-test( 'all()', function() {
-    QUnit.stop();
-    expect(2);
-    store.all(function(r) {
-        furtherassertions = function() {
-            start();
-        };
-        ok(typeof r.length != "undefined" && r.length != null, 'should return an object with a length property in callback, using full callback');
-        store.all('ok(typeof r.length != "undefined" && r.length != null, "should return an object with a length property in callback, using shorthand callback"); furtherassertions();');
+    
+    test( 'get()', function() {
+        QUnit.stop();
+        expect(4);
+		store.save({key:'xyz123', name:'tim'}, chain([function(){
+    		store.get('xyz123', this.next());
+    	}, function(r) {
+			equals(r.name, 'tim', 'should return proper object when calling get with a key');
+            store.get('doesntexist', this.next());
+    	}, function(r) {
+            ok(true, 'should call callback even for non-existent key');
+            equals(r, null, 'should return null for non-existent key');
+            store.get('xyz123', 'window.thisChain.next()(r)');
+        }, function(r) {
+            ok(true, 'should call terse shorthand syntax');
+            QUnit.start();
+        }]));
     });
-});
 
-test( 'get()', function() {
-    QUnit.stop();
-    expect(3);
-    store.save({key:'xyz123', name:'tim'}, function(){
-        store.get('xyz123', function(r) {
-            equals(r.name, 'tim', 'should return proper object when calling get with a key');
-            start();
-        });		    
-    });
-    store.get('doesntexist', function(r) {
-        ok(true, 'should call callback even for non-existent key');
-        equals(r, null, 'should return null for non-existent key');
+    test( 'find()', function() {
+        QUnit.stop();
+        expect(5);
+        store.save({dummy:'data'}, chain([function() {
+            store.save(me, this.next());
+        }, function() {
+            store.save({test:'something'}, this.next());
+        }, function() {
+            store.find('r.name == "brian"', this.next());
+        }, function(r, i) {
+            equals(r.name, me.name, 'should return same record that was saved, matching the condition, using shorthand filter syntax');
+            equals(i, 1, 'should return proper index in callback function');
+            store.find(function(rec) {
+                return rec.name == 'brian';
+            }, this.next());
+        }, function(re, ind) {
+            equals(re.name, me.name, 'should return same record that was saved, matching the condition, using full filter syntax');
+            // change my age
+            re.age = 31;
+            store.save(re, this.next());
+        }, function(record) {
+            store.find('r.name == "brian"', this.next());
+        }, function(record) {
+            equals(record.age, 31, "should return updated record data after finding, changing something, saving, and finding the same record");
+            store.find('r.name == "brian"', 'window.thisChain.next()(r)');
+        }, function(r) {
+            ok(true, 'should call terse shorthand syntax');
+            QUnit.start();
+        }]));
     });
-});
 
-test( 'find()', function() {
-    QUnit.stop();
-    expect(5);
-    store.save({dummy:'data'}, function() {
-        store.save(me, function() {
-            store.save({test:'something'}, function() {
-                store.find('r.name == "brian"', function(r, i) {
-                equals(r.name, me.name, 'should return same record that was saved, matching the condition, using shorthand condition and full callback');
-                equals(i, 1, 'should return proper index in callback function');
-                store.find(function(rec) {
-                    return rec.name == 'brian';
-                }, function(re, ind) {
-                    equals(re.name, me.name, 'should return same record that was saved, matching the condition, using full condition and full callback');
-                    store.find(function(reco) {
-                        return reco.name == 'brian';
-                    }, function(r) {
-                        equals(r.name, me.name, "should return same record that was saved, matching the condition, using full condition and shorthand callback");
-                        store.find(
-                            'r.name == "brian"',
-                            function(recor){
-                                // change my age
-                                recor.age = 31;
-                                store.save(recor, function() {
-                                    store.find('r.name == "brian"', function(record) {
-                                        equals(record.age, 31, "should return updated record data after finding, changing something, saving, and finding the same record");
-                                        start();
-                                    });
-                                });
-                            });
-                        });
-                    });
-                });
-            });
-        });
+    test( 'remove()', function() {
+        QUnit.stop();
+        expect(4);
+        store.save({name:'joni'}, chain([function() {
+            ok(true, 'remove callback should be called');
+            store.find("r.name == 'joni'", this.next());
+        }, function(r){
+            store.remove(r, this.next());
+        }, function(r) {
+            store.all(this.next());
+        }, function(all) {
+            equals(all.length, 0, "should have length 0 after saving, finding, and removing a record using entire object");
+            store.save({key:'die', name:'dudeman'}, this.next());
+        }, function(r) {
+            store.remove('die', this.next());
+        }, function(r){
+            store.all(this.next());
+        }, function(rec) {
+            equals(rec.length, 0, "should have length 0 after saving and removing by string key");
+            store.remove('die', 'window.thisChain.next()(r)');
+        }, function(r) {
+            ok(true, 'should call terse shorthand syntax');
+            QUnit.start();
+        }]));
     });
-});
 
-test( 'remove()', function() {
-    QUnit.stop();
-    expect(4);
-    store.save({name:'joni'});
-    store.find(
-        "r.name == 'joni'",
-        function(r){
-            furtherassertions = function() {
-                var callback = function() {
-                    store.all(function(r) {
-                        equals(r.length, 0, "should have length 0 after saving, finding and removing a record and using a callback");
-                        store.save({key:'die', name:'dudeman'});
-                        store.remove('die');
-                        store.all(function(rec) {
-                            equals(r.length, 0, "should have length 0 after saving and removing by key");
-                            var cb = function() {
-                                store.all('equals(r.length, 0, "should have length 0 after saving and removing by key when using a callback"); start();');
-                            };
-                            store.save({key:'die', name:'dudeman'});
-                            store.remove('die', cb);
-                        });
-                    });
-                };
-                store.save({name:'joni'});
-                store.find(
-                    "r.name == 'joni'",
-                    function(r){
-                        store.remove(r, callback);
-                });
-            };
-            store.remove(r);
-            store.all('equals(r.length, 0, "should have length 0 after saving, finding, and removing a record"); furtherassertions();');
+    test( 'Lawnchair helpers', function() {
+        expect(2);
+        equals(store.adaptor.uuid().length, 36, "uuid() function should create a 36 character string");
+        ok(store.adaptor.uuid() != store.adaptor.uuid(), 'simple inequality test on consecutive calls to uuid()');
     });
-});
-
-test( 'Lawnchair helpers', function() {
-    equals(store.adaptor.uuid().length, 36, "uuid() function should create a 36 character string (is this a test, really?)");
-});
 /*	
 
 should( 'get 10 items in a page.', function() {
diff --git a/src/Lawnchair.js b/src/Lawnchair.js
index d59ef31e..74e1fe87 100644
--- a/src/Lawnchair.js
+++ b/src/Lawnchair.js
@@ -4,14 +4,18 @@
  * A lightweight JSON document store.
  *
  */
-var Lawnchair = function(opts) {
+var Lawnchair = function(opts, cb) {
+    if (typeof cb == 'undefined') throw "Please provide a callback as second parameter to Lawnchair constructor; this shit's async, yo.";
+    if (!JSON || !JSON.stringify) throw "Native JSON functions unavailable - please include http://www.json.org/json2.js or run on a decent browser :P";
 	this.init(opts);
+	cb.call(this);
 }
 
 Lawnchair.prototype = {
 	
 	init:function(opts) {
 		var adaptors = {
+		  'auto': window.BeachfrontAdaptor,
 			'webkit':window.WebkitSQLiteAdaptor,
 			'gears':window.GearsSQLiteAdaptor,
 			'dom':window.DOMStorageAdaptor,
@@ -20,12 +24,10 @@ Lawnchair.prototype = {
 			'userdata':window.UserDataAdaptor,
 			'air-async':window.AIRSQLiteAsyncAdaptor,
 			'blackberry':window.BlackBerryPersistentStorageAdaptor,
-            'couch':window.CouchAdaptor
+            'couch':window.CouchAdaptor,
+            'server':window.ServerAdaptor
 		};
 		this.adaptor = opts.adaptor ? new adaptors[opts.adaptor](opts) : new DOMStorageAdaptor(opts);
-		
-        // Check for native JSON functions.
-        if (!JSON || !JSON.stringify) throw "Native JSON functions unavailable - please include http://www.json.org/json2.js or run on a decent browser :P";
 	},
 	
 	// Save an object to the store. If a key is present then update. Otherwise create a new record.
diff --git a/src/adaptors/BeachfrontAdaptor.js b/src/adaptors/BeachfrontAdaptor.js
new file mode 100644
index 00000000..4f528975
--- /dev/null
+++ b/src/adaptors/BeachfrontAdaptor.js
@@ -0,0 +1,26 @@
+// Silly name (to avoid collisions) for a semi-automatic adaptor. Make sure you are still loading all the adaptors you need.
+function BeachfrontAdaptor(opts) {
+  // TODO implement bootstrapper to only network fetch the right one?
+  // TODO may need to bootstrap JSON2.js
+
+  var adaptor
+  // TODO Air, Blackberry
+  if (window.runtime) {
+    // default to sync as it is probably safer, but allow over-ride.
+    adaptor = (opts && opts.async) ? AIRSqliteAsyncAdaptor : AIRSqliteAdaptor
+  } else if (window.openDatabase) {
+    adaptor = WebkitSQLiteAdaptor
+  } else if (window.google && google.gears) {   // assuming gears is better than DOMStorage
+    adaptor = GearsSQLiteAdaptor
+  } else if (window.localStorage || window.Storage) {   // picks up IE8+
+    adaptor = DOMStorageAdaptor
+  } else if (navigator.userAgent.toLowerCase().indexOf("msie") != -1) {   // couldn't google up a feature selector for this.
+    adaptor = UserDataStorage
+  } else if (navigator.store) {   // PhoneGap's proprietary store for Blackberrys.
+    adaptor = BlackBerryPersistentStorageAdaptor
+  } else { // opted for DOMStorageAdaptor instead of CookieAdaptor as Lawnchair will default to this anyway...
+    adaptor = DOMStorageAdaptor
+  }
+
+  return new adaptor(opts)
+}
\ No newline at end of file
diff --git a/src/adaptors/DOMStorageAdaptor.js b/src/adaptors/DOMStorageAdaptor.js
index c148698c..66df21c1 100644
--- a/src/adaptors/DOMStorageAdaptor.js
+++ b/src/adaptors/DOMStorageAdaptor.js
@@ -52,7 +52,7 @@ DOMStorageAdaptor.prototype = {
 		this.storage.setItem(id, this.serialize(obj));
 		if (callback) {
 		    obj.key = id.split('::')[1];
-		    callback(obj);
+		    this.terseToVerboseCallback(callback)(obj);
 		}
 	},
 
@@ -89,7 +89,7 @@ DOMStorageAdaptor.prototype = {
 		var key = this.table + '::' + (typeof keyOrObj === 'string' ? keyOrObj : keyOrObj.key);
 		this.storage.removeItem(key);
 		if(callback)
-		  callback();
+		  this.terseToVerboseCallback(callback)();
 	},
 
 	nuke:function(callback) {
@@ -99,7 +99,7 @@ DOMStorageAdaptor.prototype = {
 				self.remove(r[i]);
 			}
 			if(callback)
-			  callback();
+			  self.terseToVerboseCallback(callback)();
 		});
 	}
 };
diff --git a/src/adaptors/GearsSQLiteAdaptor.js b/src/adaptors/GearsSQLiteAdaptor.js
index 513fe5d5..6f806c17 100644
--- a/src/adaptors/GearsSQLiteAdaptor.js
+++ b/src/adaptors/GearsSQLiteAdaptor.js
@@ -117,16 +117,16 @@ GearsSQLiteAdaptor.prototype = {
 		var that = this;
 
 		var insert = function(obj, callback) {
-			var id = (obj.key == undefined) ? that.uuid() : obj.key;
+			var id = (typeof obj.key == 'undefined') ? that.uuid() : obj.key;
 			delete(obj.key);
 	
 			var rs = that.db.execute(
 				"INSERT INTO " + that.table + " (id, value, timestamp) VALUES (?,?,?)",
 				[id, that.serialize(obj), that.now()]
 			);
-			if (callback != undefined) {
+			if (typeof callback != 'undefined') {
 				obj.key = id;
-				callback(obj);
+				that.terseToVerboseCallback(callback)(obj);
 			}
 		};
 	
@@ -135,13 +135,13 @@ GearsSQLiteAdaptor.prototype = {
 				"UPDATE " + that.table + " SET value=?, timestamp=? WHERE id=?",
 				[that.serialize(obj), that.now(), id]
 			);
-			if (callback != undefined) {
+			if (typeof callback != 'undefined') {
 				obj.key = id;
-				callback(obj);
+				that.terseToVerboseCallback(callback)(obj);
 			}
 		};
 	
-		if (obj.key == undefined) {
+		if (typeof obj.key == 'undefined') {
 			insert(obj, callback);
 		} else {
 			this.get(obj.key, function(r) {
@@ -166,10 +166,10 @@ GearsSQLiteAdaptor.prototype = {
 			var o = this.deserialize(rs.field(1));
 			o.key = key;
 			rs.close();
-			callback(o);
+			this.terseToVerboseCallback(callback)(o);
 		} else {
 			rs.close();
-			callback(null);
+			this.terseToVerboseCallback(callback)(null);
 		}
 	},
 	all:function(callback) {
@@ -196,13 +196,13 @@ GearsSQLiteAdaptor.prototype = {
 			"DELETE FROM " + this.table + " WHERE id = ?",
 			[(typeof keyOrObj == 'string') ? keyOrObj : keyOrObj.key]
 		);
-		if(callback)
-		  callback();
+		if(typeof callback != 'undefined')
+		  this.terseToVerboseCallback(callback)();
 	},
 	nuke:function(callback) {
 		this.db.execute("DELETE FROM " + this.table);
-		if(callback)
-		  callback();
+		if(typeof callback != 'undefined')
+		  this.terseToVerboseCallback(callback)();
 		return this;
 	}
 };
diff --git a/src/adaptors/ServerAdaptor.js b/src/adaptors/ServerAdaptor.js
new file mode 100644
index 00000000..f66213a4
--- /dev/null
+++ b/src/adaptors/ServerAdaptor.js
@@ -0,0 +1,81 @@
+/**
+ * ServerAdaptor
+ * ===================
+ * Lawnchair implementation that leverages a server-side endpoint with a basic key/value store API available.
+ * Requires that you have a server-side implementation exposed that returns JSON and accepts GET parameters as follows:
+   *COMING SOON* id (optional, pass with all requests): some unique ID to differentiate between clients. Optional, up to you if you want to support it in your server-side implementation. 
+   * nuke: presence of this parameter destroys the store.
+   * get=key: returns object associated with key passed into 'get' parameter.
+   * save=key: saves an object with key passed into the 'save' querystring parameter. server-side should read POST data for the JSON object to save.
+   * all: presence of this parameter should return an array of all JSON objects stored.
+   * remove=key: removes an object with key passed into the 'remove' querystring parameter.
+ * 
+ * NOTE: Initial purpose of this adapter is to use together with session-based server-side storage, for clients that have weak client-side storage support.
+ */
+var ServerAdaptor = function(options) {
+	for (var i in LawnchairAdaptorHelpers) {
+		this[i] = LawnchairAdaptorHelpers[i];
+	}
+	this.init(options);
+};
+
+ServerAdaptor.prototype = {
+	init:function(options){
+        if (typeof options.endpoint == 'undefined') throw "Server adapter requires an 'endpoint' parameter, defining a server-side endpoint/API to use.";
+        this.endpoint = options.endpoint;
+        if (typeof options.id != 'undefined') this.id = options.id
+        else options.id = null;
+        try {
+            var testxhr = new XMLHttpRequest();
+        } catch(e) {
+            throw "This browser doesn't seem to support XHRs very well. Shit eh?";
+        }
+        // xhr wrapper, taken from quirksmode.org
+        var self = this;
+        this.sendRequest = function(url,callback,postData) {
+            var req = new XMLHttpRequest();
+            if (!req) return;
+            var method = (typeof postData != 'undefined') ? "POST" : "GET";
+            req.open(method,url,true);
+            req.onreadystatechange = function () {
+                if (req.readyState != 4) return;
+                if (req.status != 200 && req.status != 304) return;
+                eval('var json = ' + this.responseText);
+                callback.call(self, json);
+            }
+            if (req.readyState == 4) return;
+            req.send((typeof postData != 'undefined'?postData:null));
+        }
+	},
+	get:function(key, callback){
+        this.sendRequest(this.endpoint + '?get=' + key, function(json) {
+            if (json != null && typeof json.key != 'undefined') json.key = key;
+            if (typeof callback != 'undefined') this.terseToVerboseCallback(callback)(json);
+        });
+	},
+	save:function(obj, callback){
+        if (typeof obj.key == 'undefined') {
+            obj.key = this.uuid();
+        }
+        var id = obj.key;
+		this.sendRequest(this.endpoint + '?save=' + id, function(json) {
+            if (typeof callback != 'undefined') this.terseToVerboseCallback(callback)(json);
+        }, JSON.stringify(obj));
+	},
+	all:function(callback){
+		this.sendRequest(this.endpoint + '?all=true', function(json) {
+            if (typeof callback != 'undefined') this.terseToVerboseCallback(callback)(json);
+        });
+	},
+	remove:function(keyOrObj, callback) {
+		var key = (typeof keyOrObj == 'string') ? keyOrObj : keyOrObj.key;
+        this.sendRequest(this.endpoint + '?remove=' + key, function(json) {
+            if (typeof callback != 'undefined') this.terseToVerboseCallback(callback)(json);
+        });
+	},
+	nuke:function(callback) {
+        this.sendRequest(this.endpoint + '?nuke=true', function(json) {
+            if (typeof callback != 'undefined') this.terseToVerboseCallback(callback)(json);
+        });
+	}
+};
\ No newline at end of file