diff --git a/.gitignore b/.gitignore
index 09c0f90..49ad610 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ browsertest/bundle.js
 examples/**/components
 examples/**/bower_components
 scratchpad.coffee
+*.map
\ No newline at end of file
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
new file mode 100644
index 0000000..019c3d3
--- /dev/null
+++ b/CHANGELOG.txt
@@ -0,0 +1,22 @@
+## Changelog
+
+### 0.5.0
+
+- remove hard dependency on jQuery (allows you to use ZeptoJS, EnderJS or a similar alternative)
+- rename to *bacon-dom*
+- allow init() function to be called without $ having been defined
+- introduce: Bacon.$.Selector, Bacon.$.Request and Bacon.$.Promise for better customization
+- requires `.toJQC(x)` method on JQC (i.e `$` selector)
+
+- Bacon.$.Selector, Bacon.$.Request and Bacon.$.Promise can be set at any time to point to
+  jQuery compatible APIs (similar to jQuery $)
+
+- Bacon.$.Selector must just point to a function which given a selector string can find an element
+
+- Bacon.$.Request must just point to an object with a jQuery compatible `ajax` method
+
+- Bacon.$.Promise can alternatively be set to any Promise/A+ compatible lib.
+  It will to use `deferred()` and fall-back to `Deferred()`
+  It will then use `notify()`, `resolve()` and `reject()` on the deferred
+
+- Changed dom-inputvalue to use API such as `Bacon.$.select.value` and `Bacon.$.radioGroup.intValue`
\ No newline at end of file
diff --git a/Gruntfile.coffee b/Gruntfile.coffee
index 2d96f0c..7ca2ae5 100644
--- a/Gruntfile.coffee
+++ b/Gruntfile.coffee
@@ -6,12 +6,12 @@ module.exports = (grunt) ->
 
     coffee:
       compile:
-        files: ["dist/bacon.jquery.js": "src/bacon.jquery.coffee"]
+        files: ["dist/bacon-dom.js": "src/*.coffee"]
 
     uglify:
       dist:
-        src: "dist/bacon.jquery.js"
-        dest: "dist/bacon.jquery.min.js"
+        src: "dist/bacon-dom.js"
+        dest: "dist/bacon-dom.min.js"
 
   grunt.loadNpmTasks "grunt-contrib-coffee"
   grunt.loadNpmTasks "grunt-contrib-clean"
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 0000000..6d6abbf
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,34 @@
+// Generated by CoffeeScript 1.8.0
+(function() {
+  module.exports = function(grunt) {
+    grunt.initConfig({
+      clean: {
+        dist: ["dist/"],
+        coffee: ["dist/*.coffee"]
+      },
+      coffee: {
+        compile: {
+          files: [
+            {
+              "dist/bacon-dom.js": "src/*.coffee"
+            }
+          ]
+        }
+      },
+      uglify: {
+        dist: {
+          src: "dist/bacon-dom.js",
+          dest: "dist/bacon-dom.min.js"
+        }
+      }
+    });
+    grunt.loadNpmTasks("grunt-contrib-coffee");
+    grunt.loadNpmTasks("grunt-contrib-clean");
+    grunt.loadNpmTasks("grunt-contrib-uglify");
+    grunt.registerTask("build", ["clean:dist", "coffee", "uglify", "clean:coffee"]);
+    return grunt.registerTask("default", ["build"]);
+  };
+
+}).call(this);
+
+//# sourceMappingURL=Gruntfile.js.map
diff --git a/Gruntfile.js.map b/Gruntfile.js.map
new file mode 100644
index 0000000..7fafa2e
--- /dev/null
+++ b/Gruntfile.js.map
@@ -0,0 +1,10 @@
+{
+  "version": 3,
+  "file": "Gruntfile.js",
+  "sourceRoot": "",
+  "sources": [
+    "Gruntfile.coffee"
+  ],
+  "names": [],
+  "mappings": ";AAAA;AAAA,EAAA,MAAM,CAAC,OAAP,GAAiB,SAAC,KAAD,GAAA;AACf,IAAA,KAAK,CAAC,UAAN,CACE;AAAA,MAAA,KAAA,EACE;AAAA,QAAA,IAAA,EAAM,CAAC,OAAD,CAAN;AAAA,QACA,MAAA,EAAQ,CAAC,eAAD,CADR;OADF;AAAA,MAIA,MAAA,EACE;AAAA,QAAA,OAAA,EACE;AAAA,UAAA,KAAA,EAAO;YAAC;AAAA,cAAA,mBAAA,EAAqB,cAArB;aAAD;WAAP;SADF;OALF;AAAA,MAQA,MAAA,EACE;AAAA,QAAA,IAAA,EACE;AAAA,UAAA,GAAA,EAAK,mBAAL;AAAA,UACA,IAAA,EAAM,uBADN;SADF;OATF;KADF,CAAA,CAAA;AAAA,IAcA,KAAK,CAAC,YAAN,CAAmB,sBAAnB,CAdA,CAAA;AAAA,IAeA,KAAK,CAAC,YAAN,CAAmB,qBAAnB,CAfA,CAAA;AAAA,IAgBA,KAAK,CAAC,YAAN,CAAmB,sBAAnB,CAhBA,CAAA;AAAA,IAiBA,KAAK,CAAC,YAAN,CAAmB,OAAnB,EAA4B,CAAC,YAAD,EAAe,QAAf,EAAyB,QAAzB,EAAmC,cAAnC,CAA5B,CAjBA,CAAA;WAkBA,KAAK,CAAC,YAAN,CAAmB,SAAnB,EAA8B,CAAC,OAAD,CAA9B,EAnBe;EAAA,CAAjB,CAAA;AAAA"
+}
\ No newline at end of file
diff --git a/README.md b/README.md
index 0b61074..b68b637 100644
--- a/README.md
+++ b/README.md
@@ -1,24 +1,37 @@
-# bacon.jquery
+# bacon-dom
 
