diff --git a/examples/simple.html b/examples/simple.html
new file mode 100644
index 00000000..0f4f9b82
--- /dev/null
+++ b/examples/simple.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>Lawnchair Spec</title>
+    <script src="../tests/lib/qunit.js" type="text/javascript"></script>
+    <script src="../tests/lib/json2.js" type="text/javascript"></script>
+	<script src="../lib/lawnchair.js"   type="text/javascript"></script>
+    <script type="text/javascript">
+    var store = new Lawnchair({name:'simple-example'}, function(){
+
+    })
+    </script>
+</head>
+<body>
+</body>
+</html>
diff --git a/makefile b/makefile
index 94e1e8fb..1e867783 100644
--- a/makefile
+++ b/makefile
@@ -8,7 +8,7 @@ clean:
 build:
 	mkdir -p ./lib && touch ./lib/lawnchair.js
 	cat ./src/lawnchair.js > ./lib/lawnchair.js 
-	cat ./src/adapters/window-name.js >> ./lib/lawnchair.js 
+	cat ./src/adapters/webkit-sqlite.js >> ./lib/lawnchair.js 
 
 # plugins being build here w/ dom adapter only for testing purposes
 build-plugins:
@@ -28,9 +28,9 @@ dist:
 
 test: 
 	open ./tests/index.html
-	open ./tests/plugins/aggregation.html
-	open ./tests/plugins/callbacks.html
-	open ./tests/plugins/pagination.html
-	open ./tests/plugins/query.html
+	#open ./tests/plugins/aggregation.html
+	#open ./tests/plugins/callbacks.html
+#	open ./tests/plugins/pagination.html
+#	open ./tests/plugins/query.html
 	
 .PHONY: all 
