diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
new file mode 100644
index 0000000..d3943a2
Binary files /dev/null and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..30aa626
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,29 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <Objective-C-extensions>
+      <file>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
+      </file>
+      <class>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
+      </class>
+      <extensions>
+        <pair source="cpp" header="h" fileNamingConvention="NONE" />
+        <pair source="c" header="h" fileNamingConvention="NONE" />
+      </extensions>
+    </Objective-C-extensions>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3963879..99202cc 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,11 +5,12 @@
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
     <option name="myNullables">
       <value>
-        <list size="4">
+        <list size="5">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
+          <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
         </list>
       </value>
     </option>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index a5c9e58..d8a29ba 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,8 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/DirectNetShare.iml" filepath="$PROJECT_DIR$/DirectNetShare.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/direct-net-share.iml" filepath="$PROJECT_DIR$/direct-net-share.iml" />
       <module fileurl="file://$PROJECT_DIR$/direct-share/direct-share.iml" filepath="$PROJECT_DIR$/direct-share/direct-share.iml" />
     </modules>
   </component>
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/README.md b/README.md
index dc2fa72..e0d2abe 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Share internet via Wifi direct on Android
+# Share internet via Wifi direct on Android [Root]
 
 ## Direct Net Share
 
@@ -9,7 +9,7 @@ Requirements
 ------------
 - Launch the app in the host device.
 - Connect to the host device using the `ssid` and `password` displayed in the app.
-- On the other device, go to `Settings` -> `Wifi` -> Long click the current network -> `Modify network` -> `Advanced Options` -> and use the proxy settings displayed in the app.
+- No need to setup a proxy on the device(s) you wish to connect. The ip is forwarded thanks to the root rights.
 
 Repository overview
 -------------------
