diff --git a/js/embark_node.js b/js/embark_node.js
new file mode 100644
index 000000000..d7b4a92f2
--- /dev/null
+++ b/js/embark_node.js
@@ -0,0 +1,395 @@
+var EmbarkJS = {
+  onReady: function(cb) {
+    if (typeof (__embarkContext) === 'undefined') {
+      return cb();
+    }
+    return __embarkContext.execWhenReady(cb);
+  }
+};
+
+EmbarkJS.isNewWeb3 = function(web3Obj) {
+  var _web3 = web3Obj || (new Web3());
+  if (typeof(_web3.version) === "string") {
+    return true;
+  }
+  return parseInt(_web3.version.api.split('.')[0], 10) >= 1;
+};
+
+EmbarkJS.Contract = function(options) {
+    var self = this;
+    var i, abiElement;
+    var ContractClass;
+
+    this.abi = options.abi;
+    this.address = options.address;
+    this.gas = options.gas;
+    this.code = '0x' + options.code;
+    //this.web3 = options.web3 || web3;
+    this.web3 = options.web3;
+    if (!this.web3 && typeof (web3) !== 'undefined') {
+      this.web3 = web3;
+    } else if (!this.web3) {
+      this.web3 = window.web3;
+    }
+
+    if (EmbarkJS.isNewWeb3(this.web3)) {
+      ContractClass = new this.web3.eth.Contract(this.abi, this.address);
+      ContractClass.options.data = this.code;
+      ContractClass.options.from = this.from || this.web3.eth.defaultAccount;
+      ContractClass.abi = ContractClass.options.abi;
+      ContractClass.address = this.address;
+      ContractClass.gas = this.gas;
+
+      let originalMethods = Object.keys(ContractClass);
+
+      ContractClass._jsonInterface.forEach((abi) => {
+        if (originalMethods.indexOf(abi.name) >= 0) {
+          console.log(abi.name + " is a reserved word and cannot be used as a contract method, property or event");
+          return;
+        }
+
+        if (!abi.inputs) {
+          return;
+        }
+
+        let numExpectedInputs = abi.inputs.length;
+
+        if (abi.type === 'function' && abi.constant) {
+          ContractClass[abi.name] = function() {
+            let options = {}, cb = null, args = Array.from(arguments || []).slice(0, numExpectedInputs);
+            if (typeof (arguments[numExpectedInputs]) === 'function') {
+              cb = arguments[numExpectedInputs];
+            } else if (typeof (arguments[numExpectedInputs]) === 'object') {
+              options = arguments[numExpectedInputs];
+              cb = arguments[numExpectedInputs + 1];
+            }
+
+            let ref = ContractClass.methods[abi.name];
+            let call = ref.apply(ref, ...arguments).call;
+            return call.apply(call, []);
+          };
+        } else if (abi.type === 'function') {
+          ContractClass[abi.name] = function() {
+            let options = {}, cb = null, args = Array.from(arguments || []).slice(0, numExpectedInputs);
+            if (typeof (arguments[numExpectedInputs]) === 'function') {
+              cb = arguments[numExpectedInputs];
+            } else if (typeof (arguments[numExpectedInputs]) === 'object') {
+              options = arguments[numExpectedInputs];
+              cb = arguments[numExpectedInputs + 1];
+            }
+
+            let ref = ContractClass.methods[abi.name];
+            let send = ref.apply(ref, args).send;
+            return send.apply(send, [options, cb]);
+          };
+        } else if (abi.type === 'event') {
+          ContractClass[abi.name] = function(options, cb) {
+            let ref = ContractClass.events[abi.name];
+            return ref.apply(ref, [options, cb]);
+          }
+        }
+      });
+
+      return ContractClass;
+    } else {
+      ContractClass = this.web3.eth.contract(this.abi);
+
+      this.eventList = [];
+
+      if (this.abi) {
+        for (i = 0; i < this.abi.length; i++) {
+          abiElement = this.abi[i];
+          if (abiElement.type === 'event') {
+            this.eventList.push(abiElement.name);
+          }
+        }
+      }
+
+      var messageEvents = function() {
+        this.cb = function() {};
+      };
+
+      messageEvents.prototype.then = function(cb) {
+        this.cb = cb;
+      };
+
+      messageEvents.prototype.error = function(err) {
+        return err;
+      };
+
+      this._originalContractObject = ContractClass.at(this.address);
+      this._methods = Object.getOwnPropertyNames(this._originalContractObject).filter(function(p) {
+        // TODO: check for forbidden properties
+        if (self.eventList.indexOf(p) >= 0) {
+
+          self[p] = function() {
+            var promise = new messageEvents();
+            var args = Array.prototype.slice.call(arguments);
+            args.push(function(err, result) {
+              if (err) {
+                promise.error(err);
+              } else {
+                promise.cb(result);
+              }
+            });
+
+            self._originalContractObject[p].apply(self._originalContractObject[p], args);
+            return promise;
+          };
+          return true;
+        } else if (typeof self._originalContractObject[p] === 'function') {
+          self[p] = function(_args) {
+            var args = Array.prototype.slice.call(arguments);
+            var fn = self._originalContractObject[p];
+            var props = self.abi.find((x) => x.name == p);
+
+            var promise = new Promise(function(resolve, reject) {
+              args.push(function(err, transaction) {
+                promise.tx = transaction;
+                if (err) {
+                  return reject(err);
+                }
+
+                var getConfirmation = function() {
+                  self.web3.eth.getTransactionReceipt(transaction, function(err, receipt) {
+                    if (err) {
+                      return reject(err);
+                    }
+
+                    if (receipt !== null) {
+                      return resolve(receipt);
+                    }
+
+                    setTimeout(getConfirmation, 1000);
+                  });
+                };
+
+                if (typeof(transaction) !== "string" || props.constant) {
+                  resolve(transaction);
+                } else {
+                  getConfirmation();
+                }
+              });
+
+              fn.apply(fn, args);
+            });
+
+            return promise;
+          };
+          return true;
+        }
+        return false;
+      });
+    }
+};
+
+EmbarkJS.Contract.prototype.deploy = function(args, _options) {
+    var self = this;
+    var contractParams;
+    var options = _options || {};
+
+    contractParams = args || [];
+
+    contractParams.push({
+        from: this.web3.eth.accounts[0],
+        data: this.code,
+        gas: options.gas || 800000
+    });
+
+    var contractObject = this.web3.eth.contract(this.abi);
+
+    var promise = new Promise(function(resolve, reject) {
+        contractParams.push(function(err, transaction) {
+            if (err) {
+                reject(err);
+            } else if (transaction.address !== undefined) {
+                resolve(new EmbarkJS.Contract({
+                    abi: self.abi,
+                    code: self.code,
+                    address: transaction.address
+                }));
+            }
+        });
+
+        // returns promise
+        // deploys contract
+        // wraps it around EmbarkJS.Contract
+        contractObject["new"].apply(contractObject, contractParams);
+    });
+
+
+    return promise;
+};
+
+EmbarkJS.Contract.prototype.new = EmbarkJS.Contract.prototype.deploy;
+
+EmbarkJS.Contract.prototype.at = function(address) {
+  return new EmbarkJS.Contract({ abi: this.abi, code: this.code, address: address });
+};
+
+EmbarkJS.Contract.prototype.send = function(value, unit, _options) {
+  var options, wei;
+  if (typeof unit === 'object') {
+    options = unit;
+    wei = value;
+  } else {
+    options = _options || {};
+    wei = this.web3.toWei(value, unit);
+  }
+
+  options.to = this.address;
+  options.value = wei;
+
+  this.web3.eth.sendTransaction(options);
+};
+
+EmbarkJS.Storage = {};
+
+EmbarkJS.Storage.Providers = {};
+
+EmbarkJS.Storage.saveText = function(text) {
+  if (!this.currentStorage) {
+    throw new Error('Storage provider not set; e.g EmbarkJS.Storage.setProvider("ipfs")');
+  }
+  return this.currentStorage.saveText(text);
+};
+
+EmbarkJS.Storage.get = function(hash) {
+  if (!this.currentStorage) {
+    throw new Error('Storage provider not set; e.g EmbarkJS.Storage.setProvider("ipfs")');
+  }
+  return this.currentStorage.get(hash);
+};
+
+EmbarkJS.Storage.uploadFile = function(inputSelector) {
+  if (!this.currentStorage) {
+    throw new Error('Storage provider not set; e.g EmbarkJS.Storage.setProvider("ipfs")');
+  }
+  return this.currentStorage.uploadFile(inputSelector);
+};
+
+EmbarkJS.Storage.getUrl = function(hash) {
+  if (!this.currentStorage) {
+    throw new Error('Storage provider not set; e.g EmbarkJS.Storage.setProvider("ipfs")');
+  }
+  return this.currentStorage.getUrl(hash);
+};
+
+EmbarkJS.Storage.registerProvider = function(providerName, obj) {
+  EmbarkJS.Storage.Providers[providerName] = obj;
+};
+
+EmbarkJS.Storage.setProvider = function(provider, options) {
+  let providerObj = this.Providers[provider];
+
+  if (!providerObj) {
+    throw new Error('Unknown storage provider');
+  } 
+
+  this.currentStorage = providerObj;
+
+  return providerObj.setProvider(options);
+};
+
+EmbarkJS.Storage.isAvailable = function(){
+  if (!this.currentStorage) {
+    throw new Error('Storage provider not set; e.g EmbarkJS.Storage.setProvider("ipfs")');
+  }
+  return this.currentStorage.isAvailable();
+};
+
+EmbarkJS.Messages = {};
+
+EmbarkJS.Messages.Providers = {};
+
+EmbarkJS.Messages.registerProvider = function(providerName, obj) {
+  EmbarkJS.Messages.Providers[providerName] = obj;
+};
+
+EmbarkJS.Messages.setProvider = function(provider, options) {
+  let providerObj = this.Providers[provider];
+
+  if (!providerObj) {
+    throw new Error('Unknown messages provider');
+  }
+
+  this.currentMessages = providerObj;
+
+  return providerObj.setProvider(options);
+};
+
+EmbarkJS.Messages.isAvailable = function(){
+  return this.currentMessages.isAvailable();
+};
+
+EmbarkJS.Messages.sendMessage = function(options) {
+  if (!this.currentMessages) {
+    throw new Error('Messages provider not set; e.g EmbarkJS.Messages.setProvider("whisper")');
+  }
+  return this.currentMessages.sendMessage(options);
+};
+
+EmbarkJS.Messages.listenTo = function(options, callback) {
+  if (!this.currentMessages) {
+    throw new Error('Messages provider not set; e.g EmbarkJS.Messages.setProvider("whisper")');
+  }
+  return this.currentMessages.listenTo(options, callback);
+};
+
+EmbarkJS.Names = {};
+
+EmbarkJS.Names.Providers = {};
+
+EmbarkJS.Names.registerProvider = function(providerName, obj) {
+  EmbarkJS.Names.Providers[providerName] = obj;
+}
+
+EmbarkJS.Names.setProvider = function(provider, options) {
+  let providerObj = this.Providers[provider];
+
+  if (!providerObj) {
+    throw new Error('Unknown name system provider');
+  }
+
+  this.currentNameSystems = providerObj;
+
+  return providerObj.setProvider(options);
+};
+
+// resolve resolves a name into an identifier of some kind
+EmbarkJS.Names.resolve = function(name) {
+  if (!this.currentNameSystems) {
+    throw new Error('Name system provider not set; e.g EmbarkJS.Names.setProvider("ens")');
+  }
+  return this.currentNameSystems.resolve(name);
+}
+
+// the reverse of resolve, resolves using an identifier to get to a name
+EmbarkJS.Names.lookup = function(identifier) {
+  if (!this.currentNameSystems) {
+    throw new Error('Name system provider not set; e.g EmbarkJS.Names.setProvider("ens")');
+  }
+  return this.currentNameSystems.lookup(identifier);
+}
+
+// To Implement
+
+/*
+// register a name 
+EmbarkJS.Names.register = function(name, options) {
+  
+}
+*/
+
+EmbarkJS.Utils = {
+  fromAscii: function(str) {
+    var _web3 = new Web3();
+    return _web3.utils ? _web3.utils.fromAscii(str) : _web3.fromAscii(str);
+  },
+  toAscii: function(str) {
+    var _web3 = new Web3();
+    return _web3.utils.toAscii(str);
+  }
+};
+
+module.exports = EmbarkJS;
diff --git a/lib/contracts/provider.js b/lib/contracts/provider.js
index a485b09ab..ad4345ed3 100644
--- a/lib/contracts/provider.js
+++ b/lib/contracts/provider.js
@@ -1,18 +1,7 @@
-const ProviderEngine = require('embark-web3-provider-engine');
-const RpcSubprovider = require('embark-web3-provider-engine/subproviders/rpc');
-const WsSubprovider = require('embark-web3-provider-engine/subproviders/websocket');
-const CacheSubprovider = require('embark-web3-provider-engine/subproviders/cache.js');
-const FixtureSubprovider = require('embark-web3-provider-engine/subproviders/fixture.js');
-const FilterSubprovider = require('embark-web3-provider-engine/subproviders/filters.js');
-const VmSubprovider = require('embark-web3-provider-engine/subproviders/vm.js');
-const NonceSubprovider = require('embark-web3-provider-engine/subproviders/nonce-tracker.js');
-const SubscriptionSubprovider = require('embark-web3-provider-engine/subproviders/subscriptions');
 const async = require('async');
 const AccountParser = require('./accountParser');
 const fundAccount = require('./fundAccount');
 