-A JQuery data binding library for [Bacon.js](https://github.com/baconjs/bacon.js).
+A JQuery compatible (JQC) data binding library for [Bacon.js](https://github.com/baconjs/bacon.js).
 
-Adds stuff to `Bacon.$`. Is also called BJQ.
+See fx [Ender.js](http://enderjs.com/#docs) `$._select` which you can use with [qwery](https://github.com/ded/qwery)
+
+```js
+$._select = mySelectorEngine
+$('#foo .bar')
+```
+
+See [example](https://github.com/ded/qwery/blob/master/src/ender.js)
+
+[Zepto.js](http://zeptojs.com/) is another powerful jQuery alternative...
+
+This library adds stuff to `Bacon.$`. It is also called "Baquery" (pronounced like "bakery").
 
 Includes
 
 - Binding the state of HTML input elements to [`Bacon.Model`](https://github.com/baconjs/bacon.model) objects that extend
   the Bacon.js `Property` API by providing a bidirectional binding
-- AJAX helpers. Wrap a JQuery AJAX call into an EventStream using
+- AJAX helpers. Wrap a JQC AJAX call into an EventStream using
   `Bacon.$.ajax("/get/stuff")`. Convert an `EventStream` of requests
 into an `EventStream` of responses like `requests.ajax()`.
-- FRP extensions to JQuery. Wrap JQuery events easily into an `EventStream`, as
+- FRP extensions to JQC API. Wrap JQC events easily into an `EventStream`, as
   in `$("body").clickE()`
 
-This library is intended as a replacement for [Bacon.UI](https://github.com/raimohanska/Bacon.UI.js). It provides the same functionality, with the addition of two-way bound Models, model composition and lenses.
+This library is a replacement for [Bacon.UI](https://github.com/raimohanska/Bacon.UI.js).
+
+It provides the same functionality, with the addition of two-way bound Models, model composition and lenses.
 
 ## Example Applications
 
-There are example applications in the [examples](https://github.com/baconjs/bacon.jquery/tree/master/examples) directory, each with a README.md describing how they are started.
+There are example applications in the [examples](https://github.com/baconjs/bacon-dom/tree/master/examples) directory, each with a README.md describing how they are started.
 
 Each application does essentially the same thing and the code in the example applications is essentially just this:
 
@@ -38,32 +51,51 @@ Each application does essentially the same thing and the code in the example app
 
 ## API
 
-The `bacon.jquery` API consists of methods for creating a `Model` representing the
+The `bacon-dom` API consists of methods for creating a `Model` representing the
 state of a DOM element or a group of DOM elements. This API is published
 as `Bacon.$`, and the same object is returned when using AMD or
 CommonJS.
 
+Note: The optional initiValue has now been replaced with an (optional) options hash.
+Instead of `Bacon.$.textFieldValue(field, '')` use `Bacon.$.textFieldValue(field, {init: ''})`.
+This is to allow for more flexibility down the line...
+
+### Plugins
+
+
+- `ajax`
+- `dom-input`
+- `effects`
+- `events`
+- `promise` (deferred)
+
+Use `Bacon.$.plugin('dom-input', 'ajax')` to add the plugins you want to enable.
+
+### DOM Input
+
+`Bacon.$.addPlugin('dom-input')`
+
 ###Bacon.$.textFieldValue(field [, initValue])
 
 Creates a `Model` for an
-`<input type="text">` element, given as a JQuery object. You can optionally supply an initial value.
+`<input type="text">` element, given as a JQC object. You can optionally supply an initial value.
 
 ###Bacon.$.checkBoxValue(field [, initValue])
 
 Creates a `Model` for a
-`<input type="checkbox">` element, given as a JQuery object. The value is `true` if the checkbox is checked and
+`<input type="checkbox">` element, given as a JQC object. The value is `true` if the checkbox is checked and
 `false` otherwise.
 
 ###Bacon.$.selectValue(field [,initValue])
 
 Creates a `Model` for a `<select>`
-element, given as a JQuery object. The value of the model corresponds to the `value` attribute of the selected `<option>` element.
+element, given as a JQC object. The value of the model corresponds to the `value` attribute of the selected `<option>` element.
 
 ###Bacon.$.radioGroupValue(fields, [,initValue])
 
 Creates a `Model` for a
-group of `<input type="radio">` elements, given as a JQuery object or an Array
-of jQuery objects. The value of the model corresponds to the `value` attribute
+group of `<input type="radio">` elements, given as a JQC object/Array.
+The value of the model corresponds to the `value` attribute
 of the selected radio input element. Note that `value` is a string.
 
 ###Bacon.$.intRadioGroupValue(fields [, initValue])
@@ -73,17 +105,16 @@ Like `Bacon.$.radioGroupValue`, but for integer values.
 ###Bacon.$.checkBoxGroupValue(fields, [,initValue])
 
 Creates a `Model` for a group
-of `<input type="checkbox">` elements, given as a JQuery object or an Array of
-jQuery objects. The value of the model is an array of the `value` attributes of
+of `<input type="checkbox">` elements, given as a JQC object/Array . The value of the model is an array of the `value` attributes of
 the checked checkbox input elements. For instance, if you have checkboxes and 2
 of these are checked, having values `a` and `b`, the value of the Model is
 `["a", "b"]`.
 
 TODO: add HTML/JS examples
 
-## FRP extensions to JQuery Events
+## FRP extensions to JQC Events
 
-BJQ adds methods to JQuery, for wrapping events into an `EventStream`.
+BJQ adds methods to JQC, for wrapping events into an `EventStream`.
 
 For example, to wrap click events on `<body>` into an `EventStream`, you
 can
@@ -123,9 +154,9 @@ Supported methods include the following:
 - loadE
 - unloadE
 
-## FRP extensions to JQuery Effects
+## FRP extensions to JQC Effects
 
-BJQ adds methods to JQuery, for performing animations and wrapping the
+BJQ adds methods to JQC, for performing animations and wrapping the
 result `Promise` into an `EventStream`. For example
 
     var fadeOut = $("#thing").fadeOutE("fast")
@@ -146,7 +177,7 @@ Supported methods include the following:
 
 ## AJAX
 
-BJQ provides helpers for JQuery AJAX. All the methods return an
+BJQ provides helpers for JQC AJAX. All the methods return an
 `EventStream` of AJAX results. AJAX errors are mapped into `Error`
 events in the stream.
 
@@ -196,25 +227,21 @@ Turns your Bacon Ajax stream back to $.Deferred. It's useful if you need to prov
 
 ## Model API
 
-All the BJQ methods, such as `textFieldValue` return a `Model` object, which is a Bacon.js `Property`, but extends that API by the following methods.
-
-[Model API reference migrated to bacon.model](https://github.com/baconjs/bacon.model)
-
-
-TODO: more
+All the BJQ methods, such as `textFieldValue` return a `Model` object, which is a Bacon.js `Property`,
+but extends that API with [bacon.model](https://github.com/baconjs/bacon.model) methods
 
 ## Use with AMD / RequireJS
 
-The [requirejs example-app](https://github.com/baconjs/bacon.jquery/tree/master/examples/requirejs) uses RequireJS, like this:
+The [requirejs example-app](https://github.com/baconjs/bacon-dom/tree/master/examples/requirejs) uses RequireJS, like this:
 
 ```js
 require.config({
   paths: {
-    "bacon.jquery": "../dist/bacon.jquery",
+    "bacon-dom": "../dist/bacon-dom",
     "bacon": "components/bacon/dist/Bacon",
     "jquery": "components/jquery/jquery"
   }})
-require(["bacon.jquery", "jquery"], function(bjq, $) {
+require(["bacon-dom", "jquery"], function(bjq, $) {
   left = bjq.textFieldValue($("#left"))
   right = bjq.textFieldValue($("#right"))
   right.bind(left)
@@ -222,36 +249,38 @@ require(["bacon.jquery", "jquery"], function(bjq, $) {
 })
 ```
 
-The prebuilt javascript file can be found in the `dist` directory, or [here](https://raw.github.com/baconjs/bacon.jquery/master/dist/Bacon.JQuery.Bindings.js).
+Note: You can substitute jquery with Zepto or any other compatible library ;)
+
+The prebuilt javascript file can be found in the `dist` directory, or [here](https://raw.github.com/baconjs/bacon-dom/master/dist/bacon-dom.Bindings.js).
 
 The API can be accessed using `Bacon.$` or like in the above example.
 
 ## Use without AMD
 
-The [plain example-app](https://github.com/baconjs/bacon.jquery/tree/master/examples/plain) uses RequireJS, like this:
+The [plain example-app](https://github.com/baconjs/bacon-dom/tree/master/examples/plain) uses RequireJS, like this:
 
-So feel free to use plain old `<script>` tags to include Bacon, JQuery and BJQ.
+So feel free to use plain old `<script>` tags to include Bacon, and JQC lib and BJQ.
 
 The BJQ methods are exposed through `Bacon.$`, so you can call them as in `Bacon.$.textFieldValue(..)`.
 
-The prebuilt javascript file can be found in the `dist` directory, or [here](https://raw.github.com/baconjs/bacon.jquery/master/dist/Bacon.JQuery.Bindings.js).
+The prebuilt javascript file can be found in the `dist` directory, or [here](https://raw.github.com/baconjs/bacon-dom/master/dist/bacon-dom.Bindings.js).
 
-There's a [plain example-app](https://github.com/baconjs/bacon.jquery/tree/master/examples/plain) that uses script tags only.
+There's a [plain example-app](https://github.com/baconjs/bacon-dom/tree/master/examples/plain) that uses script tags only.
 
 ## Use with Node / Browserify
 
-BJQ is registered in the NPM repository as `bacon.jquery` and works fine with [node-browserify](https://github.com/substack/node-browserify).
+BJQ is registered in the NPM repository as `bacon-dom` and works fine with [node-browserify](https://github.com/substack/node-browserify).
 
-See the [browserify example-app](https://github.com/baconjs/bacon.jquery/tree/master/examples/browserify) for an example.
+See the [browserify example-app](https://github.com/baconjs/bacon-dom/tree/master/examples/browserify) for an example.
 
 ## Use with Bower
 
-Registered to the Bower registry as `bacon.jquery`. See the
-Example Applications, for instance [requirejs example-app](https://github.com/baconjs/bacon.jquery/tree/master/examples/requirejs).
+Registered to the Bower registry as `bacon-dom`. See the
+Example Applications, for instance [requirejs example-app](https://github.com/baconjs/bacon-dom/tree/master/examples/requirejs).
 
 ## Building
 
-The `bacon.jquery` module is built using NPM and Grunt.
+The `bacon-dom` module is built using NPM and Grunt.
 
 To build, use `npm install`.
 
@@ -269,11 +298,11 @@ The browser tests can also be run by opening the
 
 The tests are also run automatically on [Travis CI](https://travis-ci.org/). See build status below.
 
-[![Build Status](https://travis-ci.org/baconjs/bacon.jquery.png)](https://travis-ci.org/baconjs/bacon.jquery)
+[![Build Status](https://travis-ci.org/baconjs/bacon-dom.png)](https://travis-ci.org/baconjs/bacon-dom)
 
 ## What next?
 
-See [Issues](https://github.com/baconjs/bacon.jquery/issues).
+See [Issues](https://github.com/baconjs/bacon-dom/issues).
 
 If this seems like a good idea, please tell me so! If you'd like to
 contribute, please do! Pull Requests, Issues etc appreciated. Star this project to let me know that you care.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 292b580..c19e28f 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,3 +1,6 @@
-0.4.2 shrink code size (PR #28 by @tco)
-0.4.1 don't use Array.prototype.indexOf
-0.4.0 extracted bacon.model
+## Release notes
+
+- 0.5.0 Remove hard dependency on jQuery and rename to bacon-dom
+- 0.4.2 shrink code size (PR #28 by @tco)
+- 0.4.1 don't use Array.prototype.indexOf
+- 0.4.0 extracted bacon.model
diff --git a/bower.json b/bower.json
index e17af01..ca01150 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
-  "name": "bacon.jquery",
-  "version": "0.4.11",
-  "main": "dist/bacon.jquery.js",
+  "name": "bacon-dom",
+  "version": "0.5.0",
+  "main": "dist/bacon-dom.js",
   "ignore": ["browsertest", "examples", "src", "test", "./*.*", "build", "release", "run-tests", "version"]
 }
diff --git a/browsertest/BJB-tests.js b/browsertest/BJB-tests.js
index 682cb0d..cf5804a 100644
--- a/browsertest/BJB-tests.js
+++ b/browsertest/BJB-tests.js
@@ -1,7 +1,7 @@
 var expect = chai.expect
 
-describe('bacon.jquery', function() {
-  describe('textFieldValue', function() {
+describe('bacon-dom', function() {
+  describe('textField.value', function() {
     var field
     beforeEach(function() {
       $('#bacon-dom').html('<input type="text" id="text" value="defaultVal">')
@@ -10,28 +10,28 @@ describe('bacon.jquery', function() {
 
     describe('with initVal', function() {
       it('sets value to DOM', function() {
-          var model = Bacon.$.textFieldValue(field, 'initVal')
+          var model = Bacon.$.textField.value(field, 'initVal')
           expect(field.val()).to.equal('initVal')
       })
       it('sets the initVal as the initial value of the model', function() {
-        var model = Bacon.$.textFieldValue(field, 'initVal')
+        var model = Bacon.$.textField.value(field, 'initVal')
         specifyValue(model, 'initVal')
       })
     })
 
     describe('without initVal', function() {
       it('leaves DOM unaffected', function() {
-          var model = Bacon.$.textFieldValue(field)
+          var model = Bacon.$.textField.value(field)
           expect(field.val()).to.equal('defaultVal')
       })
       it('uses value from DOM as initial value of the model', function() {
-        var model = Bacon.$.textFieldValue(field)
+        var model = Bacon.$.textField.value(field)
         specifyValue(model, 'defaultVal')
       })
       describe('with empty default value', function() {
         it('waits for browser to autofill textfield', function(done) {
           field.val('')
-          var model = Bacon.$.textFieldValue(field)
+          var model = Bacon.$.textField.value(field)
           model.filter(function (v) {
               return v
           }).onValue(function() {
@@ -45,21 +45,21 @@ describe('bacon.jquery', function() {
 
     describe('when setting value of model', function() {
       it('sets value to DOM', function() {
-          Bacon.$.textFieldValue(field).set('newVal')
+          Bacon.$.textField.value(field).set('newVal')
           expect(field.val()).to.equal('newVal')
       })
     })
 
     describe('when DOM value changes', function() {
       it('updates value of model', function() {
-        var model = Bacon.$.textFieldValue(field)
+        var model = Bacon.$.textField.value(field)
         field.val("newVal")
         field.trigger("keyup")
         specifyValue(model, "newVal")
       })
 
       it('ignores duplicates', function() {
-        var model = Bacon.$.textFieldValue(field)
+        var model = Bacon.$.textField.value(field)
         field.val("newVal")
         field.trigger("keyup")
         specifyValue(model, "newVal")
@@ -72,13 +72,13 @@ describe('bacon.jquery', function() {
 
     describe('when element is not found', function() {
       it('returns empty string as value', function() {
-        var model = Bacon.$.textFieldValue($('.asdfqwer'))
+        var model = Bacon.$.textField.value($('.asdfqwer'))
         specifyValue(model, '')
       })
     })
   })
 
-  describe('checkBoxValue', function() {
+  describe('checkBox.value', function() {
     var field
     beforeEach(function() {
       $('#bacon-dom').html('<input type="checkbox" id="checkbox">')
@@ -87,52 +87,52 @@ describe('bacon.jquery', function() {
 
     describe('with initVal', function() {
       it('sets value to DOM', function() {
-          var model = Bacon.$.checkBoxValue(field, true)
+          var model = Bacon.$.checkBox.value(field, true)
           expect(field.prop("checked")).to.equal(true)
       })
       it('sets the initVal as the initial value of the model', function() {
-        var model = Bacon.$.checkBoxValue(field, true)
+        var model = Bacon.$.checkBox.value(field, true)
         specifyValue(model, true)
       })
     })
 
     describe('without initVal', function() {
       it('leaves DOM unaffected', function() {
-          var model = Bacon.$.checkBoxValue(field)
+          var model = Bacon.$.checkBox.value(field)
           expect(field.prop("checked")).to.equal(false)
       })
       it('uses value from DOM as initial value of the model', function() {
-        var model = Bacon.$.checkBoxValue(field)
+        var model = Bacon.$.checkBox.value(field)
         specifyValue(model, false)
       })
     })
 
     describe('when setting value of model', function() {
       it('sets value to DOM', function() {
-          Bacon.$.checkBoxValue(field).set(true)
+          Bacon.$.checkBox.value(field).set(true)
           expect(field.prop("checked")).to.equal(true)
       })
       it('leaves defaultChecked property as is', function() {
-          Bacon.$.checkBoxValue(field).set(true)
+          Bacon.$.checkBox.value(field).set(true)
           expect(field.prop("defaultChecked")).to.equal(false)
       })
     })
     describe('when DOM value changes', function() {
       it('updates value of model', function() {
-        var model = Bacon.$.checkBoxValue(field)
+        var model = Bacon.$.checkBox.value(field)
         field.trigger("click")
         specifyValue(model, true)
       })
     })
     describe('when element is not found', function() {
       it('returns false as value', function() {
-        var model = Bacon.$.checkBoxValue($('.asdfqwer'))
+        var model = Bacon.$.checkBox.value($('.asdfqwer'))
         specifyValue(model, false)
       })
     })
   })
 
-  describe('selectValue', function() {
+  describe('select.value', function() {
     var field
     beforeEach(function() {
       $('#bacon-dom').html('<select id="select"><option value="a">A</option><option value="b" selected>B</option></select>')
@@ -141,35 +141,35 @@ describe('bacon.jquery', function() {
 
     describe('with initVal', function() {
       it('sets value to DOM', function() {
-        var model = Bacon.$.selectValue(field, 'a')
+        var model = Bacon.$.select.value(field, 'a')
         expect(field.val()).to.equal('a')
       })
       it('sets the initVal as the initial value of the model', function() {
-        var model = Bacon.$.selectValue(field, 'a')
+        var model = Bacon.$.select.value(field, 'a')
         specifyValue(model, 'a')
       })
     })
 
     describe('without initVal', function() {
       it('leaves DOM unaffected', function() {
-        var model = Bacon.$.selectValue(field)
+        var model = Bacon.$.select.value(field)
         expect(field.val()).to.equal('b')
       })
       it('uses value from DOM as initial value of the model', function() {
-        var model = Bacon.$.selectValue(field)
+        var model = Bacon.$.select.value(field)
         specifyValue(model, 'b')
       })
     })
 
     describe('when setting value of model', function() {
       it('sets value to DOM', function() {
-        Bacon.$.selectValue(field).set('a')
+        Bacon.$.select.value(field).set('a')
         expect(field.val()).to.equal('a')
       })
     })
     describe('when DOM value changes', function() {
       it('updates value of model', function() {
-        var model = Bacon.$.selectValue(field)
+        var model = Bacon.$.select.value(field)
         field.val("a")
         field.trigger("change")
         specifyValue(model, "a")
@@ -177,28 +177,28 @@ describe('bacon.jquery', function() {
     })
   })
 
-  describe('selectValue without any options', function() {
+  describe('select.value without any options', function() {
     it('sets `null` as initial value of the model', function() {
       $('#bacon-dom').html('<select id="select"></select>')
-      var model = Bacon.$.selectValue($('#bacon-dom #select'))
+      var model = Bacon.$.select.value($('#bacon-dom #select'))
       specifyValue(model, null)
     })
   })
 
-  describe('selectValue when element is not found', function() {
+  describe('select.value when element is not found', function() {
     it('sets `undefined` as initial value of the model', function() {
-      var model = Bacon.$.selectValue($('.asdfqwer'))
+      var model = Bacon.$.select.value($('.asdfqwer'))
       specifyValue(model, undefined)
     })
   })
 
-  describe('radioGroupValue', function() {
-    testRadioGroupValueModel(Bacon.$.radioGroupValue, "a", "b")
+  describe('radioGroup.value', function() {
+    testradioGroup.valueModel(Bacon.$.radioGroup.value, "a", "b")
   })
 
-  describe('intRadioGroupValue', function() {
-    testRadioGroupValueModel(Bacon.$.intRadioGroupValue, 1, 2)
-    testRadioGroupValueModel(Bacon.$.intRadioGroupValue, 0, 23)
+  describe('radioGroup.intValue', function() {
+    testradioGroup.valueModel(Bacon.$.radioGroup.intValue, 1, 2)
+    testradioGroup.valueModel(Bacon.$.radioGroup.intValue, 0, 23)
   })
 
   testEventHelper('click')
diff --git a/browsertest/runner.html b/browsertest/runner.html
index a006969..872196a 100644
--- a/browsertest/runner.html
+++ b/browsertest/runner.html
@@ -1,7 +1,7 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <title>bacon.jquery Mocha Tests</title>
+    <title>bacon-dom Mocha Tests</title>
     <link rel="stylesheet" href="lib/mocha/mocha.css" />
     <script src="lib/jquery/jquery.min.js"></script>
     <script src="lib/mockjax.js"></script>
@@ -10,7 +10,7 @@
     <script src="lib/mocha/mocha.js"></script>
     <script src="../node_modules/baconjs/dist/Bacon.js"></script>
     <script src="../node_modules/bacon.model/dist/bacon.model.js"></script>
-    <script src="../dist/bacon.jquery.js"></script>
+    <script src="../dist/bacon-dom.js"></script>
     <script>mocha.setup('bdd')</script>
     <script src="BJB-tests.js"></script>
     <script>
diff --git a/component.json b/component.json
index aa37162..5c2d156 100644
--- a/component.json
+++ b/component.json
@@ -1,9 +1,9 @@
 {
-  "name": "bacon.jquery",
-  "version": "0.4.11",
-  "main": "dist/bacon.jquery.js",
+  "name": "bacon-dom",
+  "version": "0.5.0",
+  "main": "dist/bacon-dom.js",
   "scripts": [
-    "dist/bacon.jquery.js"
+    "dist/bacon-dom.js"
   ],
   "dependencies":{
   	"baconjs/bacon.js":"*"
diff --git a/dist/bacon-dom.js b/dist/bacon-dom.js
new file mode 100644
index 0000000..1dfec7b
--- /dev/null
+++ b/dist/bacon-dom.js
@@ -0,0 +1,306 @@
+(function() {
+  init(function($) {
+    $.ajax = function(params, abort) {
+      return Bacon.fromPromise($.Request.ajax(params), abort);
+    };
+    $.ajaxGet = function(url, data, dataType, abort) {
+      return $.ajax({
+        url: url,
+        dataType: dataType,
+        data: data
+      }, abort);
+    };
+    $.ajaxGetJSON = function(url, data, abort) {
+      return $.ajax({
+        url: url,
+        dataType: "json",
+        data: data
+      }, abort);
+    };
+    Bacon.$.ajaxPost = function(url, data, dataType, abort) {
+      return $.ajax({
+        url: url,
+        dataType: dataType,
+        data: data,
+        type: "POST"
+      }, abort);
+    };
+    $.ajaxGetScript = function(url, abort) {
+      return $.ajax({
+        url: url,
+        dataType: "script"
+      }, abort);
+    };
+    $.lazyAjax = function(params) {
+      return Bacon.once(params).flatMap(Bacon.$.ajax);
+    };
+    return Bacon.Observable.prototype.ajax = function() {
+      return this.flatMapLatest($.ajax);
+    };
+  });
+
+}).call(this);
+
+(function() {
+  var __slice = [].slice;
+
+  module.exports = function($) {
+    var e, effectNames, effects, _fn, _i, _len;
+    effectNames = ["animate", "show", "hide", "toggle", "fadeIn", "fadeOut", "fadeTo", "fadeToggle", "slideDown", "slideUp", "slideToggle"];
+    effects = {};
+    _fn = function(e) {
+      return effects[e + 'E'] = function() {
+        var args;
+        args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
+        return Bacon.fromPromise(this[e].apply(this, args).promise());
+      };
+    };
+    for (_i = 0, _len = effectNames.length; _i < _len; _i++) {
+      e = effectNames[_i];
+      _fn(e);
+    }
+    $.Extender.extend(effects);
+    return $;
+  };
+
+}).call(this);
+
+(function() {
+  var __slice = [].slice;
+
+  module.exports = function($) {
+    var e, eventNames, events, _fn, _i, _len;
+    eventNames = ["keydown", "keyup", "keypress", "click", "dblclick", "mousedown", "mouseup", "mouseenter", "mouseleave", "mousemove", "mouseout", "mouseover", "dragstart", "drag", "dragenter", "dragleave", "dragover", "drop", "dragend", "resize", "scroll", "select", "change", "submit", "blur", "focus", "focusin", "focusout", "load", "unload"];
+    events = {};
+    _fn = function(e) {
+      return events[e + 'E'] = function() {
+        var args;
+        args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
+        return this.asEventStream.apply(this, [e].concat(__slice.call(args)));
+      };
+    };
+    for (_i = 0, _len = eventNames.length; _i < _len; _i++) {
+      e = eventNames[_i];
+      _fn(e);
+    }
+    $.Extender.extend(events);
+    $.Extender.asEventStream = Bacon.$.asEventStream;
+    return $;
+  };
+
+}).call(this);
+
+(function() {
+  module.exports = function($) {
+    var asJQC, assertArrayOrJQC, nonEmpty;
+    nonEmpty = function(x) {
+      return x.length > 0;
+    };
+    assertArrayOrJQC = function(x) {
+      if (!(typeof x === 'object' || x instanceof Array)) {
+        throw new Error('Value must be either an object or an Array of objects which conform to a minimal element query interface');
+      }
+    };
+    asJQC = function(x) {
+      return $.Selector.toJQC(x);
+    };
+    $.textField = {
+      interval: 50,
+      take: 10
+    };
+    $.textField = {
+      value: function(element, options) {
+        var autofillPoller, defaultOpt, events, get, initValue;
+        defaultOpt = $.textField;
+        initValue = options.init;
+        get = function() {
+          return element.val() || "";
+        };
+        autofillPoller = function() {
+          return Bacon.interval(options.interval || defaultOpt.interval).take(options.take || defaultOpt.take).map(get).filter(nonEmpty).take(1);
+        };
+        events = element.asEventStream("keyup input").merge(element.asEventStream("cut paste").delay(1)).merge(autofillPoller());
+        return Bacon.Binding({
+          initValue: initValue,
+          get: get,
+          events: events,
+          set: function(value) {
+            return element.val(value);
+          }
+        });
+      }
+    };
+    $.checkBox = {
+      value: function(element, options) {
+        var initValue;
+        initValue = options.init;
+        return Bacon.Binding({
+          initValue: initValue,
+          get: function() {
+            return element.prop("checked") || false;
+          },
+          events: element.asEventStream("change"),
+          set: function(value) {
+            return element.prop("checked", value);
+          }
+        });
+      },
+      groupValue: function(checkBoxes, options) {
+        var initValue;
+        initValue = options.init;
+        assertArrayOrJQC(checkBoxes);
+        checkBoxes = asJQC(checkBoxes);
+        return Bacon.Binding({
+          initValue: initValue,
+          get: function() {
+            return checkBoxes.filter(":checked").map(function(i, elem) {
+              return $.Selector(elem).val();
+            }).toArray();
+          },
+          events: checkBoxes.asEventStream("change"),
+          set: function(value) {
+            return checkBoxes.each(function(i, elem) {
+              return $.Selector(elem).prop("checked", $.indexOf(value, $.Selector(elem).val()) >= 0);
+            });
+          }
+        });
+      }
+    };
+    $.select = {
+      value: function(element, options) {
+        var initValue;
+        initValue = options.init;
+        return Bacon.Binding({
+          initValue: initValue,
+          get: function() {
+            return element.val();
+          },
+          events: element.asEventStream("change"),
+          set: function(value) {
+            return element.val(value);
+          }
+        });
+      }
+    };
+    return $.radioGroup = {
+      value: function(radios, options) {
+        var initValue;
+        initValue = options.init;
+        assertArrayOrJQC(radios);
+        radios = asJQC(radios);
+        return Bacon.Binding({
+          initValue: initValue,
+          get: function() {
+            return radios.filter(":checked").first().val();
+          },
+          events: radios.asEventStream("change"),
+          set: function(value) {
+            return radios.each(function(i, elem) {
+              return $.Selector(elem).prop("checked", elem.value === value);
+            });
+          }
+        });
+      },
+      intValue: function(radios, options) {
+        var initValue, radioGroupValue;
+        initValue = options.init;
+        radioGroupValue = $.radioGroupValue(radios);
+        return Bacon.Binding({
+          initValue: initValue,
+          get: function() {
+            var value;
+            value = radioGroupValue.get();
+            if (value != null) {
+              return parseInt(value);
+            } else {
+              return value;
+            }
+          },
+          events: radioGroupValue.syncEvents(),
+          set: function(value) {
+            var strValue;
+            strValue = value != null ? Number(value).toString() : value;
+            return radioGroupValue.set(strValue);
+          }
+        });
+      }
+    };
+  };
+
+}).call(this);
+
+(function() {
+  var Bacon, BaconModel, init,
+    __slice = [].slice;
+
+  init = function(Bacon, BaconModel, JQC) {
+    var altIndxOf, indxOf;
+    JQC = JQC || {};
+    altIndxOf = function(xs, x) {
+      var i, y, _i, _len;
+      for (i = _i = 0, _len = xs.length; _i < _len; i = ++_i) {
+        y = xs[i];
+        if (x === y) {
+          return i;
+        }
+      }
+      return -1;
+    };
+    indxOf = function(xs, x) {
+      return xs.indexOf(x);
+    };
+    Bacon.$.indexOf = Array.prototype.indexOf ? indxOf : altIndxOf;
+    Bacon.$.Model = Bacon.Model;
+    Bacon.$.Selector = JQC;
+    Bacon.$.Request = JQC;
+    Bacon.$.Promise = JQC;
+    Bacon.$.Extender = JQC.fn;
+    Bacon.$.plugin = function() {
+      var name, names, plugin, _i, _len, _results;
+      names = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
+      _results = [];
+      for (_i = 0, _len = names.length; _i < _len; _i++) {
+        name = names[_i];
+        plugin = require("./bacon-" + name);
+        _results.push(plugin(Bacon.$));
+      }
+      return _results;
+    };
+    return Bacon.$;
+  };
+
+  if (typeof module !== "undefined" && module !== null) {
+    Bacon = require("baconjs");
+    BaconModel = require("bacon.model");
+    module.exports = init(Bacon, BaconModel, $);
+  } else {
+    if (typeof define === "function" && define.amd) {
+      define(["bacon", "bacon.model", $], init);
+    } else {
+      init(this.Bacon, this.BaconModel, this.$);
+    }
+  }
+
+}).call(this);
+
+(function() {
+  module.exports = function($) {
+    return Bacon.Observable.prototype.toDeferred = function() {
+      var dfd, value;
+      value = void 0;
+      dfd = $.Promise.deferred() || $.Deferred();
+      this.take(1).endOnError().subscribe(function(evt) {
+        if (evt.hasValue()) {
+          value = evt.value();
+          return dfd.notify(value);
+        } else if (evt.isError()) {
+          return dfd.reject(evt.error);
+        } else if (evt.isEnd()) {
+          return dfd.resolve(value);
+        }
+      });
+      return dfd;
+    };
+  };
+
+}).call(this);
diff --git a/dist/bacon-dom.min.js b/dist/bacon-dom.min.js
new file mode 100644
index 0000000..0fd980d
--- /dev/null
+++ b/dist/bacon-dom.min.js
@@ -0,0 +1 @@
+(function(){init(function(a){return a.ajax=function(b,c){return Bacon.fromPromise(a.Request.ajax(b),c)},a.ajaxGet=function(b,c,d,e){return a.ajax({url:b,dataType:d,data:c},e)},a.ajaxGetJSON=function(b,c,d){return a.ajax({url:b,dataType:"json",data:c},d)},Bacon.$.ajaxPost=function(b,c,d,e){return a.ajax({url:b,dataType:d,data:c,type:"POST"},e)},a.ajaxGetScript=function(b,c){return a.ajax({url:b,dataType:"script"},c)},a.lazyAjax=function(a){return Bacon.once(a).flatMap(Bacon.$.ajax)},Bacon.Observable.prototype.ajax=function(){return this.flatMapLatest(a.ajax)}})}).call(this),function(){var a=[].slice;module.exports=function(b){var c,d,e,f,g,h;for(d=["animate","show","hide","toggle","fadeIn","fadeOut","fadeTo","fadeToggle","slideDown","slideUp","slideToggle"],e={},f=function(b){return e[b+"E"]=function(){var c;return c=1<=arguments.length?a.call(arguments,0):[],Bacon.fromPromise(this[b].apply(this,c).promise())}},g=0,h=d.length;h>g;g++)c=d[g],f(c);return b.Extender.extend(e),b}}.call(this),function(){var a=[].slice;module.exports=function(b){var c,d,e,f,g,h;for(d=["keydown","keyup","keypress","click","dblclick","mousedown","mouseup","mouseenter","mouseleave","mousemove","mouseout","mouseover","dragstart","drag","dragenter","dragleave","dragover","drop","dragend","resize","scroll","select","change","submit","blur","focus","focusin","focusout","load","unload"],e={},f=function(b){return e[b+"E"]=function(){var c;return c=1<=arguments.length?a.call(arguments,0):[],this.asEventStream.apply(this,[b].concat(a.call(c)))}},g=0,h=d.length;h>g;g++)c=d[g],f(c);return b.Extender.extend(e),b.Extender.asEventStream=Bacon.$.asEventStream,b}}.call(this),function(){module.exports=function(a){var b,c,d;return d=function(a){return a.length>0},c=function(a){if(!("object"==typeof a||a instanceof Array))throw new Error("Value must be either an object or an Array of objects which conform to a minimal element query interface")},b=function(b){return a.Selector.toJQC(b)},a.textField={interval:50,take:10},a.textField={value:function(b,c){var e,f,g,h,i;return f=a.textField,i=c.init,h=function(){return b.val()||""},e=function(){return Bacon.interval(c.interval||f.interval).take(c.take||f.take).map(h).filter(d).take(1)},g=b.asEventStream("keyup input").merge(b.asEventStream("cut paste").delay(1)).merge(e()),Bacon.Binding({initValue:i,get:h,events:g,set:function(a){return b.val(a)}})}},a.checkBox={value:function(a,b){var c;return c=b.init,Bacon.Binding({initValue:c,get:function(){return a.prop("checked")||!1},events:a.asEventStream("change"),set:function(b){return a.prop("checked",b)}})},groupValue:function(d,e){var f;return f=e.init,c(d),d=b(d),Bacon.Binding({initValue:f,get:function(){return d.filter(":checked").map(function(b,c){return a.Selector(c).val()}).toArray()},events:d.asEventStream("change"),set:function(b){return d.each(function(c,d){return a.Selector(d).prop("checked",a.indexOf(b,a.Selector(d).val())>=0)})}})}},a.select={value:function(a,b){var c;return c=b.init,Bacon.Binding({initValue:c,get:function(){return a.val()},events:a.asEventStream("change"),set:function(b){return a.val(b)}})}},a.radioGroup={value:function(d,e){var f;return f=e.init,c(d),d=b(d),Bacon.Binding({initValue:f,get:function(){return d.filter(":checked").first().val()},events:d.asEventStream("change"),set:function(b){return d.each(function(c,d){return a.Selector(d).prop("checked",d.value===b)})}})},intValue:function(b,c){var d,e;return d=c.init,e=a.radioGroupValue(b),Bacon.Binding({initValue:d,get:function(){var a;return a=e.get(),null!=a?parseInt(a):a},events:e.syncEvents(),set:function(a){var b;return b=null!=a?Number(a).toString():a,e.set(b)}})}}}}.call(this),function(){var a,b,c,d=[].slice;c=function(a,b,c){var e,f;return c=c||{},e=function(a,b){var c,d,e,f;for(c=e=0,f=a.length;f>e;c=++e)if(d=a[c],b===d)return c;return-1},f=function(a,b){return a.indexOf(b)},a.$.indexOf=Array.prototype.indexOf?f:e,a.$.Model=a.Model,a.$.Selector=c,a.$.Request=c,a.$.Promise=c,a.$.Extender=c.fn,a.$.plugin=function(){var b,c,e,f,g,h;for(c=1<=arguments.length?d.call(arguments,0):[],h=[],f=0,g=c.length;g>f;f++)b=c[f],e=require("./bacon-"+b),h.push(e(a.$));return h},a.$},"undefined"!=typeof module&&null!==module?(a=require("baconjs"),b=require("bacon.model"),module.exports=c(a,b,$)):"function"==typeof define&&define.amd?define(["bacon","bacon.model",$],c):c(this.Bacon,this.BaconModel,this.$)}.call(this),function(){module.exports=function(a){return Bacon.Observable.prototype.toDeferred=function(){var b,c;return c=void 0,b=a.Promise.deferred()||a.Deferred(),this.take(1).endOnError().subscribe(function(a){return a.hasValue()?(c=a.value(),b.notify(c)):a.isError()?b.reject(a.error):a.isEnd()?b.resolve(c):void 0}),b}}}.call(this);
\ No newline at end of file
diff --git a/dist/bacon.jquery.js b/dist/bacon.jquery.js
deleted file mode 100644
index 07db0b1..0000000
--- a/dist/bacon.jquery.js
+++ /dev/null
@@ -1,243 +0,0 @@
-(function() {
-  var $, Bacon, BaconModel, init,
-    __slice = [].slice;
-
-  init = function(Bacon, BaconModel, $) {
-    var asJQueryObject, assertArrayOrJQueryObject, e, effectNames, effects, eventNames, events, nonEmpty, _, _fn, _fn1, _i, _j, _len, _len1;
-    nonEmpty = function(x) {
-      return x.length > 0;
-    };
-    assertArrayOrJQueryObject = function(x) {
-      if (!(x instanceof jQuery || x instanceof Array)) {
-        throw new Error('Value must be either a jQuery object or an Array of jQuery objects');
-      }
-    };
-    asJQueryObject = function(x) {
-      var element, obj, _i, _len;
-      if (x instanceof jQuery) {
-        return x;
-      } else {
-        obj = $();
-        for (_i = 0, _len = x.length; _i < _len; _i++) {
-          element = x[_i];
-          if (element instanceof jQuery) {
-            obj = obj.add(element);
-          }
-        }
-        return obj;
-      }
-    };
-    _ = {
-      indexOf: Array.prototype.indexOf ? function(xs, x) {
-        return xs.indexOf(x);
-      } : function(xs, x) {
-        var i, y, _i, _len;
-        for (i = _i = 0, _len = xs.length; _i < _len; i = ++_i) {
-          y = xs[i];
-          if (x === y) {
-            return i;
-          }
-        }
-        return -1;
-      }
-    };
-    Bacon.$.Model = Bacon.Model;
-    Bacon.$.textFieldValue = function(element, initValue) {
-      var autofillPoller, events, get;
-      get = function() {
-        return element.val() || "";
-      };
-      autofillPoller = function() {
-        return Bacon.interval(50).take(10).map(get).filter(nonEmpty).take(1);
-      };
-      events = element.asEventStream("keyup input").merge(element.asEventStream("cut paste").delay(1)).merge(autofillPoller());
-      return Bacon.Binding({
-        initValue: initValue,
-        get: get,
-        events: events,
-        set: function(value) {
-          return element.val(value);
-        }
-      });
-    };
-    Bacon.$.checkBoxValue = function(element, initValue) {
-      return Bacon.Binding({
-        initValue: initValue,
-        get: function() {
-          return element.prop("checked") || false;
-        },
-        events: element.asEventStream("change"),
-        set: function(value) {
-          return element.prop("checked", value);
-        }
-      });
-    };
-    Bacon.$.selectValue = function(element, initValue) {
-      return Bacon.Binding({
-        initValue: initValue,
-        get: function() {
-          return element.val();
-        },
-        events: element.asEventStream("change"),
-        set: function(value) {
-          return element.val(value);
-        }
-      });
-    };
-    Bacon.$.radioGroupValue = function(radios, initValue) {
-      assertArrayOrJQueryObject(radios);
-      radios = asJQueryObject(radios);
-      return Bacon.Binding({
-        initValue: initValue,
-        get: function() {
-          return radios.filter(":checked").first().val();
-        },
-        events: radios.asEventStream("change"),
-        set: function(value) {
-          return radios.each(function(i, elem) {
-            return $(elem).prop("checked", elem.value === value);
-          });
-        }
-      });
-    };
-    Bacon.$.intRadioGroupValue = function(radios, initValue) {
-      var radioGroupValue;
-      radioGroupValue = Bacon.$.radioGroupValue(radios);
-      return Bacon.Binding({
-        initValue: initValue,
-        get: function() {
-          var value;
-          value = radioGroupValue.get();
-          if (value != null) {
-            return parseInt(value);
-          } else {
-            return value;
-          }
-        },
-        events: radioGroupValue.syncEvents(),
-        set: function(value) {
-          var strValue;
-          strValue = value != null ? Number(value).toString() : value;
-          return radioGroupValue.set(strValue);
-        }
-      });
-    };
-    Bacon.$.checkBoxGroupValue = function(checkBoxes, initValue) {
-      assertArrayOrJQueryObject(checkBoxes);
-      checkBoxes = asJQueryObject(checkBoxes);
-      return Bacon.Binding({
-        initValue: initValue,
-        get: function() {
-          return checkBoxes.filter(":checked").map(function(i, elem) {
-            return $(elem).val();
-          }).toArray();
-        },
-        events: checkBoxes.asEventStream("change"),
-        set: function(value) {
-          return checkBoxes.each(function(i, elem) {
-            return $(elem).prop("checked", _.indexOf(value, $(elem).val()) >= 0);
-          });
-        }
-      });
-    };
-    Bacon.$.ajax = function(params, abort) {
-      return Bacon.fromPromise($.ajax(params), abort);
-    };
-    Bacon.$.ajaxGet = function(url, data, dataType, abort) {
-      return Bacon.$.ajax({
-        url: url,
-        dataType: dataType,
-        data: data
-      }, abort);
-    };
-    Bacon.$.ajaxGetJSON = function(url, data, abort) {
-      return Bacon.$.ajax({
-        url: url,
-        dataType: "json",
-        data: data
-      }, abort);
-    };
-    Bacon.$.ajaxPost = function(url, data, dataType, abort) {
-      return Bacon.$.ajax({
-        url: url,
-        dataType: dataType,
-        data: data,
-        type: "POST"
-      }, abort);
-    };
-    Bacon.$.ajaxGetScript = function(url, abort) {
-      return Bacon.$.ajax({
-        url: url,
-        dataType: "script"
-      }, abort);
-    };
-    Bacon.$.lazyAjax = function(params) {
-      return Bacon.once(params).flatMap(Bacon.$.ajax);
-    };
-    Bacon.Observable.prototype.ajax = function() {
-      return this.flatMapLatest(Bacon.$.ajax);
-    };
-    Bacon.Observable.prototype.toDeferred = function() {
-      var dfd, value;
-      value = void 0;
-      dfd = $.Deferred();
-      this.take(1).endOnError().subscribe(function(evt) {
-        if (evt.hasValue()) {
-          value = evt.value();
-          return dfd.notify(value);
-        } else if (evt.isError()) {
-          return dfd.reject(evt.error);
-        } else if (evt.isEnd()) {
-          return dfd.resolve(value);
-        }
-      });
-      return dfd;
-    };
-    eventNames = ["keydown", "keyup", "keypress", "click", "dblclick", "mousedown", "mouseup", "mouseenter", "mouseleave", "mousemove", "mouseout", "mouseover", "dragstart", "drag", "dragenter", "dragleave", "dragover", "drop", "dragend", "resize", "scroll", "select", "change", "submit", "blur", "focus", "focusin", "focusout", "load", "unload"];
-    events = {};
-    _fn = function(e) {
-      return events[e + 'E'] = function() {
-        var args;
-        args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
-        return this.asEventStream.apply(this, [e].concat(__slice.call(args)));
-      };
-    };
-    for (_i = 0, _len = eventNames.length; _i < _len; _i++) {
-      e = eventNames[_i];
-      _fn(e);
-    }
-    effectNames = ["animate", "show", "hide", "toggle", "fadeIn", "fadeOut", "fadeTo", "fadeToggle", "slideDown", "slideUp", "slideToggle"];
-    effects = {};
-    _fn1 = function(e) {
-      return effects[e + 'E'] = function() {
-        var args;
-        args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
-        return Bacon.fromPromise(this[e].apply(this, args).promise());
-      };
-    };
-    for (_j = 0, _len1 = effectNames.length; _j < _len1; _j++) {
-      e = effectNames[_j];
-      _fn1(e);
-    }
-    if ($ != null ? $.fn : void 0) {
-      $.fn.extend(events);
-      $.fn.extend(effects);
-      $.fn.asEventStream = Bacon.$.asEventStream;
-    }
-    return Bacon.$;
-  };
-
-  if (typeof module !== "undefined" && module !== null) {
-    Bacon = require("baconjs");
-    BaconModel = require("bacon.model");
-    $ = require("jquery");
-    module.exports = init(Bacon, BaconModel, $);
-  } else {
-    if (typeof define === "function" && define.amd) {
-      define(["bacon", "bacon.model", "jquery"], init);
-    } else {
-      init(this.Bacon, this.BaconModel, this.$);
-    }
-  }
-
-}).call(this);
diff --git a/dist/bacon.jquery.min.js b/dist/bacon.jquery.min.js
deleted file mode 100644
index c6200e6..0000000
--- a/dist/bacon.jquery.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(){var a,b,c,d,e=[].slice;d=function(a,b,c){var d,f,g,h,i,j,k,l,m,n,o,p,q,r,s;for(l=function(a){return a.length>0},f=function(a){if(!(a instanceof jQuery||a instanceof Array))throw new Error("Value must be either a jQuery object or an Array of jQuery objects")},d=function(a){var b,d,e,f;if(a instanceof jQuery)return a;for(d=c(),e=0,f=a.length;f>e;e++)b=a[e],b instanceof jQuery&&(d=d.add(b));return d},m={indexOf:Array.prototype.indexOf?function(a,b){return a.indexOf(b)}:function(a,b){var c,d,e,f;for(c=e=0,f=a.length;f>e;c=++e)if(d=a[c],b===d)return c;return-1}},a.$.Model=a.Model,a.$.textFieldValue=function(b,c){var d,e,f;return f=function(){return b.val()||""},d=function(){return a.interval(50).take(10).map(f).filter(l).take(1)},e=b.asEventStream("keyup input").merge(b.asEventStream("cut paste").delay(1)).merge(d()),a.Binding({initValue:c,get:f,events:e,set:function(a){return b.val(a)}})},a.$.checkBoxValue=function(b,c){return a.Binding({initValue:c,get:function(){return b.prop("checked")||!1},events:b.asEventStream("change"),set:function(a){return b.prop("checked",a)}})},a.$.selectValue=function(b,c){return a.Binding({initValue:c,get:function(){return b.val()},events:b.asEventStream("change"),set:function(a){return b.val(a)}})},a.$.radioGroupValue=function(b,e){return f(b),b=d(b),a.Binding({initValue:e,get:function(){return b.filter(":checked").first().val()},events:b.asEventStream("change"),set:function(a){return b.each(function(b,d){return c(d).prop("checked",d.value===a)})}})},a.$.intRadioGroupValue=function(b,c){var d;return d=a.$.radioGroupValue(b),a.Binding({initValue:c,get:function(){var a;return a=d.get(),null!=a?parseInt(a):a},events:d.syncEvents(),set:function(a){var b;return b=null!=a?Number(a).toString():a,d.set(b)}})},a.$.checkBoxGroupValue=function(b,e){return f(b),b=d(b),a.Binding({initValue:e,get:function(){return b.filter(":checked").map(function(a,b){return c(b).val()}).toArray()},events:b.asEventStream("change"),set:function(a){return b.each(function(b,d){return c(d).prop("checked",m.indexOf(a,c(d).val())>=0)})}})},a.$.ajax=function(b,d){return a.fromPromise(c.ajax(b),d)},a.$.ajaxGet=function(b,c,d,e){return a.$.ajax({url:b,dataType:d,data:c},e)},a.$.ajaxGetJSON=function(b,c,d){return a.$.ajax({url:b,dataType:"json",data:c},d)},a.$.ajaxPost=function(b,c,d,e){return a.$.ajax({url:b,dataType:d,data:c,type:"POST"},e)},a.$.ajaxGetScript=function(b,c){return a.$.ajax({url:b,dataType:"script"},c)},a.$.lazyAjax=function(b){return a.once(b).flatMap(a.$.ajax)},a.Observable.prototype.ajax=function(){return this.flatMapLatest(a.$.ajax)},a.Observable.prototype.toDeferred=function(){var a,b;return b=void 0,a=c.Deferred(),this.take(1).endOnError().subscribe(function(c){return c.hasValue()?(b=c.value(),a.notify(b)):c.isError()?a.reject(c.error):c.isEnd()?a.resolve(b):void 0}),a},j=["keydown","keyup","keypress","click","dblclick","mousedown","mouseup","mouseenter","mouseleave","mousemove","mouseout","mouseover","dragstart","drag","dragenter","dragleave","dragover","drop","dragend","resize","scroll","select","change","submit","blur","focus","focusin","focusout","load","unload"],k={},n=function(a){return k[a+"E"]=function(){var b;return b=1<=arguments.length?e.call(arguments,0):[],this.asEventStream.apply(this,[a].concat(e.call(b)))}},p=0,r=j.length;r>p;p++)g=j[p],n(g);for(h=["animate","show","hide","toggle","fadeIn","fadeOut","fadeTo","fadeToggle","slideDown","slideUp","slideToggle"],i={},o=function(b){return i[b+"E"]=function(){var c;return c=1<=arguments.length?e.call(arguments,0):[],a.fromPromise(this[b].apply(this,c).promise())}},q=0,s=h.length;s>q;q++)g=h[q],o(g);return(null!=c?c.fn:void 0)&&(c.fn.extend(k),c.fn.extend(i),c.fn.asEventStream=a.$.asEventStream),a.$},"undefined"!=typeof module&&null!==module?(b=require("baconjs"),c=require("bacon.model"),a=require("jquery"),module.exports=d(b,c,a)):"function"==typeof define&&define.amd?define(["bacon","bacon.model","jquery"],d):d(this.Bacon,this.BaconModel,this.$)}).call(this);
\ No newline at end of file
diff --git a/examples/plain/bower.json b/examples/plain/bower.json
index dee0bf3..02f6bc1 100644
--- a/examples/plain/bower.json
+++ b/examples/plain/bower.json
@@ -11,6 +11,6 @@
     "bacon": "~0.6",
     "bacon.model": "~0.1",
     "requirejs": "2.1.6",
-    "bacon.jquery": "~0"
+    "bacon-dom": "~0"
   }
 }
diff --git a/examples/plain/index.html b/examples/plain/index.html
index d42c5a0..42a48c8 100644
--- a/examples/plain/index.html
+++ b/examples/plain/index.html
@@ -3,13 +3,13 @@
   <script src="bower_components/jquery/jquery.js"></script>
   <script src="bower_components/bacon/dist/Bacon.js"></script>
   <script src="bower_components/bacon.model/dist/bacon.model.js"></script>
-  <script src="bower_components/bacon.jquery/dist/bacon.jquery.js"></script>
+  <script src="bower_components/bacon-dom/dist/bacon-dom.js"></script>
   <script type="text/javascript" language="javascript">
     $(function() {
       // binding for "left" text field
-      var left = Bacon.$.textFieldValue($("#left"))
+      var left = Bacon.$.textField.value($("#left"))
       // binding for "right" text field
-      var right = Bacon.$.textFieldValue($("#right"))
+      var right = Bacon.$.textField.value($("#right"))
       // make a two-way binding between these two
       right.bind(left)
       // Make a one-way side effect: update label text on changes, uppercase
diff --git a/examples/requirejs/bower.json b/examples/requirejs/bower.json
index dee0bf3..02f6bc1 100644
--- a/examples/requirejs/bower.json
+++ b/examples/requirejs/bower.json
@@ -11,6 +11,6 @@
     "bacon": "~0.6",
     "bacon.model": "~0.1",
     "requirejs": "2.1.6",
-    "bacon.jquery": "~0"
+    "bacon-dom": "~0"
   }
 }
diff --git a/examples/requirejs/example.js b/examples/requirejs/example.js
index ef81c9c..faa4806 100644
--- a/examples/requirejs/example.js
+++ b/examples/requirejs/example.js
@@ -1,11 +1,11 @@
 require.config({
   paths: {
     "bacon.model": "bower_components/bacon.model/dist/bacon.model",
-    "bacon.jquery": "bower_components/bacon.jquery/dist/bacon.jquery",
+    "bacon-dom": "bower_components/bacon-dom/dist/bacon-dom",
     "bacon": "bower_components/bacon/dist/Bacon",
     "jquery": "bower_components/jquery/jquery"
   }})
-require(["bacon.jquery", "jquery"], function(bjq, $) {
+require(["bacon-dom", "jquery"], function(bjq, $) {
   // binding for "left" text field
   var left = bjq.textFieldValue($("#left"))
   // binding for "right" text field
diff --git a/package.json b/package.json
index cc9a50a..9f56cdd 100644
--- a/package.json
+++ b/package.json
@@ -1,17 +1,21 @@
 {
-  "name": "bacon.jquery",
-  "version": "0.4.11",
-  "author": "Juha Paananen",
+  "name": "bacon-dom",
+  "version": "0.5.0",
+  "authors": [
+    "Juha Paananen",
+    "Kristian Mandrup"
+  ],
   "licenses": [
     "MIT"
   ],
   "dependencies": {
-    "baconjs": "~0.7.8"
+    "baconjs": ">=0.7.8"
   },
   "devDependencies": {
-    "coffee-script": "1.4.0",
-    "mocha": "~1.17",
-    "chai": "1.9.0",
+    "ender": "x",
+    "coffee-script": ">=1.4.0",
+    "mocha": ">=1.17",
+    "chai": ">=1.9.0",
     "grunt": "0.4.1",
     "grunt-cli": "0.1.13",
     "grunt-contrib-coffee": "~0.10.0",
@@ -20,12 +24,14 @@
     "grunt-contrib-uglify": "~0.2.2",
     "phantomjs": "~1",
     "mocha-phantomjs": "~3.3",
-    "jquery": "~2",
-    "bacon.model": "~0.1.6"
+    "bacon.model": ">=0.1.6"
   },
   "scripts": {
     "test": "./run-tests",
     "prepublish": "node_modules/grunt-cli/bin/grunt"
   },
-  "main": "dist/bacon.jquery.js"
+  "main": [
+    "dist/bacon-dom.js",
+    "dist/bacon-dom.min.js"
+  ]
 }
diff --git a/src/bacon-ajax.coffee b/src/bacon-ajax.coffee
new file mode 100644
index 0000000..67984ca
--- /dev/null
+++ b/src/bacon-ajax.coffee
@@ -0,0 +1,22 @@
+init ($) ->
+  # AJAX
+  $.ajax = (params, abort) ->
+    Bacon.fromPromise $.Request.ajax(params), abort
+
+  $.ajaxGet = (url, data, dataType, abort) ->
+    $.ajax({url, dataType, data}, abort)
+
+  $.ajaxGetJSON = (url, data, abort) ->
+    $.ajax({url, dataType: "json", data}, abort)
+
+  Bacon.$.ajaxPost = (url, data, dataType, abort) ->
+    $.ajax({url, dataType, data, type: "POST"}, abort)
+
+  $.ajaxGetScript = (url, abort) ->
+    $.ajax({url, dataType: "script"}, abort)
+
+  $.lazyAjax = (params) ->
+    Bacon.once(params).flatMap(Bacon.$.ajax)
+
+  Bacon.Observable::ajax = ->
+    @flatMapLatest $.ajax
\ No newline at end of file
diff --git a/src/bacon-ajax.js b/src/bacon-ajax.js
new file mode 100644
index 0000000..a51ed4e
--- /dev/null
+++ b/src/bacon-ajax.js
@@ -0,0 +1,45 @@
+// Generated by CoffeeScript 1.8.0
+(function() {
+  init(function($) {
+    $.ajax = function(params, abort) {
+      return Bacon.fromPromise($.Request.ajax(params), abort);
+    };
+    $.ajaxGet = function(url, data, dataType, abort) {
+      return $.ajax({
+        url: url,
+        dataType: dataType,
+        data: data
+      }, abort);
+    };
+    $.ajaxGetJSON = function(url, data, abort) {
+      return $.ajax({
+        url: url,
+        dataType: "json",
+        data: data
+      }, abort);
+    };
+    Bacon.$.ajaxPost = function(url, data, dataType, abort) {
+      return $.ajax({
+        url: url,
+        dataType: dataType,
+        data: data,
+        type: "POST"
+      }, abort);
+    };
+    $.ajaxGetScript = function(url, abort) {
+      return $.ajax({
+        url: url,
+        dataType: "script"
+      }, abort);
+    };
+    $.lazyAjax = function(params) {
+      return Bacon.once(params).flatMap(Bacon.$.ajax);
+    };
+    return Bacon.Observable.prototype.ajax = function() {
+      return this.flatMapLatest($.ajax);
+    };
+  });
+
+}).call(this);
+
+//# sourceMappingURL=bacon-ajax.js.map
diff --git a/src/bacon-dom-effects.coffee b/src/bacon-dom-effects.coffee
new file mode 100644
index 0000000..23538c8
--- /dev/null
+++ b/src/bacon-dom-effects.coffee
@@ -0,0 +1,17 @@
+module.exports = ($) ->
+
+  # Effects (jQuery compatible)
+  effectNames = [
+    "animate", "show", "hide", "toggle",
+    "fadeIn", "fadeOut", "fadeTo", "fadeToggle",
+    "slideDown", "slideUp", "slideToggle" ]
+
+  effects = {}
+
+  for e in effectNames
+    do (e) ->
+      effects[e + 'E'] = (args...) ->
+        Bacon.fromPromise @[e](args...).promise()
+
+  $.Extender.extend effects
+  $
\ No newline at end of file
diff --git a/src/bacon-dom-effects.js b/src/bacon-dom-effects.js
new file mode 100644
index 0000000..dcad3fd
--- /dev/null
+++ b/src/bacon-dom-effects.js
@@ -0,0 +1,26 @@
+// Generated by CoffeeScript 1.8.0
+(function() {
+  var __slice = [].slice;
+
+  module.exports = function($) {
+    var e, effectNames, effects, _fn, _i, _len;
+    effectNames = ["animate", "show", "hide", "toggle", "fadeIn", "fadeOut", "fadeTo", "fadeToggle", "slideDown", "slideUp", "slideToggle"];
+    effects = {};
+    _fn = function(e) {
+      return effects[e + 'E'] = function() {
+        var args;
+        args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
+        return Bacon.fromPromise(this[e].apply(this, args).promise());
+      };
+    };
+    for (_i = 0, _len = effectNames.length; _i < _len; _i++) {
+      e = effectNames[_i];
+      _fn(e);
+    }
+    $.Extender.extend(effects);
+    return $;
+  };
+
+}).call(this);
+
+//# sourceMappingURL=bacon-dom-effects.js.map
diff --git a/src/bacon-dom-events.coffee b/src/bacon-dom-events.coffee
new file mode 100644
index 0000000..16bc124
--- /dev/null
+++ b/src/bacon-dom-events.coffee
@@ -0,0 +1,21 @@
+module.exports = ($) ->
+  # DOM Events (jQuery compatible)
+  eventNames = [
+    "keydown", "keyup", "keypress",
+    "click", "dblclick", "mousedown", "mouseup",
+    "mouseenter", "mouseleave", "mousemove", "mouseout", "mouseover",
+    "dragstart", "drag", "dragenter", "dragleave", "dragover", "drop", "dragend",
+    "resize", "scroll", "select", "change",
+    "submit",
+    "blur", "focus", "focusin", "focusout",
+    "load", "unload" ]
+  events = {}
+
+  for e in eventNames
+    do (e) ->
+      events[e + 'E'] = (args...) ->
+        @asEventStream e, args...
+
+  $.Extender.extend events
+  $.Extender.asEventStream = Bacon.$.asEventStream
+  $
diff --git a/src/bacon-dom-events.js b/src/bacon-dom-events.js
new file mode 100644
index 0000000..fe360f7
--- /dev/null
+++ b/src/bacon-dom-events.js
@@ -0,0 +1,27 @@
+// Generated by CoffeeScript 1.8.0
+(function() {
+  var __slice = [].slice;
+
+  module.exports = function($) {
+    var e, eventNames, events, _fn, _i, _len;
+    eventNames = ["keydown", "keyup", "keypress", "click", "dblclick", "mousedown", "mouseup", "mouseenter", "mouseleave", "mousemove", "mouseout", "mouseover", "dragstart", "drag", "dragenter", "dragleave", "dragover", "drop", "dragend", "resize", "scroll", "select", "change", "submit", "blur", "focus", "focusin", "focusout", "load", "unload"];
+    events = {};
+    _fn = function(e) {
+      return events[e + 'E'] = function() {
+        var args;
+        args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
+        return this.asEventStream.apply(this, [e].concat(__slice.call(args)));
+      };
+    };
+    for (_i = 0, _len = eventNames.length; _i < _len; _i++) {
+      e = eventNames[_i];
+      _fn(e);
+    }
+    $.Extender.extend(events);
+    $.Extender.asEventStream = Bacon.$.asEventStream;
+    return $;
+  };
+
+}).call(this);
+
+//# sourceMappingURL=bacon-dom-events.js.map
diff --git a/src/bacon-dom-input.coffee b/src/bacon-dom-input.coffee
new file mode 100644
index 0000000..6c5fcf5
--- /dev/null
+++ b/src/bacon-dom-input.coffee
@@ -0,0 +1,105 @@
+module.exports = ($) ->
+  nonEmpty = (x) ->
+    x.length > 0
+
+  assertArrayOrJQC = (x) ->
+    unless typeof x is 'object' or x instanceof Array
+      throw new Error('Value must be either an object or an Array of objects which conform to a minimal element query interface')
+
+  asJQC = (x) ->
+    $.Selector.toJQC(x)
+
+  $.textField = {
+    interval: 50
+    take: 10
+  }
+
+  # Input element bindings
+  $.textField =
+    value: (element, options) ->
+      defaultOpt = $.textField
+
+      initValue = options.init
+      get = -> element.val() || ""
+      autofillPoller = ->
+        Bacon.interval(options.interval || defaultOpt.interval).take(options.take || defaultOpt.take).map(get).filter(nonEmpty).take 1
+      events = element.asEventStream("keyup input")
+      .merge(element.asEventStream("cut paste").delay(1))
+      .merge(autofillPoller())
+
+      Bacon.Binding {
+        initValue,
+        get,
+        events,
+        set: (value) -> element.val(value)
+      }
+
+  $.checkBox =
+    value: (element, options) ->
+     initValue = options.init
+     Bacon.Binding {
+       initValue,
+       get: -> element.prop("checked")||false,
+       events: element.asEventStream("change"),
+       set: (value) -> element.prop "checked", value
+     }
+
+    groupValue: (checkBoxes, options) ->
+      initValue = options.init
+      assertArrayOrJQC(checkBoxes)
+      checkBoxes = asJQC(checkBoxes)
+      Bacon.Binding {
+        initValue,
+        get: ->
+          checkBoxes.filter(":checked").map((i, elem) ->
+            $.Selector(elem).val()).toArray()
+        events: checkBoxes.asEventStream("change"),
+        set: (value) ->
+          checkBoxes.each (i, elem) ->
+            $.Selector(elem).prop "checked", $.indexOf(value, $.Selector(elem).val()) >= 0
+      }
+
+  $.select =
+    value: (element, options) ->
+      initValue = options.init
+      Bacon.Binding {
+        initValue,
+        get: -> element.val(),
+        events: element.asEventStream("change"),
+        set: (value) -> element.val value
+      }
+
+  $.radioGroup =
+      value: (radios, options) ->
+        initValue = options.init
+        assertArrayOrJQC(radios)
+        radios = asJQC(radios)
+        Bacon.Binding {
+          initValue,
+          get: -> radios.filter(":checked").first().val(),
+          events: radios.asEventStream("change"),
+          set: (value) ->
+            radios.each (i, elem) ->
+              $.Selector(elem).prop "checked", elem.value is value
+        }
+
+      intValue: (radios, options) ->
+        initValue = options.init
+        radioGroupValue = $.radioGroupValue(radios)
+        Bacon.Binding {
+          initValue,
+          get: ->
+            value = radioGroupValue.get()
+            if value?
+              parseInt(value)
+            else
+              value
+          events: radioGroupValue.syncEvents()
+          set: (value) ->
+            strValue = if value?
+              Number(value).toString()
+            else
+              value
+            radioGroupValue.set strValue
+        }
+
diff --git a/src/bacon-dom-input.js b/src/bacon-dom-input.js
new file mode 100644
index 0000000..2025a1c
--- /dev/null
+++ b/src/bacon-dom-input.js
@@ -0,0 +1,141 @@
+// Generated by CoffeeScript 1.8.0
+(function() {
+  module.exports = function($) {
+    var asJQC, assertArrayOrJQC, nonEmpty;
+    nonEmpty = function(x) {
+      return x.length > 0;
+    };
+    assertArrayOrJQC = function(x) {
+      if (!(typeof x === 'object' || x instanceof Array)) {
+        throw new Error('Value must be either an object or an Array of objects which conform to a minimal element query interface');
+      }
+    };
+    asJQC = function(x) {
+      return $.Selector.toJQC(x);
+    };
+    $.textField = {
+      interval: 50,
+      take: 10
+    };
+    $.textField = {
+      value: function(element, options) {
+        var autofillPoller, defaultOpt, events, get, initValue;
+        defaultOpt = $.textField;
+        initValue = options.init;
+        get = function() {
+          return element.val() || "";
+        };
+        autofillPoller = function() {
+          return Bacon.interval(options.interval || defaultOpt.interval).take(options.take || defaultOpt.take).map(get).filter(nonEmpty).take(1);
+        };
+        events = element.asEventStream("keyup input").merge(element.asEventStream("cut paste").delay(1)).merge(autofillPoller());
+        return Bacon.Binding({
+          initValue: initValue,
+          get: get,
+          events: events,
+          set: function(value) {
+            return element.val(value);
+          }
+        });
+      }
+    };
+    $.checkBox = {
+      value: function(element, options) {
+        var initValue;
+        initValue = options.init;
+        return Bacon.Binding({
+          initValue: initValue,
+          get: function() {
+            return element.prop("checked") || false;
+          },
+          events: element.asEventStream("change"),
+          set: function(value) {
+            return element.prop("checked", value);
+          }
+        });
+      },
+      groupValue: function(checkBoxes, options) {
+        var initValue;
+        initValue = options.init;
+        assertArrayOrJQC(checkBoxes);
+        checkBoxes = asJQC(checkBoxes);
+        return Bacon.Binding({
+          initValue: initValue,
+          get: function() {
+            return checkBoxes.filter(":checked").map(function(i, elem) {
+              return $.Selector(elem).val();
+            }).toArray();
+          },
+          events: checkBoxes.asEventStream("change"),
+          set: function(value) {
+            return checkBoxes.each(function(i, elem) {
+              return $.Selector(elem).prop("checked", $.indexOf(value, $.Selector(elem).val()) >= 0);
+            });
+          }
+        });
+      }
+    };
+    $.select = {
+      value: function(element, options) {
+        var initValue;
+        initValue = options.init;
+        return Bacon.Binding({
+          initValue: initValue,
+          get: function() {
+            return element.val();
+          },
+          events: element.asEventStream("change"),
+          set: function(value) {
+            return element.val(value);
+          }
+        });
+      }
+    };
+    return $.radioGroup = {
+      value: function(radios, options) {
+        var initValue;
+        initValue = options.init;
+        assertArrayOrJQC(radios);
+        radios = asJQC(radios);
+        return Bacon.Binding({
+          initValue: initValue,
+          get: function() {
+            return radios.filter(":checked").first().val();
+          },
+          events: radios.asEventStream("change"),
+          set: function(value) {
+            return radios.each(function(i, elem) {
+              return $.Selector(elem).prop("checked", elem.value === value);
+            });
+          }
+        });
+      },
+      intValue: function(radios, options) {
+        var initValue, radioGroupValue;
+        initValue = options.init;
+        radioGroupValue = $.radioGroupValue(radios);
+        return Bacon.Binding({
+          initValue: initValue,
+          get: function() {
+            var value;
+            value = radioGroupValue.get();
+            if (value != null) {
+              return parseInt(value);
+            } else {
+              return value;
+            }
+          },
+          events: radioGroupValue.syncEvents(),
+          set: function(value) {
+            var strValue;
+            strValue = value != null ? Number(value).toString() : value;
+            return radioGroupValue.set(strValue);
+          }
+        });
+      }
+    };
+  };
+
+}).call(this);
+
+//# sourceMappingURL=bacon-dom-input.js.map
diff --git a/src/bacon-dom.coffee b/src/bacon-dom.coffee
new file mode 100644
index 0000000..ca636aa
--- /dev/null
+++ b/src/bacon-dom.coffee
@@ -0,0 +1,37 @@
+init = (Bacon, BaconModel, JQC) ->
+  JQC = JQC || {}
+
+  altIndxOf = (xs, x) ->
+    for y, i in xs
+      return i if x == y
+    -1
+
+  indxOf = (xs, x) ->
+    xs.indexOf x
+
+  Bacon.$.indexOf = if Array::indexOf then indxOf else altIndxOf
+
+  Bacon.$.Model = Bacon.Model
+
+  Bacon.$.Selector = JQC
+  Bacon.$.Request = JQC
+  Bacon.$.Promise = JQC
+  Bacon.$.Extender = JQC.fn
+
+  Bacon.$.plugin = (names...) ->
+    for name in names
+      plugin = require "./bacon-#{name}"
+      plugin Bacon.$
+
+  # return the full API
+  Bacon.$
+
+if module?
+  Bacon = require "baconjs"
+  BaconModel = require "bacon.model"
+  module.exports = init Bacon, BaconModel, $
+else
+  if typeof define == "function" and define.amd
+    define ["bacon", "bacon.model", $], init
+  else
+    init(@Bacon, @BaconModel, @$)
diff --git a/src/bacon-dom.js b/src/bacon-dom.js
new file mode 100644
index 0000000..0b6a696
--- /dev/null
+++ b/src/bacon-dom.js
@@ -0,0 +1,56 @@
+// Generated by CoffeeScript 1.8.0
+(function() {
+  var Bacon, BaconModel, init,
+    __slice = [].slice;
+
+  init = function(Bacon, BaconModel, JQC) {
+    var altIndxOf, indxOf;
+    JQC = JQC || {};
+    altIndxOf = function(xs, x) {
+      var i, y, _i, _len;
+      for (i = _i = 0, _len = xs.length; _i < _len; i = ++_i) {
+        y = xs[i];
+        if (x === y) {
+          return i;
+        }
+      }
+      return -1;
+    };
+    indxOf = function(xs, x) {
+      return xs.indexOf(x);
+    };
+    Bacon.$.indexOf = Array.prototype.indexOf ? indxOf : altIndxOf;
+    Bacon.$.Model = Bacon.Model;
+    Bacon.$.Selector = JQC;
+    Bacon.$.Request = JQC;
+    Bacon.$.Promise = JQC;
+    Bacon.$.Extender = JQC.fn;
+    Bacon.$.plugin = function() {
+      var name, names, plugin, _i, _len, _results;
+      names = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
+      _results = [];
+      for (_i = 0, _len = names.length; _i < _len; _i++) {
+        name = names[_i];
+        plugin = require("./bacon-" + name);
+        _results.push(plugin(Bacon.$));
+      }
+      return _results;
+    };
+    return Bacon.$;
+  };
+
+  if (typeof module !== "undefined" && module !== null) {
+    Bacon = require("baconjs");
+    BaconModel = require("bacon.model");
+    module.exports = init(Bacon, BaconModel, $);
+  } else {
+    if (typeof define === "function" && define.amd) {
+      define(["bacon", "bacon.model", $], init);
+    } else {
+      init(this.Bacon, this.BaconModel, this.$);
+    }
+  }
+
+}).call(this);
+
+//# sourceMappingURL=bacon-dom.js.map
diff --git a/src/bacon-promise.coffee b/src/bacon-promise.coffee
new file mode 100644
index 0000000..2089660
--- /dev/null
+++ b/src/bacon-promise.coffee
@@ -0,0 +1,16 @@
+module.exports = ($) ->
+
+  # Deferred/Promise
+  Bacon.Observable::toDeferred = ->
+    value = undefined
+    dfd = $.Promise.deferred() || $.Deferred()
+    @take(1).endOnError().subscribe((evt) ->
+      if evt.hasValue()
+        value = evt.value()
+        dfd.notify(value)
+      else if evt.isError()
+        dfd.reject(evt.error)
+      else if evt.isEnd()
+        dfd.resolve(value)
+    )
+    dfd
\ No newline at end of file
diff --git a/src/bacon-promise.js b/src/bacon-promise.js
new file mode 100644
index 0000000..f79ab6f
--- /dev/null
+++ b/src/bacon-promise.js
@@ -0,0 +1,24 @@
+// Generated by CoffeeScript 1.8.0
+(function() {
+  module.exports = function($) {
+    return Bacon.Observable.prototype.toDeferred = function() {
+      var dfd, value;
+      value = void 0;
+      dfd = $.Promise.deferred() || $.Deferred();
+      this.take(1).endOnError().subscribe(function(evt) {
+        if (evt.hasValue()) {
+          value = evt.value();
+          return dfd.notify(value);
+        } else if (evt.isError()) {
+          return dfd.reject(evt.error);
+        } else if (evt.isEnd()) {
+          return dfd.resolve(value);
+        }
+      });
+      return dfd;
+    };
+  };
+
+}).call(this);
+
+//# sourceMappingURL=bacon-promise.js.map
diff --git a/src/bacon.jquery.coffee b/src/bacon.jquery.coffee
deleted file mode 100644
index c93442d..0000000
--- a/src/bacon.jquery.coffee
+++ /dev/null
@@ -1,168 +0,0 @@
-init = (Bacon, BaconModel, $) ->
-  nonEmpty = (x) -> x.length > 0
-  assertArrayOrJQueryObject = (x) ->
-    unless x instanceof jQuery or x instanceof Array
-      throw new Error('Value must be either a jQuery object or an Array of jQuery objects')
-  asJQueryObject = (x) ->
-    if x instanceof jQuery then x
-    else
-      obj = $()
-      obj = obj.add(element) for element in x when element instanceof jQuery
-      obj
-  _ = {
-  indexOf: if Array::indexOf
-    (xs, x) -> xs.indexOf(x)
-  else
-    (xs, x) ->
-      for y, i in xs
-        return i if x == y
-      -1
-  }
-
-  Bacon.$.Model = Bacon.Model
-
-  # Input element bindings
-  Bacon.$.textFieldValue = (element, initValue) ->
-    get = -> element.val() || ""
-    autofillPoller = ->
-      Bacon.interval(50).take(10).map(get).filter(nonEmpty).take 1
-    events = element.asEventStream("keyup input")
-      .merge(element.asEventStream("cut paste").delay(1))
-      .merge(autofillPoller())
-
-    Bacon.Binding {
-      initValue,
-      get,
-      events,
-      set: (value) -> element.val(value)
-    }
-  Bacon.$.checkBoxValue = (element, initValue) ->
-    Bacon.Binding {
-      initValue,
-      get: -> element.prop("checked")||false,
-      events: element.asEventStream("change"),
-      set: (value) -> element.prop "checked", value
-    }
-
-  Bacon.$.selectValue = (element, initValue) ->
-    Bacon.Binding {
-      initValue,
-      get: -> element.val(),
-      events: element.asEventStream("change"),
-      set: (value) -> element.val value
-    }
-
-  Bacon.$.radioGroupValue = (radios, initValue) ->
-    assertArrayOrJQueryObject(radios)
-    radios = asJQueryObject(radios)
-    Bacon.Binding {
-      initValue,
-      get: -> radios.filter(":checked").first().val(),
-      events: radios.asEventStream("change"),
-      set: (value) ->
-        radios.each (i, elem) ->
-          $(elem).prop "checked", elem.value is value
-    }
-
-  Bacon.$.intRadioGroupValue = (radios, initValue) ->
-    radioGroupValue = Bacon.$.radioGroupValue(radios)
-    Bacon.Binding {
-      initValue,
-      get: ->
-        value = radioGroupValue.get()
-        if value?
-          parseInt(value)
-        else
-          value
-      events: radioGroupValue.syncEvents()
-      set: (value) ->
-        strValue = if value?
-            Number(value).toString()
-          else
-            value
-        radioGroupValue.set strValue
-    }
-
-  Bacon.$.checkBoxGroupValue = (checkBoxes, initValue) ->
-    assertArrayOrJQueryObject(checkBoxes)
-    checkBoxes = asJQueryObject(checkBoxes)
-    Bacon.Binding {
-      initValue,
-      get: ->
-        checkBoxes.filter(":checked").map((i, elem) -> $(elem).val()).toArray()
-      events: checkBoxes.asEventStream("change"),
-      set: (value) ->
-        checkBoxes.each (i, elem) ->
-          $(elem).prop "checked", _.indexOf(value, $(elem).val()) >= 0
-    }
-
-  # AJAX
-  Bacon.$.ajax = (params, abort) -> Bacon.fromPromise $.ajax(params), abort
-  Bacon.$.ajaxGet = (url, data, dataType, abort) -> Bacon.$.ajax({url, dataType, data}, abort)
-  Bacon.$.ajaxGetJSON = (url, data, abort) -> Bacon.$.ajax({url, dataType: "json", data}, abort)
-  Bacon.$.ajaxPost = (url, data, dataType, abort) -> Bacon.$.ajax({url, dataType, data, type: "POST"}, abort)
-  Bacon.$.ajaxGetScript = (url, abort) -> Bacon.$.ajax({url, dataType: "script"}, abort)
-  Bacon.$.lazyAjax = (params) -> Bacon.once(params).flatMap(Bacon.$.ajax)
-  Bacon.Observable::ajax = -> @flatMapLatest Bacon.$.ajax
-
-  # jQuery Deferred
-  Bacon.Observable::toDeferred = ->
-    value = undefined
-    dfd = $.Deferred()
-    @take(1).endOnError().subscribe((evt) ->
-        if evt.hasValue()
-          value = evt.value()
-          dfd.notify(value)
-        else if evt.isError()
-          dfd.reject(evt.error)
-        else if evt.isEnd()
-          dfd.resolve(value)
-        )
-    dfd
-
-  # jQuery DOM Events
-
-  eventNames = [
-    "keydown", "keyup", "keypress",
-    "click", "dblclick", "mousedown", "mouseup",
-    "mouseenter", "mouseleave", "mousemove", "mouseout", "mouseover",
-    "dragstart", "drag", "dragenter", "dragleave", "dragover", "drop", "dragend",
-    "resize", "scroll", "select", "change",
-    "submit",
-    "blur", "focus", "focusin", "focusout",
-    "load", "unload" ]
-  events = {}
-
-  for e in eventNames 
-    do (e) ->
-      events[e + 'E'] = (args...) -> @asEventStream e, args...
-
-  # jQuery Effects
-
-  effectNames = [
-    "animate", "show", "hide", "toggle",
-    "fadeIn", "fadeOut", "fadeTo", "fadeToggle",
-    "slideDown", "slideUp", "slideToggle" ]
-  effects = {}
-
-  for e in effectNames 
-    do (e) ->
-      effects[e + 'E'] = (args...) -> Bacon.fromPromise @[e](args...).promise()
-
-  if $?.fn
-    $.fn.extend events
-    $.fn.extend effects
-    $.fn.asEventStream = Bacon.$.asEventStream 
-
-  Bacon.$
-
-if module?
-  Bacon = require("baconjs")
-  BaconModel = require("bacon.model")
-  $ = require("jquery")
-  module.exports = init(Bacon, BaconModel, $)
-else
-  if typeof define == "function" and define.amd
-    define ["bacon", "bacon.model", "jquery"], init
-  else
-    init(this.Bacon, this.BaconModel, this.$)
diff --git a/test/bacon.jquery.spec.coffee b/test/bacon-dom.spec.coffee
similarity index 89%
rename from test/bacon.jquery.spec.coffee
rename to test/bacon-dom.spec.coffee
index a44738f..d3993f8 100644
--- a/test/bacon.jquery.spec.coffee
+++ b/test/bacon-dom.spec.coffee
@@ -1,6 +1,6 @@
 expect = require("chai").expect
 
-bjq = require "../src/bacon.jquery"
+bjq = require "../src/bacon-dom"
 
 twice = (x) -> x * 2
 Bacon = require "baconjs"
diff --git a/test/bacon-dom.spec.js b/test/bacon-dom.spec.js
new file mode 100644
index 0000000..c3cd791
--- /dev/null
+++ b/test/bacon-dom.spec.js
@@ -0,0 +1,30 @@
+// Generated by CoffeeScript 1.8.0
+(function() {
+  var Bacon, ModelBacon, bjq, expect, model, twice;
+
+  expect = require("chai").expect;
+
+  bjq = require("../src/bacon-dom");
+
+  twice = function(x) {
+    return x * 2;
+  };
+
+  Bacon = require("baconjs");
+
+  ModelBacon = require("bacon.model");
+
+  model = Bacon.Model;
+
+  describe("Node.js specific", function() {
+    it("exports original Bacon.$", function() {
+      return expect(bjq).to.equal(Bacon.$);
+    });
+    return it("shares the same bacon with model", function() {
+      return expect(bjq).to.equal(ModelBacon.$);
+    });
+  });
+
+}).call(this);
+
+//# sourceMappingURL=bacon-dom.spec.js.map