diff --git a/app.js b/app.js
index ecf4166..0ddd93d 100644
--- a/app.js
+++ b/app.js
@@ -1,33 +1,3 @@
-const chalk = require('chalk');
-const clear = require('clear');
-const figlet = require('figlet');
-const common = require('./lib/common');
-const inquirer = require('./lib/inquirer');
-const connectWifi = require('./pages/pages')
+const pages = require('./pages/pages')
 
-
-const mainMenu = async () => {
-    common.header()
-    console.log(chalk.blue('Main Menu'))
-    console.log(chalk.red('----------'))
-    const mainMenuSelection = await inquirer.mainMenu();
-    console.log(mainMenuSelection);
-    switch(mainMenuSelection.mainMenu) {
-        case 'connect to miwatch via wifi':
-        connectWifi.connectWifi()
-        break;
-        case 'y':
-          // code block
-          break;
-        default:
-          // code block
-      }
-};
-
-mainMenu();
-
-
-// if (files.directoryExists('.git')) {
-//     console.log(chalk.red('Already a Git repository!'));
-//     process.exit();
-// }
\ No newline at end of file
+pages.mainMenu();
diff --git a/lib/common.js b/lib/common.js
index 59423fa..de99102 100644
--- a/lib/common.js
+++ b/lib/common.js
@@ -20,5 +20,8 @@ module.exports = {
                 '-------------------------------------------------------------------------------------------------------'
             )
         )
+    },
+    pause: async (time) => {
+        await new Promise(resolve => setTimeout(resolve, time));
     }
 }
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 5ec6a6b..4bfc784 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1196,6 +1196,11 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
       "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
     },
+    "shell-exec": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/shell-exec/-/shell-exec-1.0.2.tgz",
+      "integrity": "sha512-jyVd+kU2X+mWKMmGhx4fpWbPsjvD53k9ivqetutVW/BQ+WIZoDoP4d8vUMGezV6saZsiNoW2f9GIhg9Dondohg=="
+    },
     "signal-exit": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
diff --git a/package.json b/package.json
index 889b2ea..47404a9 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
     "minimist": "^1.2.5",
     "node-adb": "^0.1.6",
     "pkg": "^4.4.7",
-    "promise-android-tools": "^2.0.4"
+    "promise-android-tools": "^2.0.4",
+    "shell-exec": "^1.0.2"
   }
 }
diff --git a/pages/pages.js b/pages/pages.js
index 5ebcc2e..fc832f2 100644
--- a/pages/pages.js
+++ b/pages/pages.js
@@ -3,7 +3,8 @@ const clear = require('clear');
 const figlet = require('figlet');
 const common = require('../lib/common');
 const inquirer = require('../lib/inquirer');
-const adb = require('node-adb');
+const shellExec = require('shell-exec')
+const mainMenu = require('../app')
 
 
 module.exports = {
@@ -13,11 +14,34 @@ module.exports = {
         console.log(chalk.red('----------'))
 
         const miWatchIpaddress = await inquirer.connectWifi();
-        console.log(miWatchIpaddress.connectWifi)
-        adb({
-            cmd: ['devices']
-        }, function (result) {
-            console.log(result)
-        });
-    }
+        shellExec('adb connect ' + miWatchIpaddress.connectWifi).then(async function (result) {
+            if (result.stdout.includes('unable to connect')){
+                console.log(chalk.red('MiWatch not found'))
+                // await new Promise(resolve => setTimeout(resolve, 5000));
+                await common.pause(3000)
+                module.exports.connectWifi()
+            } else {
+                console.log(chalk.green('MiWatch Connected'))
+                await common.pause(3000)
+                module.exports.mainMenu()
+            }
+        }).catch()
+    },
+    mainMenu: async () => {
+        common.header()
+        console.log(chalk.blue('Main Menu'))
+        console.log(chalk.red('----------'))
+        const mainMenuSelection = await inquirer.mainMenu();
+        console.log(mainMenuSelection);
+        switch (mainMenuSelection.mainMenu) {
+          case 'connect to miwatch via wifi':
+              module.exports.connectWifi()
+            break;
+          case 'y':
+            // code block
+            break;
+          default:
+            // code block
+        }
+      }
 };
\ No newline at end of file