-const NO_ACCOUNTS = 'noAccounts';
-
 class Provider {
   constructor(options) {
     this.web3 = options.web3;
@@ -29,11 +18,6 @@ class Provider {
   startWeb3Provider(callback) {
     const self = this;
 
-// cache layer
-//     self.addProvider(new CacheSubprovider())
-
-    // self.addProvider(new NonceSubprovider())
-
     if (this.type === 'rpc') {
       self.engine.addProvider(new RpcSubprovider({
         rpcUrl: self.web3Endpoint
@@ -46,12 +30,12 @@ class Provider {
         rpcUrl: self.web3Endpoint,
         origin: this.blockchainConfig.wsOrigins.split(',')[0]
       }));
+      //self.provider = new this.web3.providers.WebsocketProvider(self.web3Endpoint, {headers: {Origin: "embark"}});
     } else {
       return callback(__("contracts config error: unknown deployment type %s", this.type));
     }
 
 
-
     // network connectivity error
     self.engine.on('error', (err) => {
       // report connectivity errors
@@ -74,26 +58,35 @@ class Provider {
 
     self.accounts = AccountParser.parseAccountsConfig(self.accountsConfig, self.web3, self.logger);
     self.addresses = [];
-    async.waterfall([
-      function populateWeb3Wallet(next) {
-        if (!self.accounts.length) {
-          return next(NO_ACCOUNTS);
-        }
-        self.accounts.forEach(account => {
-          self.addresses.push(account.address);
-          self.web3.eth.accounts.wallet.add(account);
-        });
-        self.asyncMethods = {
-          eth_accounts: self.eth_accounts.bind(self)
-        };
-        next();
-      }
-    ], function (err) {
-      if (err && err !== NO_ACCOUNTS) {
-        self.logger.error((err));
-      }
-      callback();
+    if (!self.accounts.length) {
+      return callback();
+    }
+    self.accounts.forEach(account => {
+      self.addresses.push(account.address);
+      self.web3.eth.accounts.wallet.add(account);
     });
+
+    self.realAccountFunction = self.web3.eth.getAccounts;
+    self.web3.eth.getAccounts = function (cb) {
+      if (!cb) {
+        cb = function () {
+        };
+      }
+      return new Promise((resolve, reject) => {
+        self.realAccountFunction((err, accounts) => {
+          if (err) {
+            cb(err);
+            return reject(err);
+          }
+          accounts = accounts.concat(self.addresses);
+          // accounts = self.addresses.concat(accounts);
+          cb(null, accounts);
+          resolve(accounts);
+        });
+      });
+    };
+
+    callback();
   }
 
   fundAccounts(callback) {
diff --git a/test_apps/test_app/test/simple_storage_spec.js b/test_apps/test_app/test/simple_storage_spec.js
index d723cb52a..3ee31b10c 100644
--- a/test_apps/test_app/test/simple_storage_spec.js
+++ b/test_apps/test_app/test/simple_storage_spec.js
@@ -4,11 +4,6 @@ let accounts;
 const Utils = require('embarkjs').Utils;
 
 config({
-  deployment: {
-    type: 'ws',
-    host: 'localhost',
-    port: '8546'
-  },
   contracts: {
     "SimpleStorage": {
       args: [100],