diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fd4f2b0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+.DS_Store
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..fed4c96
--- /dev/null
+++ b/README.md
@@ -0,0 +1,32 @@
+# PeerConnection
+
+## Warning
+
+This is fresh and untested!
+
+
+## What is this?
+
+A tiny browser module that gives normalizes and simplifies the API for WebRTC peer connections.
+
+It gives us a cleaner (cross-browser) way to handle offer/answer and is based on an Event Emitter.
+
+If you're not using browserify or you want AMD support use `rtcpeerconnection.bundle.js`.
+
+
+## Installing
+
+```
+npm install rtcpeerconnection
+```
+
+## How to use it
+
+## License
+
+MIT
+
+## Created By
+
+If you like this, follow: [@HenrikJoreteg](http://twitter.com/henrikjoreteg) on twitter.
+
diff --git a/build.js b/build.js
new file mode 100644
index 0000000..8293b51
--- /dev/null
+++ b/build.js
@@ -0,0 +1,6 @@
+var bundle = require('browserify')(),
+    fs = require('fs');
+
+
+bundle.add('./rtcpeerconnection');
+bundle.bundle({standalone: 'PeerConnection'}).pipe(fs.createWriteStream('rtcpeerconnection.bundle.js'));
diff --git a/index.html b/index.html
new file mode 100644
index 0000000..6b2a1bd
--- /dev/null
+++ b/index.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Test</title>
+        <script src="rtcpeerconnection.bundle.js"></script>
+    </head>
+</html>
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..ca7b36d
--- /dev/null
+++ b/package.json
@@ -0,0 +1,23 @@
+{
+  "name": "rtcpeerconnection",
+  "version": "0.0.0",
+  "description": "A tiny browser module that gives normalizes and simplifies the API for WebRTC peer connections.",
+  "main": "rtcpeerconnection.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/HenrikJoreteg/RTCPeerConnection"
+  },
+  "keywords": [
+    "browser",
+    "RTCPeerConnection",
+    "WebRTC"
+  ],
+  "author": "Henrik Joreteg <henrik@andyet.net>",
+  "license": "MIT",
+  "dependencies": {
+    "wildemitter": "0.0.5"
+  },
+  "devDependencies": {
+    "browserify": "2.x"
+  }
+}
diff --git a/rtcpeerconnection.bundle.js b/rtcpeerconnection.bundle.js
new file mode 100644
index 0000000..66b8d9f
--- /dev/null
+++ b/rtcpeerconnection.bundle.js
@@ -0,0 +1,257 @@
+(function(e){if("function"==typeof bootstrap)bootstrap("peerconnection",e);else if("object"==typeof exports)module.exports=e();else if("function"==typeof define&&define.amd)define(e);else if("undefined"!=typeof ses){if(!ses.ok())return;ses.makePeerConnection=e}else"undefined"!=typeof window?window.PeerConnection=e():global.PeerConnection=e()})(function(){var define,ses,bootstrap,module,exports;
+return (function(e,t,n){function i(n,s){if(!t[n]){if(!e[n]){var o=typeof require=="function"&&require;if(!s&&o)return o(n,!0);if(r)return r(n,!0);throw new Error("Cannot find module '"+n+"'")}var u=t[n]={exports:{}};e[n][0].call(u.exports,function(t){var r=e[n][1][t];return i(r?r:t)},u,u.exports)}return t[n].exports}var r=typeof require=="function"&&require;for(var s=0;s<n.length;s++)i(n[s]);return i})({1:[function(require,module,exports){
+var WildEmitter = require('wildemitter');
+
+// The RTCPeerConnection object.
+var RTCPeerConnection = window.RTCPeerConnection || window.mozRTCPeerConnection || window.webkitRTCPeerConnection;
+
+// The RTCSessionDescription object.
+var RTCSessionDescription = window.RTCSessionDescription || window.mozRTCSessionDescription;
+
+// The RTCIceCandidate object.
+var RTCIceCandidate = window.RTCIceCandidate || window.mozRTCIceCandidate;
+
+
+function PeerConnection(config, constraints) {
+    this.pc = new RTCPeerConnection(config, constraints);
+    WildEmitter.call(this);
+    this.pc.onicemessage = this._onIce.bind(this);
+    this.pc.onaddstream = this._onAddStream.bind(this);
+    this.pc.onremovestream = this._onRemoveStream.bind(this);
+}
+
+PeerConnection.prototype = Object.create(WildEmitter.prototype, {
+    constructor: {
+        value: PeerConnection
+    }
+});
+
+PeerConnection.prototype.addStream = function (stream) {
+    this.localStream = stream;
+    this.pc.addStream(stream);
+};
+
+PeerConnection.prototype._onIce = function (event) {
+    this.emit('ice', event.candidate);
+};
+
+PeerConnection.prototype._onAddStream = function () {
+
+};
+
+PeerConnection.prototype._onRemoveStream = function () {
+
+};
+
+PeerConnection.prototype.processIce = function (candidate) {
+    this.pc.addIceCandidate(new RTCIceCandidate(candidate));
+};
+
+PeerConnection.prototype.offer = function (constraints, cb) {
+    var self = this;
+    var mediaConstraints = constraints || {
+            mandatory: {
+                OfferToReceiveAudio: true,
+                OfferToReceiveVideo: true
+            }
+        };
+
+    this.pc.createOffer(function (sessionDescription) {
+        self.pc.setLocalDescription(sessionDescription);
+        self.emit('offer', sessionDescription);
+        cb && cb(sessionDescription)
+    }, null, mediaConstraints);
+};
+
+PeerConnection.prototype.answerAudioOnly = function (offer, cb) {
+    var mediaConstraints = {
+            mandatory: {
+                OfferToReceiveAudio: true,
+                OfferToReceiveVideo: false
+            }
+        };
+
+    this._answer(offer, mediaConstraints, cb);
+};
+
+PeerConnection.prototype.answerVideoOnly = function (offer, cb) {
+    var mediaConstraints = {
+            mandatory: {
+                OfferToReceiveAudio: false,
+                OfferToReceiveVideo: true
+            }
+        };
+
+    this._answer(offer, mediaConstraints, cb);
+};
+
+PeerConnection.prototype._answer = function (offer, constraints, cb) {
+    this.setRemoteDescription(new RTCSessionDescription(offer));
+    this.createAnswer(function (sessionDescription) {
+        self.pc.setLocalDescription(sessionDescription);
+        self.emit('answer', sessionDescription);
+        cb && cb(sessionDescription);
+    }, null, constraints);
+};
+
+PeerConnection.prototype.answer = function (offer, constraints, cb) {
+    var self = this;
+    var threeArgs = arguments.length === 3;
+    var callback = threeArgs ? cb : constraints;
+    var mediaConstraints = threeArgs ? constraints : {
+            mandatory: {
+                OfferToReceiveAudio: true,
+                OfferToReceiveVideo: true
+            }
+        };
+
+    this._answer(offer, mediaConstraints, cb);
+};
+
+PeerConnection.prototype.close = function () {
+    this.pc.close();
+    this.emit('close');
+};
+
+module.exports = PeerConnection;
+
+},{"wildemitter":2}],2:[function(require,module,exports){
+/*
+WildEmitter.js is a slim little event emitter by @henrikjoreteg largely based 
+on @visionmedia's Emitter from UI Kit.
+
+Why? I wanted it standalone.
+
+I also wanted support for wildcard emitters like this:
+
+emitter.on('*', function (eventName, other, event, payloads) {
+    
+});
+
+emitter.on('somenamespace*', function (eventName, payloads) {
+    
+});
+
+Please note that callbacks triggered by wildcard registered events also get 
+the event name as the first argument.
+*/
+module.exports = WildEmitter;
+
+function WildEmitter() {
+    this.callbacks = {};
+}
+
+// Listen on the given `event` with `fn`. Store a group name if present.
+WildEmitter.prototype.on = function (event, groupName, fn) {
+    var hasGroup = (arguments.length === 3),
+        group = hasGroup ? arguments[1] : undefined, 
+        func = hasGroup ? arguments[2] : arguments[1];
+    func._groupName = group;
+    (this.callbacks[event] = this.callbacks[event] || []).push(func);
+    return this;
+};
+
+// Adds an `event` listener that will be invoked a single
+// time then automatically removed.
+WildEmitter.prototype.once = function (event, groupName, fn) {
+    var self = this,
+        hasGroup = (arguments.length === 3),
+        group = hasGroup ? arguments[1] : undefined, 
+        func = hasGroup ? arguments[2] : arguments[1];
+    function on() {
+        self.off(event, on);
+        func.apply(this, arguments);
+    }
+    this.on(event, group, on);
+    return this;
+};
+
+// Unbinds an entire group
+WildEmitter.prototype.releaseGroup = function (groupName) {
+    var item, i, len, handlers;
+    for (item in this.callbacks) {
+        handlers = this.callbacks[item];
+        for (i = 0, len = handlers.length; i < len; i++) {
+            if (handlers[i]._groupName === groupName) {
+                //console.log('removing');
+                // remove it and shorten the array we're looping through
+                handlers.splice(i, 1);
+                i--;
+                len--;
+            }
+        }
+    }
+    return this;
+};
+
+// Remove the given callback for `event` or all
+// registered callbacks.
+WildEmitter.prototype.off = function (event, fn) {
+    var callbacks = this.callbacks[event],
+        i;
+    
+    if (!callbacks) return this;
+
+    // remove all handlers
+    if (arguments.length === 1) {
+        delete this.callbacks[event];
+        return this;
+    }
+
+    // remove specific handler
+    i = callbacks.indexOf(fn);
+    callbacks.splice(i, 1);
+    return this;
+};
+
+// Emit `event` with the given args.
+// also calls any `*` handlers
+WildEmitter.prototype.emit = function (event) {
+    var args = [].slice.call(arguments, 1),
+        callbacks = this.callbacks[event],
+        specialCallbacks = this.getWildcardCallbacks(event),
+        i,
+        len,
+        item;
+
+    if (callbacks) {
+        for (i = 0, len = callbacks.length; i < len; ++i) {
+            if (callbacks[i]) {
+                callbacks[i].apply(this, args);
+            } else {
+                break;
+            }
+        }
+    }
+
+    if (specialCallbacks) {
+        for (i = 0, len = specialCallbacks.length; i < len; ++i) {
+            if (specialCallbacks[i]) {
+                specialCallbacks[i].apply(this, [event].concat(args));
+            } else {
+                break;
+            }
+        }
+    }
+
+    return this;
+};
+
+// Helper for for finding special wildcard event handlers that match the event
+WildEmitter.prototype.getWildcardCallbacks = function (eventName) {
+    var item,
+        split,
+        result = [];
+
+    for (item in this.callbacks) {
+        split = item.split('*');
+        if (item === '*' || (split.length === 2 && eventName.slice(0, split[1].length) === split[1])) {
+            result = result.concat(this.callbacks[item]);
+        }
+    }
+    return result;
+};
+
+},{}]},{},[1])(1)
+});
+;
\ No newline at end of file
diff --git a/rtcpeerconnection.js b/rtcpeerconnection.js
new file mode 100644
index 0000000..448f32f
--- /dev/null
+++ b/rtcpeerconnection.js
@@ -0,0 +1,114 @@
+var WildEmitter = require('wildemitter');
+
+// The RTCPeerConnection object.
+var RTCPeerConnection = window.RTCPeerConnection || window.mozRTCPeerConnection || window.webkitRTCPeerConnection;
+
+// The RTCSessionDescription object.
+var RTCSessionDescription = window.RTCSessionDescription || window.mozRTCSessionDescription;
+
+// The RTCIceCandidate object.
+var RTCIceCandidate = window.RTCIceCandidate || window.mozRTCIceCandidate;
+
+
+function PeerConnection(config, constraints) {
+    this.pc = new RTCPeerConnection(config, constraints);
+    WildEmitter.call(this);
+    this.pc.onicemessage = this._onIce.bind(this);
+    this.pc.onaddstream = this._onAddStream.bind(this);
+    this.pc.onremovestream = this._onRemoveStream.bind(this);
+}
+
+PeerConnection.prototype = Object.create(WildEmitter.prototype, {
+    constructor: {
+        value: PeerConnection
+    }
+});
+
+PeerConnection.prototype.addStream = function (stream) {
+    this.localStream = stream;
+    this.pc.addStream(stream);
+};
+
+PeerConnection.prototype._onIce = function (event) {
+    this.emit('ice', event.candidate);
+};
+
+PeerConnection.prototype._onAddStream = function () {
+
+};
+
+PeerConnection.prototype._onRemoveStream = function () {
+
+};
+
+PeerConnection.prototype.processIce = function (candidate) {
+    this.pc.addIceCandidate(new RTCIceCandidate(candidate));
+};
+
+PeerConnection.prototype.offer = function (constraints, cb) {
+    var self = this;
+    var mediaConstraints = constraints || {
+            mandatory: {
+                OfferToReceiveAudio: true,
+                OfferToReceiveVideo: true
+            }
+        };
+
+    this.pc.createOffer(function (sessionDescription) {
+        self.pc.setLocalDescription(sessionDescription);
+        self.emit('offer', sessionDescription);
+        cb && cb(sessionDescription)
+    }, null, mediaConstraints);
+};
+
+PeerConnection.prototype.answerAudioOnly = function (offer, cb) {
+    var mediaConstraints = {
+            mandatory: {
+                OfferToReceiveAudio: true,
+                OfferToReceiveVideo: false
+            }
+        };
+
+    this._answer(offer, mediaConstraints, cb);
+};
+
+PeerConnection.prototype.answerVideoOnly = function (offer, cb) {
+    var mediaConstraints = {
+            mandatory: {
+                OfferToReceiveAudio: false,
+                OfferToReceiveVideo: true
+            }
+        };
+
+    this._answer(offer, mediaConstraints, cb);
+};
+
+PeerConnection.prototype._answer = function (offer, constraints, cb) {
+    this.setRemoteDescription(new RTCSessionDescription(offer));
+    this.createAnswer(function (sessionDescription) {
+        self.pc.setLocalDescription(sessionDescription);
+        self.emit('answer', sessionDescription);
+        cb && cb(sessionDescription);
+    }, null, constraints);
+};
+
+PeerConnection.prototype.answer = function (offer, constraints, cb) {
+    var self = this;
+    var threeArgs = arguments.length === 3;
+    var callback = threeArgs ? cb : constraints;
+    var mediaConstraints = threeArgs ? constraints : {
+            mandatory: {
+                OfferToReceiveAudio: true,
+                OfferToReceiveVideo: true
+            }
+        };
+
+    this._answer(offer, mediaConstraints, cb);
+};
+
+PeerConnection.prototype.close = function () {
+    this.pc.close();
+    this.emit('close');
+};
+
+module.exports = PeerConnection;
