diff --git a/.npmignore b/.npmignore
index fe9797a..f82f33f 100644
--- a/.npmignore
+++ b/.npmignore
@@ -5,3 +5,4 @@
 /.nvmrc
 /.travis.yml
 /local-cli/src
+/react-native-pushy-cli
diff --git a/local-cli/src/bundle.js b/local-cli/src/bundle.js
index b8fca6a..37b00c6 100644
--- a/local-cli/src/bundle.js
+++ b/local-cli/src/bundle.js
@@ -3,9 +3,50 @@
  */
 
 import * as path from 'path';
-import { mkdir } from 'mkdir-recursive';
+import { mkdir as mkdirRecurisve } from 'mkdir-recursive';
 import { getRNVersion } from './utils';
+import * as fs from 'fs';
+import * as tar from 'tar';
+import fstream from 'fstream';
 
+function mkdir(dir){
+  return new Promise((resolve, reject) => {
+    mkdirRecurisve(dir, err => {
+      if (err) {
+        reject(err);
+      } else {
+        resolve();
+      }
+    });
+  });
+}
+
+function pack(dir, output){
+  return mkdir(path.dirname(output))
+    .then(()=>{
+      return new Promise((resolve, reject) => {
+        const dest = fs.createWriteStream(output);
+
+        var packer = tar.Pack({
+            noProprietary: true,
+            fromBase: true,
+          })
+          .on('error', err => {
+            reject(err);
+          })
+          .on('end', () => {
+            resolve();
+          });
+
+        fstream.Reader({ path: dir, type: "Directory" })
+          .on('error', err => {
+            reject(err);
+          })
+          .pipe(packer)
+          .pipe(dest);
+      });
+    })
+}
 
 export const commands = {
   bundle: async function({options}){
@@ -22,19 +63,13 @@ export const commands = {
       throw new Error('Platform must be specified.');
     }
 
+    await mkdir(intermediaDir);
+
     const { version, major, minor} = getRNVersion();
 
     console.log('Bundling with React Native version: ', version);
 
-    await new Promise((resolve, reject) => {
-      mkdir(intermediaDir, err => {
-        if (err) {
-          reject(err);
-        } else {
-          resolve();
-        }
-      });
-    });
+    await mkdir(intermediaDir);
 
     require(path.resolve('node_modules/react-native/packager/babelRegisterOnly'))([
       /private-cli\/src/,
@@ -44,7 +79,7 @@ export const commands = {
     const bundle = require(path.resolve('node_modules/react-native/local-cli/bundle/bundle'));
     const defaultConfig = require(path.resolve('node_modules/react-native/local-cli/default.config'));
 
-    bundle([
+    await bundle([
       '--entry-file',
       entryFile,
       '--platform',
@@ -54,9 +89,13 @@ export const commands = {
       '--bundle-output',
       `${intermediaDir}/index.bundlejs`,
       '--assets-dest',
-      `${intermediaDir}/assets`,
+      `${intermediaDir}`,
       '--verbose',
       '' + !!verbose,
     ], Config.get(path.resolve('node_modules/react-native/local-cli'), defaultConfig));
+
+    console.log('Packing');
+
+    await pack(intermediaDir, output);
   }
 };
diff --git a/local-cli/src/index.js b/local-cli/src/index.js
index e3aec95..0377dc1 100644
--- a/local-cli/src/index.js
+++ b/local-cli/src/index.js
@@ -39,7 +39,9 @@ exports.run = function () {
 
   loadSession()
     .then(()=>commands[argv.command](argv))
-    .catch(err=>{setTimeout(()=>{
-      throw err;
-    })});
+    .catch(err=>{
+      setTimeout(()=>{
+        throw err;
+      });
+    });
 };