diff --git a/app/build.gradle b/app/build.gradle
index 50bf555..fb82f2b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
 
 android {
     compileSdkVersion 26
@@ -15,9 +16,19 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    kotlin {
+        experimental {
+            coroutines 'enable'
+        }
+    }
 }
 
 dependencies {
     implementation 'com.android.support:appcompat-v7:26.1.0'
     compile project(':direct-share')
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:0.22.5"
+}
+repositories {
+    mavenCentral()
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 56519bc..8547375 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="shinil.direct_share">
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
diff --git a/app/src/main/java/shinil/direct_share/BaseActivity.java b/app/src/main/java/shinil/direct_share/BaseActivity.java
deleted file mode 100644
index 101057f..0000000
--- a/app/src/main/java/shinil/direct_share/BaseActivity.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package shinil.direct_share;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.ConnectivityManager;
-import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
-
-public abstract class BaseActivity extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if(!U.isWifiEnabled(getApplicationContext())) {
-            registerReceiver(new BroadcastReceiver() {
-                @Override
-                public void onReceive(final Context context, final Intent intent) {
-                    if (intent.getAction().equals(ConnectivityManager.CONNECTIVITY_ACTION)) {
-                        boolean noConnectivity = intent.getBooleanExtra(
-                                ConnectivityManager.EXTRA_NO_CONNECTIVITY, false);
-                        if (!noConnectivity) {
-                            startShare();
-                            unregisterReceiver(this);
-                        }
-                    }
-                }
-            }, new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION));
-            U.enableWifi(getApplicationContext());
-        } else
-            startShare();
-    }
-
-    protected abstract void startShare();
-}
diff --git a/app/src/main/java/shinil/direct_share/MainActivity.java b/app/src/main/java/shinil/direct_share/MainActivity.java
deleted file mode 100644
index 861ae16..0000000
--- a/app/src/main/java/shinil/direct_share/MainActivity.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package shinil.direct_share;
-
-import android.os.Bundle;
-import android.widget.TextView;
-
-import shinil.direct.share.DirectNetShare;
-import shinil.direct.share.util.Constants;
-
-public class MainActivity extends BaseActivity
-        implements DirectNetShare.GroupCreatedListener {
-
-    private DirectNetShare share;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-    }
-
-    @Override
-    protected void startShare() {
-        share = new DirectNetShare(MainActivity.this, this);
-        share.start();
-    }
-
-    @Override
-    public void onGroupCreated(String ssid, String password) {
-        ((TextView) findViewById(R.id.text_view_info)).setText("SSID : "+ssid+"\nPassword : "+password);
-        ((TextView) findViewById(R.id.text_view_hint)).setText("After connecting, set the proxy settings to" +
-                "\nhost : "+ Constants.DEFAULT_GROUP_OWNER_IP+"\nport : "+Constants.PROXY_PORT+"\non the other device.");
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        share.stop();
-    }
-}
diff --git a/app/src/main/java/shinil/direct_share/MainActivity.kt b/app/src/main/java/shinil/direct_share/MainActivity.kt
new file mode 100644
index 0000000..fea9fda
--- /dev/null
+++ b/app/src/main/java/shinil/direct_share/MainActivity.kt
@@ -0,0 +1,74 @@
+package shinil.direct_share
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.net.ConnectivityManager
+import android.os.Bundle
+import android.support.v7.app.AppCompatActivity
+import android.support.v7.widget.SwitchCompat
+import android.util.Log
+import android.widget.CompoundButton
+import android.widget.TextView
+import kotlinx.coroutines.experimental.launch
+import shinil.direct.share.DirectNetShare
+
+class MainActivity : AppCompatActivity() {
+    private lateinit var infoTv: TextView
+    private val rootManager = RootManager()
+    private val groupCreatedListener = DirectNetShare.GroupCreatedListener { ssid, password -> infoTv.text = String.format("SSID : %s\nPassword : %s", ssid, password) }
+    private lateinit var share: DirectNetShare
+    private val onCheckedChangeListener = CompoundButton.OnCheckedChangeListener { _, isChecked ->
+        if (isChecked) {
+            checkWifiAndStart()
+        } else {
+            stopShare()
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+        infoTv = findViewById(R.id.info)
+        (findViewById<SwitchCompat>(R.id.wifi_switch)).setOnCheckedChangeListener(onCheckedChangeListener)
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        stopShare()
+    }
+
+    private fun checkWifiAndStart() {
+        if (!Utils.isWifiEnabled(applicationContext)) {
+            registerReceiver(object : BroadcastReceiver() {
+                override fun onReceive(context: Context, intent: Intent) {
+                    if (intent.action != null && intent.action == ConnectivityManager.CONNECTIVITY_ACTION) {
+                        val noConnectivity = intent.getBooleanExtra(ConnectivityManager.EXTRA_NO_CONNECTIVITY, false)
+                        if (!noConnectivity) {
+                            startShare()
+                            unregisterReceiver(this)
+                        }
+                    }
+                }
+            }, IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION))
+            Utils.enableWifi(applicationContext)
+        } else {
+            startShare()
+        }
+    }
+
+    private fun startShare() {
+        share = DirectNetShare(this@MainActivity, groupCreatedListener)
+        share.start()
+        launch {
+            val success = rootManager.dhcpSetup()
+            Log.d("MainActivity", "DHCP setup successful? $success")
+        }
+    }
+
+    private fun stopShare() {
+        share.stop()
+        infoTv.text = ""
+    }
+}
diff --git a/app/src/main/java/shinil/direct_share/RootManager.kt b/app/src/main/java/shinil/direct_share/RootManager.kt
new file mode 100644
index 0000000..bc5013a
--- /dev/null
+++ b/app/src/main/java/shinil/direct_share/RootManager.kt
@@ -0,0 +1,32 @@
+package shinil.direct_share
+
+import android.util.Log
+import java.util.*
+
+class RootManager {
+    suspend fun dhcpSetup(): Boolean {
+        var success = true
+        success = success && runRootCommand("echo 1 > /proc/sys/net/ipv4/ip_forward")
+        success = success && runRootCommand("iptables -F")
+        success = success && runRootCommand("iptables -t nat -A POSTROUTING  -j MASQUERADE")
+        success = success && runRootCommand("iptables -A FORWARD -j ACCEPT")
+        success = success && runRootCommand("iptables -t nat -A PREROUTING  -p udp --dport 53 -j DNAT --to-destination 8.8.8.8:53")
+        success = success && runRootCommand("iptables -A FORWARD -p udp -d 8.8.8.8 --dport 53 -m state --state NEW,ESTABLISHED,RELATED -j ACCEPT")
+        return success
+    }
+
+    /**
+     * Warning: keep the 'suspend' here.
+     * waitFor documentation: Causes the current thread to wait, if necessary, until the process represented by this Process object has terminated.
+     */
+    private suspend fun runRootCommand(command: String): Boolean {
+        val commands = arrayOf("su", "-c", command)
+        val start: Long = System.currentTimeMillis()
+        val process: Process = Runtime.getRuntime().exec(commands)
+        val result = process.waitFor()
+        val end: Long = System.currentTimeMillis()
+        Log.d("RootManager", "Command ${Arrays.toString(commands)} executed in ${end - start} ms " +
+                " with result $result")
+        return result == 0
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/shinil/direct_share/U.java b/app/src/main/java/shinil/direct_share/Utils.java
similarity index 95%
rename from app/src/main/java/shinil/direct_share/U.java
rename to app/src/main/java/shinil/direct_share/Utils.java
index ce78894..eb7e805 100644
--- a/app/src/main/java/shinil/direct_share/U.java
+++ b/app/src/main/java/shinil/direct_share/Utils.java
@@ -7,7 +7,7 @@
  * @author shinilms
  */
 
-public final class U {
+public final class Utils {
 
     public static boolean enableWifi(Context context) {
         WifiManager wifiManager = (WifiManager) context.getApplicationContext().
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 549bb2e..7062fd1 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,24 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="shinil.direct_share.MainActivity"
-    android:padding="16dp">
-    <TextView
-        android:id="@+id/text_view_info"
+    android:orientation="vertical"
+    android:padding="16dp"
+    tools:context="shinil.direct_share.MainActivity">
+
+    <android.support.v7.widget.SwitchCompat
+        android:id="@+id/wifi_switch"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="20dp"
-        android:textSize="20sp"
-        android:text="Creating group.."/>
+        android:text="Enable Wifi" />
+
     <TextView
-        android:id="@+id/text_view_hint"
+        android:id="@+id/info"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/text_view_info"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="40dp"/>
-</RelativeLayout>
+        android:layout_marginTop="40dp" />
+</LinearLayout>
diff --git a/build.gradle b/build.gradle
index 020eae2..4671f02 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,14 +1,16 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    
+    ext.kotlin_version = '1.2.41'
+
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0'
-        
+        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c8f987f..2e7eb92 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 11 12:55:17 IST 2017
+#Thu May 24 11:27:11 GMT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip