diff --git a/.gitmodules b/.gitmodules
index e37a6d2..645e902 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,3 +2,6 @@
 	path = external/netcipher
 	url = https://github.com/guardianproject/NetCipher.git
 	branch = master
+[submodule "Bonsai"]
+	path = Bonsai
+	url = https://github.com/anthonycr/Bonsai.git
diff --git a/Bonsai b/Bonsai
new file mode 160000
index 0000000..c7c74da
--- /dev/null
+++ b/Bonsai
@@ -0,0 +1 @@
+Subproject commit c7c74da5e91adeb69c16b3191b6c3ff2789c57ea
diff --git a/app/build.gradle b/app/build.gradle
index 55731a2..15361c0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -101,6 +101,8 @@ dependencies {
     // git submodule update --remote
     compile project(':libnetcipher')
 
+    compile project(':bonsai')
+
     // memory leak analysis
     debugCompile 'com.squareup.leakcanary:leakcanary-android:1.4-beta2'
     releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta2'
diff --git a/settings.gradle b/settings.gradle
index 09a8a5d..cc1b61c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,6 @@
 include ':app'
 include ':libnetcipher'
+include ':bonsai'
 
 project(':libnetcipher').projectDir = new File(rootProject.projectDir, 'external/netcipher/libnetcipher')
+project(':bonsai').projectDir = new File(rootProject.projectDir, 'Bonsai/library')