diff --git a/src/adapters/webkit-sqlite.js b/src/adapters/webkit-sqlite.js
index b3b7d06a..db49bb67 100644
--- a/src/adapters/webkit-sqlite.js
+++ b/src/adapters/webkit-sqlite.js
@@ -1,239 +1,191 @@
-Lawnchair.prototype.allKeys = function(callback) {this.adaptor.allKeys(callback)},
-
-WebkitSQLiteAdaptor.prototype.allKeys = function(callback) {
-	var cb = this.terseToVerboseCallback(callback);
-	var that = this;
-	this.db.transaction(function(t) {
-	    var sql = "SELECT id FROM " + that.table + " ORDER BY timestamp DESC";
-
-		t.executeSql(sql, [], function(tx, results) {
-			if (results.rows.length == 0 ) {
-				cb([]);
-			} else {
-				var r = [];
-				for (var i = 0, l = results.rows.length; i < l; i++) {
-					r.push(results.rows.item(i).id);
-				}
-				cb(r);
-			}
-		},
-		that.onError);
-	});
-};
-
-Lawnchair.prototype.multiget = function(keys, callback) {this.adaptor.multiget(keys, callback)},
-
-WebkitSQLiteAdaptor.prototype.multiget = function(keys, callback) {
-	var cb = this.terseToVerboseCallback(callback);
-	var that = this;
-	this.db.transaction(function(t) {
-		var v = []; 
-		for(var i=0; i<keys.length; i++) v.push('?');
-		var sql = "SELECT * FROM " + that.table + " WHERE id IN ("+v.join(',')+")";
-
-		t.executeSql(sql, keys, function(tx, results) {
-			if (results.rows.length == 0 ) {
-				cb([]);
-			} else {
-				var r = [];
-				for (var i = 0, l = results.rows.length; i < l; i++) {
-					var raw = results.rows.item(i).value;
-					var obj = that.deserialize(raw);
-					obj.key = results.rows.item(i).id;
-					r[keys.indexOf(obj.key)] = obj;
-				}
-				cb(r);
-			}
-		},
-		that.onError);
-	});
-};
-
-
-/**
- * webkit-sqlite adaptor
- *
- */
-Lawnchair.extend({
-
-	init:function(options) {
-		var that = this;
-        // merging default properties with user defined options in lawnchair init 
-        var merge= function (defaultOption, userOption) {
-            return (userOption == undefined || userOption == null) ? defaultOption: userOption;
+Lawnchair.adapter('webkit-sqlite', (function () {
+    // private methods 
+    var fail = function () { console.log('error in sqlite adaptor!') }
+    ,   now  = function () { return new Date() } // FIXME need to use better date fn
+
+    if (!Function.prototype.bind) {
+        Function.prototype.bind = function( obj ) {
+            var slice = [].slice
+            ,   args  = slice.call(arguments, 1) 
+            ,   self  = this
+            ,   nop   = function () {} 
+            ,   bound = function () {
+                    return self.apply(this instanceof nop ? this : (obj || {}), args.concat(slice.call(arguments))) 
+                }
+            nop.prototype   = self.prototype
+            bound.prototype = new nop()
+            return bound
         }
-		var opts = (typeof arguments[0] == 'string') ? {table:options} : options;
-
-		// default properties
-		this.name		= merge('Lawnchair', opts.name	  	);
-		this.version	= merge('1.0',       opts.version 	);
-		this.table 		= merge('field',     opts.table	  	);
-		this.display	= merge('shed',      opts.display 	);
-		this.max		= merge(65536,       opts.max	  	);
-		this.db			= merge(null,        opts.db		);
-		this.perPage    = merge(10,          opts.perPage   );
-
-		// default sqlite callbacks
-		this.onError = function(){};
-		this.onData  = function(){};
-
-		if("onError" in opts) {
-			this.onError = opts.onError;
-		}
-		
-		if(typeof opts.callback !== 'function') opts.callback = function(){};
-		
-		// error out on shit browsers
-		if (!window.openDatabase)
-			throw('Lawnchair, "This browser does not support sqlite storage."');
-		// instantiate the store
-		if(!WebkitSQLiteAdaptor.globaldb) WebkitSQLiteAdaptor.globaldb = openDatabase(this.name, this.version, this.display, this.max);
-
-		this.db = WebkitSQLiteAdaptor.globaldb;
-
-		// create a default database and table if one does not exist
-		that.db.transaction(function(tx) {
-			tx.executeSql("CREATE TABLE IF NOT EXISTS "+ that.table + " (id NVARCHAR(32) UNIQUE PRIMARY KEY, value TEXT, timestamp REAL)", [], opts.callback, that.onError);
-		});
-	},
-	save:function(obj, callback) {
-		var that = this;
-	
-		var update = function(id, obj, callback) {
-			that.db.transaction(function(t) {
-				t.executeSql(
-					"UPDATE " + that.table + " SET value=?, timestamp=? WHERE id=?",
-					[that.serialize(obj), that.now(), id],
-					function() {
-						if (callback != undefined) {
-							obj.key = id;
-							that.terseToVerboseCallback(callback)(obj);
-						}
-					},
-					that.onError
-				);
-			});
-		};
-		var insert = function(obj, callback) {
-			that.db.transaction(function(t) {
-				var id = (obj.key == undefined) ? that.uuid() : obj.key;
-				delete(obj.key);
-				t.executeSql(
-					"INSERT INTO " + that.table + " (id, value,timestamp) VALUES (?,?,?)",
-					[id, that.serialize(obj), that.now()],
-					function() {
-						if (callback != undefined) {
-							obj.key = id;
-							that.terseToVerboseCallback(callback)(obj);
-						}
-					},
-					that.onError
-				);
-			});
-		};
-		if (obj.key == undefined) {
-			insert(obj, callback);
-		} else {
-			this.get(obj.key, function(r) {
-				var isUpdate = (r != null);
-	
-				if (isUpdate) {
-					var id = obj.key;
-					delete(obj.key);
-					update(id, obj, callback);
-				} else {
-					insert(obj, callback);
-				}
-			});
-		}
-	},
-	get:function(key, callback) {
-		var that = this;
-		this.db.transaction(function(t) {
-			t.executeSql(
-				"SELECT value FROM " + that.table + " WHERE id = ?",
-				[key],
-				function(tx, results) {
-					if (results.rows.length == 0) {
-						that.terseToVerboseCallback(callback)(null);
-					} else {
-						var o = that.deserialize(results.rows.item(0).value);
-						o.key = key;
-						that.terseToVerboseCallback(callback)(o);
-					}
-				},
-				this.onError
-			);
-		});
-	},
-	all:function(callback) {
-		var cb = this.terseToVerboseCallback(callback);
-		var that = this;
-		this.db.transaction(function(t) {
-			t.executeSql("SELECT * FROM " + that.table, [], function(tx, results) {
-				if (results.rows.length == 0 ) {
-					cb([]);
-				} else {
-					var r = [];
-					for (var i = 0, l = results.rows.length; i < l; i++) {
-						var raw = results.rows.item(i).value;
-						var obj = that.deserialize(raw);
-						obj.key = results.rows.item(i).id;
-						r.push(obj);
-					}
-					cb(r);
-				}
-			},
-			that.onError);
-		});
+    }
+
+
+    // public methods
+    return {
+    
+        valid: function() { return !!(window.openDatabase) },
+
+        init: function (options, callback) {
+            var that   = this
+            ,   cb     = that.fn(that.name, callback)
+            ,   create = "CREATE TABLE IF NOT EXISTS " + this.name + " (id NVARCHAR(32) UNIQUE PRIMARY KEY, value TEXT, timestamp REAL)"
+            ,   win    = cb.bind(this)
+            // open a connection and create the db if it doesn't exist 
+            this.db = openDatabase(this.name, '1.0.0', this.name, 65536)
+            this.db.transaction(function (t) { 
+                t.executeSql(create, [], win, fail) 
+            })
+        }, 
+
+        keys:  function (callback) {
+            var cb   = this.lambda(callback)
+            ,   that = this
+            ,   keys = "SELECT id FROM " + this.name + " ORDER BY timestamp DESC"
+
+            this.db.transaction(function(t) {
+                var win = function (xxx, results) {
+                    if (results.rows.length == 0 ) {
+                        cb.call(that, [])
+                    } else {
+                        var r = [];
+                        for (var i = 0, l = results.rows.length; i < l; i++) {
+                            r.push(results.rows.item(i).id);
+                        }
+                        cb.call(that, r)
+                    }
+                }
+                t.executeSql(keys, [], win, fail)
+            })
+            return this
+        },
+        // you think thats air you're breathing now?
+        save: function (obj, callback) {
+            var that = this
+            ,   id   = obj.key || that.uuid()
+            ,   ins  = "INSERT INTO " + this.name + " (value, timestamp, id) VALUES (?,?,?)"
+            ,   up   = "UPDATE " + this.name + " SET value=?, timestamp=? WHERE id=?"
+            ,   win  = function () { if (callback) { obj.key = id; that.lambda(callback).call(that, obj) }}
+            ,   val  = [now(), id]
+            // transactions are like condoms
+            this.db.transaction(function(t) {
+                
+                var insert = function (obj) {
+                    val.unshift(JSON.stringify(obj))
+                    t.executeSql(ins, val, win, fail);
+                }
+
+                var update = function (obj) {
+                    delete(obj.key)
+                    val.unshift(JSON.stringify(obj))
+                    t.executeSql(up, val, win, fail)
+                }
+                // if there is no key just insert and exit
+                if (!obj.key) {
+                    insert(obj)
+                    return that
+                }
+                // if a key was passed check for insert/update
+                that.exists(obj.key, function (exists) {
+                    exists ? update(obj) : insert(obj)
+                })
+            })
+            return this
+        }, 
+
+        batch: function (objs, cb) {
+            // FIXME
+        },
+
+        get: function (key, callback) {
+            var that = this
+            ,   getr = "SELECT value FROM " + this.name + " WHERE id = ?"
+            ,   cb   = this.lambda(callback)
+
+            var win = function (xxx, results) {
+                var o = null
+                if (results.rows.length != 0) {
+                    var o = JSON.parse(results.rows.item(0).value)
+                    o.key = key
+                }
+                if (cb) cb.call(that, o)
+            }
+            this.db.transaction(function(t){ t.executeSql(getr, [key], win, fail) })
+        /*
+        .multiget = function(keys, callback) {
+            var cb = this.terseToVerboseCallback(callback);
+            var that = this;
+            this.db.transaction(function(t) {
+                var v = []; 
+                for(var i=0; i<keys.length; i++) v.push('?');
+                var sql = "SELECT * FROM " + that.table + " WHERE id IN ("+v.join(',')+")";
+
+                t.executeSql(sql, keys, function(tx, results) {
+                    if (results.rows.length == 0 ) {
+                        cb([]);
+                    } else {
+                        var r = [];
+                        for (var i = 0, l = results.rows.length; i < l; i++) {
+                            var raw = results.rows.item(i).value;
+                            var obj = that.deserialize(raw);
+                            obj.key = results.rows.item(i).id;
+                            r[keys.indexOf(obj.key)] = obj;
+                        }
+                        cb(r);
+                    }
+                },
+                that.onError);
+            });
+        };
+        */
+        return this
 	},
-	paged:function(page, callback) {
-		var cb = this.terseToVerboseCallback(callback);
-		var that = this;
-		this.db.transaction(function(t) {
-		    var offset = that.perPage * (page - 1); // a little offset math magic so users don't have to be 0-based
-		    var sql = "SELECT * FROM " + that.table + " ORDER BY timestamp ASC LIMIT ? OFFSET ?";
-			t.executeSql(sql, [that.perPage, offset], function(tx, results) {
-				if (results.rows.length == 0 ) {
-					cb([]);
-				} else {
-					var r = [];
-					for (var i = 0, l = results.rows.length; i < l; i++) {
-						var raw = results.rows.item(i).value;
-						var obj = that.deserialize(raw);
-						obj.key = results.rows.item(i).id;
-						r.push(obj);
-					}
-					cb(r);
-				}
-			},
-			that.onError);
-		});
+
+    exists: function (key, cb) {
+        var is = "SELECT * FROM " + this.name + "WHERE id = ?"
+        ,   that = this
+        ,   win = function(xxx, results) { if (cb) that.fn('exists', cb).call(that, !!(results)) }
+		this.db.transaction(function(t){ t.executeSql(is, [key], win, fail) })
+        return this
+    },
+
+	all: function (callback) {
+		var that = this
+        ,   all  = "SELECT * FROM " + this.name
+        ,   r    = []
+        ,   cb   = this.lambda(callback).bind(this) || undefined
+        ,   win  = function (xxx, results) {
+            if (results.rows.length != 0) {
+                for (var i = 0, l = results.rows.length; i < l; i++) {
+                    var obj = JSON.parse(results.rows.item(i).value)
+                    obj.key = results.rows.item(i).id
+                    r.push(obj)
+                }
+            }
+            if (cb) cb.call(that, r)
+        }
+
+		this.db.transaction(function (t) { 
+            t.executeSql(all, [], win, fail) 
+        })
+        return this
 	},
-	remove:function(keyOrObj, callback) {
-		var that = this;
-        if (callback)
-            callback = that.terseToVerboseCallback(callback);
-		this.db.transaction(function(t) {
-			t.executeSql(
-				"DELETE FROM " + that.table + " WHERE id = ?",
-				[(typeof keyOrObj == 'string') ? keyOrObj : keyOrObj.key],
-				callback || that.onData,
-				that.onError
-			);
-		});
+
+	remove: function (keyOrArray, cb) {
+		var del = "DELETE FROM " + this.name + " WHERE id = ?"
+        ,   win = function () { if (cb) this.lambda(cb).call(this) }
+        // TODO add array syntax
+		this.db.transaction( function (t) {
+			t.executeSql(del, [keyOrArray], win, fail);
+		})
 	},
-	nuke:function(callback) {
-		var that = this;
-        if (callback)
-            callback = that.terseToVerboseCallback(callback);
-		this.db.transaction(function(tx) {
-			tx.executeSql(
-				"DELETE FROM " + that.table,
-				[],
-				callback || that.onData,
-				that.onError
-			);
-		});
+
+	nuke: function (cb) {
+        var nuke = "DELETE FROM " + this.name
+        ,   that = this
+        ,   win  = cb ? function(){ that.lambda(cb).bind(that)() } : function(){}
+		this.db.transaction(function (t) { 
+            t.executeSql(nuke, [], win, fail) 
+        })
+        return this
 	}
-});
+//////
+}})())
diff --git a/tests/lawnchair-spec.js b/tests/lawnchair-spec.js
index f08f66b1..32d2c220 100644
--- a/tests/lawnchair-spec.js
+++ b/tests/lawnchair-spec.js
@@ -42,11 +42,13 @@ module('all()', {
     teardown:function() {
         me = null;
     }
-});
+})
+
 test( 'chainable', function() {
     expect(1);
     same(store.all(function(r) {}), store, 'should be chainable (return itself)');
 })
+
 test( 'full callback syntax', function() {
     QUnit.stop();
     expect(4);
@@ -57,7 +59,8 @@ test( 'full callback syntax', function() {
         same(this, store, '"this" should be scoped to the lawnchair object inside callback');
         QUnit.start();
     });
-});
+}) 
+
 test( 'adding, nuking and size tests', function() {
     QUnit.stop();
     expect(2);
@@ -72,7 +75,8 @@ test( 'adding, nuking and size tests', function() {
             })
         });
     });
