diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..eb47d8e
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "external/netcipher"]
+	path = external/netcipher
+	url = https://github.com/guardianproject/NetCipher.git
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3038765..d7835ac 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -31,6 +31,7 @@
         android:targetSdkVersion="19" />
 
     <application
+        android:name="acr.browser.lightning.BrowserApp"
         android:allowBackup="true"
         android:hardwareAccelerated="true"
         android:icon="@drawable/ic_launcher"
diff --git a/external/netcipher b/external/netcipher
new file mode 160000
index 0000000..ba9d136
--- /dev/null
+++ b/external/netcipher
@@ -0,0 +1 @@
+Subproject commit ba9d13676669f7ef32df43a023a4d4a33385e013
diff --git a/res/layout/settings.xml b/res/layout/settings.xml
index 824df1a..4dda43a 100644
--- a/res/layout/settings.xml
+++ b/res/layout/settings.xml
@@ -69,7 +69,7 @@
                 </RelativeLayout>
             </RelativeLayout>
 
-            <LinearLayout
+            <LinearLayout 
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
                 android:layout_marginLeft="5dp"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5e85ed5..99b1209 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -158,5 +158,6 @@
     <string name="powered_by_google">Powered by Google</string>
     <string name="title_adblock">AdBlock</string>
     <string name="message_adblock">AdBlock is currently only available in the browser\'s paid version, Lightning Browser+. It is available to download on Google Play.</string>
+    <string name="use_tor_prompt">It looks like you have Orbot installed. Do you want to use Tor?</string>
 
 </resources>
\ No newline at end of file
diff --git a/src/acr/browser/lightning/BrowserActivity.java b/src/acr/browser/lightning/BrowserActivity.java
index 35edae4..8d418d8 100644
--- a/src/acr/browser/lightning/BrowserActivity.java
+++ b/src/acr/browser/lightning/BrowserActivity.java
@@ -4,6 +4,9 @@
 
 package acr.browser.lightning;
 
+import info.guardianproject.onionkit.ui.OrbotHelper;
+import info.guardianproject.onionkit.web.WebkitProxy;
+
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
@@ -73,27 +76,27 @@ import android.view.Window;
 import android.view.WindowManager;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
-import android.webkit.ValueCallback;
-import android.webkit.WebChromeClient.CustomViewCallback;
 import android.webkit.CookieManager;
 import android.webkit.CookieSyncManager;
+import android.webkit.ValueCallback;
+import android.webkit.WebChromeClient.CustomViewCallback;
 import android.webkit.WebIconDatabase;
 import android.webkit.WebView;
 import android.webkit.WebView.HitTestResult;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ArrayAdapter;
+import android.widget.AutoCompleteTextView;
 import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
-import android.widget.AutoCompleteTextView;
 import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
-import android.widget.VideoView;
 import android.widget.TextView.OnEditorActionListener;
+import android.widget.VideoView;
 
 public class BrowserActivity extends Activity implements BrowserController {
 	private static DrawerLayout mDrawerLayout;
@@ -445,8 +448,60 @@ public class BrowserActivity extends Activity implements BrowserController {
 			WebIconDatabase.getInstance().open(
 					getDir("icons", MODE_PRIVATE).getPath());
 		}
-	}
+		
 
+		checkForTor ();
+		
+	}
+	
+	/*
+	 * If Orbot/Tor is installed, prompt the user if they want to enable proxying for this session
+	 */
+	public void checkForTor ()
+	{
+
+		OrbotHelper oh = new OrbotHelper(this);
+		if (oh.isOrbotInstalled())			
+		{
+			DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() {
+			    @Override
+			    public void onClick(DialogInterface dialog, int which) {
+			        switch (which){
+			        case DialogInterface.BUTTON_POSITIVE:
+			        	initializeTor ();
+			            break;
+
+			        case DialogInterface.BUTTON_NEGATIVE:
+			            //No button clicked
+			            break;
+			        }
+			    }
+			};
+
+			AlertDialog.Builder builder = new AlertDialog.Builder(this);
+			builder.setMessage(R.string.use_tor_prompt).setPositiveButton(android.R.string.yes, dialogClickListener)
+			    .setNegativeButton(android.R.string.no, dialogClickListener).show();
+		}
+	}
+	
+	/*
+	 * Initialize WebKit Proxying for Tor
+	 */
+	public void initializeTor ()
+	{
+		
+		OrbotHelper oh = new OrbotHelper(this);
+		if (!oh.isOrbotRunning())
+			oh.requestOrbotStart(this);
+		
+		WebkitProxy wkp = new WebkitProxy(); 
+		try {
+			wkp.setProxy("acr.browser.lightning.BrowserApp", getApplicationContext(), "localhost",8118);
+		} catch (Exception e) {
+			Log.d("Lightning","error enabling web proxying",e);
+		}		
+	}
+	
 	public synchronized void initializeTabs() {
 		mIdGenerator = 0;
 
diff --git a/src/acr/browser/lightning/BrowserApp.java b/src/acr/browser/lightning/BrowserApp.java
new file mode 100644
index 0000000..3b01e4f
--- /dev/null
+++ b/src/acr/browser/lightning/BrowserApp.java
@@ -0,0 +1,7 @@
+package acr.browser.lightning;
+
+import android.app.Application;
+
+public class BrowserApp extends Application {
+
+}