-});
+})
+
 test( 'shorthand callback syntax', function() {
     QUnit.stop();
     expect(4);
@@ -84,7 +88,7 @@ test( 'shorthand callback syntax', function() {
         stop()
         Temps.all('start(); ok(temps, "this.name is passed to all callback")')
     })
-});
+})
 
 test('scoped variable in shorthand callback', function() {
     var tmp = new Lawnchair({name:'temps', record:'tmp'}, function(){
@@ -100,11 +104,13 @@ module('nuke()', {
     },
     teardown:function() {
     }
-});
+})
+
 test( 'chainable', function() {
     expect(1);
     same(store.nuke(function() {}), store, 'should be chainable');
-});
+})
+
 test( 'full callback syntax', function() {
     QUnit.stop();
     expect(2);
@@ -113,13 +119,13 @@ test( 'full callback syntax', function() {
         same(this, store, '"this" should be scoped to the Lawnchair instance');
         QUnit.start();
     });
-});
+})
+
 test( 'shorthand callback syntax', function() {
     QUnit.stop();
     expect(2);
     store.nuke('ok(true, "shorthand syntax callback gets evaled"); same(this, store, "`this` should be scoped to the Lawnchair instance"); QUnit.start();');
-});
-
+})
 
 module('save()', {
     setup:function() {
@@ -130,12 +136,13 @@ module('save()', {
     teardown:function() {
         me = null;
     }
-});
+})
 
 test( 'chainable', function() {
     expect(1);
     same(store.save(me), store, 'should be chainable');
-});
+})
+
 test( 'full callback syntax', function() {
     QUnit.stop();
     expect(2);
@@ -144,12 +151,13 @@ test( 'full callback syntax', function() {
         same(it, me, 'should pass in original saved object in callback');
         QUnit.start();
     });
-});
+})
+
 test( 'shorthand callback syntax', function() {
     QUnit.stop();
     expect(2);
     store.save(me, 'ok(true, "shorthand syntax callback gets evaled"); same(this, store, "`this` should be scoped to the Lawnchair instance"); QUnit.start();');
-});
+})
 
 test( 'saving objects', function() { 
     QUnit.stop();
@@ -162,7 +170,7 @@ test( 'saving objects', function() {
             });
         });
     })
-});
+})
 
 module('batch()', {
     setup:function() {
@@ -173,8 +181,7 @@ module('batch()', {
     teardown:function() {
         me = null;
     }
-});
-
+})
 
 test('batch insertion', function(){
     expect(3);
@@ -187,7 +194,7 @@ test('batch insertion', function(){
             QUnit.start();
         });
     });
-});
+})
 
 test( 'full callback syntax', function() {
     QUnit.stop();
@@ -197,13 +204,13 @@ test( 'full callback syntax', function() {
         same(this, store, '"this" should be the LAwnchair instance');
         QUnit.start();
     })
-});
+})
 
 test( 'shorthand callback syntax', function() {
     QUnit.stop();
     expect(2);
     store.batch([{o:'k'}], 'ok(true, "shorthand syntax callback gets evaled"); same(this, store, "`this` should be scoped to the Lawnchair instance"); QUnit.start();')
-});
+})
 
 module('get()', {
     setup:function() {
@@ -305,4 +312,4 @@ test( 'remove functionality', function() {
         //});
     });
 });
-
+*/
