diff --git a/.travis.yml b/.travis.yml
index 8aabc086..aa69371a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ android:
     - tools
     - build-tools-25.0.3
     - android-22
-    - android-25
+    - android-26
     - sys-img-armeabi-v7a-android-22
     - extra-android-m2repository
     - extra-android-support
@@ -21,4 +21,4 @@ before_script:
   - android-wait-for-emulator
   - adb shell input keyevent 82 &
 
-script: travis_wait 30 ./gradlew clean connectedAndroidTest -PdisablePreDex --stacktrace
\ No newline at end of file
+script: travis_wait 60 ./gradlew clean connectedAndroidTest -PdisablePreDex --stacktrace
\ No newline at end of file
diff --git a/CHANGE.md b/CHANGE.md
index 3754c9da..c816ad8a 100644
--- a/CHANGE.md
+++ b/CHANGE.md
@@ -1,716 +1,7 @@
-## v1.0.9 - 07/03/2017
+#### Change Logs
 
-#### Undo bintray props
-commit 6603ea2112e3281b1974442cfcbe9a6e62f0b9cf<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Mon Jul 3 11:09:32 2017 -0500
+WiseFy upon each new major release will start a brand new change log.
 
-#### Add local.properties back to gitignore
-commit 43b2a6cd322a86a4ecc329800a96cabd3729575c<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Mon Jul 3 10:48:36 2017 -0500
+[1.x Changes](/changes/1.x.md)
 
-#### Remove local properties for travis-ci
-commit c4944e0c24538630687c70a3c02807e2f835e32c<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Mon Jul 3 10:47:26 2017 -0500
-
-#### Remove unused resources
-commit 67543bfeaea1e9d0c2a993d8a3ba06e34163c30c<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Mon Jul 3 10:44:53 2017 -0500
-
-#### Adjust package for return codes
-commit 7486de70fbf295fe975588ba9025149e81c54f33<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Mon Jul 3 10:20:09 2017 -0500
-
-#### More adjustments for Binary
-commit b10efc7e037b7f02dd39aec11a2bbad4b7ca8ca8<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Mon Jul 3 10:00:19 2017 -0500
-
-#### Adjust tests and WiseFy for scope and return unique code for network already configured
-commit 2ddf9f731d11d6cc6f1065ddba7e8863bc145631<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Mon Jul 3 09:28:00 2017 -0500
-
-    close #51
-    close #52
-    close #53
-
-#### Merge branch 'master' into develop
-commit 74b4ae81e645c3d9f637baa030866450ea41412c<br/>
-Merge: fdedcc0 4e22889<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sun Jul 2 15:43:18 2017 -0500
-
-#### Merge branch 'master' into develop
-commit fdedcc03c892f1af56c145e54d3987ebe19058b5<br/>
-Merge: d18109d a0f8a3b<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sun Jul 2 15:42:42 2017 -0500
-
-#### Update CHANGE.md
-commit 4e228895dbf5260824acf27208c76e1433e6dd68<br/>
-Author: Patches <isuPatches@yahoo.com><br/>
-Date:   Sun Jul 2 15:42:15 2017 -0500
-
-#### Merge pull request #49 from isuPatches/develop
-commit a0f8a3bbb2c6631a3566a5970cd6df8e60e73ffc<br/>
-Merge: 0b7a808 d18109d<br/>
-Author: Patches <isuPatches@yahoo.com><br/>
-Date:   Sun Jul 2 15:35:33 2017 -0500
-
-    v1.0.8
-
-## v1.0.8 - 07/02/2017
-
-#### Update Javadocs again
-commit d18109d7c3093015423541151595c7de25ce80c8<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sun Jul 2 14:58:28 2017 -0500
-
-#### Add more tests, switch to String.format, update more libs, and restore travis-ci functionality
-commit db218ba7122453097b696d45bc3a43d9d05ade9c<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sun Jul 2 14:57:17 2017 -0500
-
-#### Test for travis_wait
-commit 2cb4425e5b232b67b936da2e75a99d2fcc1ca310<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sun Jul 2 12:57:35 2017 -0500
-
-#### Update README to include permission blurb
-commit 40ce82ce7c9c00e8b6ef31a08cdba4d7b1c87cc9<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sun Jul 2 09:38:32 2017 -0500
-
-#### Adding travis_wait
-commit 64168a57918dd887ddb8da2de93c134f4d3688c0<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sun Jul 2 09:17:39 2017 -0500
-
-#### Test for travis-ci
-commit b8e5449ea6f23a41a503988dd1c41ad71702b68a<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sun Jul 2 08:53:09 2017 -0500  
-
-#### Update test naming schema
-commit 292487515bb1dd5883d5929f84a180066e5d8112<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sun Jul 2 01:26:05 2017 -0500
-    
-    close #48
-
-#### Rename GetManagerUtil
-commit 5495cf97f54c5d74bff5a8e2226fe0b4fbd6e077<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Jul 1 23:54:04 2017 -0500
-
-    close #46
-
-#### Update Javadocs, eliminate potential memory leak on Android N
-commit 716997a3d6e88b89e5999603664fc7f748ad4ec4<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Jul 1 23:48:02 2017 -0500
-
-    close #45
-
-#### Adjust scope for withContext, bump some versions, remove potential manifest conflicts
-commit 48def3c09edd2b5ae54129084bc6d2f266396fb2<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Jul 1 23:13:48 2017 -0500
-
-    close #41
-
-#### Merge branch 'master' into develop
-commit c9b9cb726be57e62a925f9ac2d84682e94c2c0b0<br/>
-Merge: b1da078 0b7a808<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Mar 25 23:07:56 2017 -0500
-
-#### Update CHANGE.md
-commit 0b7a808eabd41a2d2eb8fd1a1c29dcd19f1be455<br/>
-Author: Patches <isuPatches@yahoo.com><br/>
-Date:   Sat Mar 25 23:05:20 2017 -0500
-
-#### Merge branch 'master' into develop
-commit b1da078eb48f0b29ba140a8a334a5fd54d242316<br/>
-Merge: e9f087b a836baf<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Mar 25 22:45:21 2017 -0500
-    
-## v1.0.7 - 03/25/2017
-
-#### Merge pull request #37 from isuPatches/develop
-commit a836baf09b974ea5332c037e236a153e9f30cf8d<br/>
-Merge: 31217ab e9f087b<br/>
-Author: Patches <isuPatches@yahoo.com><br/>
-Date:   Sat Mar 25 22:44:26 2017 -0500
-    
-    v1.0.7
-
-#### Revert Travis CI changes
-commit e9f087beb8f262c3b805843d45a6b7b09cf89546<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Mar 25 22:22:53 2017 -0500
-
-#### Going to try to cut down Travis CI time
-commit ef49b55b20277c3854eece485a827f8c39157b17<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Mar 25 22:10:53 2017 -0500 
-
-#### Update deps, update java docs, extract jacoco gradle logic
-commit d3a3a2c343e7b0b8be60a0751d2add05aca571b1<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Mar 25 21:43:40 2017 -0500
-
-#### Merge branch 'master' into develop
-commit 53cdb27b90586128514cf53a0611a1b2f4fd7032<br/>
-Merge: 2a59351 31217ab<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Feb 4 21:19:48 2017 -0600
-
-#### Update CHANGE.md
-commit 31217ab1b96b8e1b4907607050936e73e7e296a0<br/>
-Author: Patches <isuPatches@yahoo.com><br/>
-Date:   Sat Feb 4 21:18:44 2017 -0600
-
-## v1.0.6 - 02/04/2017
-
-#### Merge pull request #36 from isuPatches/develop
-commit 85640461ba06babdc4b37591249af269bec60c28<br/>
-Merge: 7ed8ed1 2a59351<br/>
-Author: Patches <isuPatches@yahoo.com><br/>
-Date:   Sat Feb 4 21:11:52 2017 -0600
-
-    v1.0.6
-
-#### Update README version for release
-commit 2a593513ce0638d04202ff4a9de01cc2cd16b964<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Feb 4 20:47:52 2017 -0600
-
-#### Update bin again
-commit a88e55a64e96e2fe40a3e673b56a669825811462<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Feb 4 20:20:48 2017 -0600
-
-#### Add getFrequency and isNetwork5gHz for >= 21 devices, update javadocs, adjust visibility, library updates, etc.
-commit a83f4fa6a8c3af1b7f357a7259fe420d57950979<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Feb 4 20:19:52 2017 -0600
-    
-    close #31
-    close #32
-    close #33
-    close #34
-    close #35
-
-#### Merge branch 'master' into develop
-commit 71a7151f7fdb7471d83f85eeedf46674803ed742<br/>
-Merge: 2c2cafd 7ed8ed1<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Nov 5 14:43:04 2016 -0500
-
-#### Update README.md
-commit 7ed8ed10bab57bf1ae8186e405db181a054f68f4<br/>
-Author: Patches <isuPatches@yahoo.com><br/>
-Date:   Sat Nov 5 14:42:27 2016 -0500
-
-#### Merge branch 'master' into develop
-commit 2c2cafdc09b140e914dfb9b9a14324dbbfb5817b<br/>
-Merge: 7bdd39e 716899f<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Nov 5 14:09:18 2016 -0500
- 
-#### Update CHANGE.md
-commit 716899f792b4e88def76da74bcd2fec8df78e463<br/>
-Author: Patches <isuPatches@yahoo.com><br/>
-Date:   Sat Nov 5 14:08:51 2016 -0500
-
-## v1.0.5 - 11/05/2016
-
-#### Merge pull request #29 from isuPatches/develop
-commit 0f670e635c7fe2cd1997446890ec6c6450cd6e9e<br/>
-Merge: ecbe2dc 7bdd39e<br/>
-Author: Patches <isuPatches@yahoo.com><br/>
-Date:   Sat Nov 5 14:06:26 2016 -0500
-    
-    v1.0.5
-
-#### Update change and readme files
-commit 7bdd39e8df97158c3f667ed128f4fc0f3466d852<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Nov 5 14:04:30 2016 -0500
-
-#### Adjust file structure for Bintray
-commit 3685c42d198fc700976a57217175c7f8e62f6719<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sun Oct 30 08:35:11 2016 -0500
-
-#### Merge branch 'master' into develop
-commit 3d3e552ab7da0d46f7dd15d1367fd753268dca1d<br/>
-Merge: 948493f ecbe2dc<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 29 21:26:29 2016 -0500
-
-#### Add gradle logic to publish to Binary
-commit 948493f42bd53283f6e7f8162fb9adaefd74b2e4<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 29 21:23:21 2016 -0500
-    
-    closes #19
-
-#### Merge pull request #28 from isuPatches/develop
-commit ecbe2dc67a4c9d86324901fb2fae9ff58aaefe92<br/>
-Merge: 7a3014c a41b4b6<br/>
-Author: Patches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 29 18:57:11 2016 -0500
-    
-    Add short license to readme
-
-#### Add short license to read
-commit a41b4b6ef55ccbf976ecec4172a90bf20286c0ea<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 29 18:56:35 2016 -0500
-
-## v1.0.4 - 10/29/2016
-
-#### Merge pull request #27 from isuPatches/develop
-commit 7a3014ce415db2f621d39e05193ffa5242c082d6<br/>
-Merge: 5ee444c 3ecb389<br/>
-Author: Patches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 29 18:55:24 2016 -0500
-    
-    v1.0.4
-
-#### Update javadoc
-commit 3ecb3893952449ccc71aefa8930af08dd6c6bb2a<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 29 18:53:10 2016 -0500
-
-#### More license stuff
-commit 797008957e441a6e79991f4f06c2f95dd36dfe4d<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 29 18:48:08 2016 -0500
-   
-#### Update LICENSE.md
-commit 882f6877a37bbf66324fd4a02a22f7565b62ff3d<br/>
-Author: Patches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 29 18:46:00 2016 -0500
-
-#### Update LICENSE.md
-commit 9d89ef7a6dbeacbce54b93a41a51524b7c60d9cf<br/>
-Author: Patches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 29 18:42:49 2016 -0500
-
-#### Move license to separate file
-commit fb464859eee4a0fe877a00bc0b538c59820b13bf<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 29 18:38:13 2016 -0500
-
-#### Remove unnecessary files
-commit cce36df939677677db363049085027f98dc3229a<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 29 18:35:59 2016 -0500 
-
-#### GAH...just work
-commit cb4326f6f2c4af7d3161b6fedd4130d0dac7d658<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 29 18:06:20 2016 -0500
-
-#### Another test
-commit e2755d24f1adb079e146448db6d9db1124f0ad66<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 29 17:46:17 2016 -0500
-
-#### Trying another thing
-commit 5d96b2ad1d4dc0150e6df67f6ac24440968532b9<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 29 17:18:20 2016 -0500
- 
-#### Trying a lower API level
-commit 4a94ad26d9c059e8090f059ed622b1633b35e500<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 29 17:02:10 2016 -0500
-    
-#### Adjust adoptions
-commit 341cee9340afb9a4f0f891db238a55dcaa39d425<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 29 15:00:38 2016 -0500
-
-#### More updates
-commit ec8bf2898c3ae6e6145fd8b608b63ec3dc47efe0<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 29 14:32:42 2016 -0500
-
-#### Removing signed bit
-commit d00d586869510ea65b366922f38b8bed3c1d1a28<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 29 14:27:55 2016 -0500
-
-#### Another experiment
-commit 9e00962af97bad9cf789c579b3d36b7082018992<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 29 14:06:22 2016 -0500
-
-#### More tinkering
-commit 52fa35942bfe0dfdcfc5410de2610fb397359134<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 29 13:38:41 2016 -0500
-
-#### Update
-commit 1715ec5560ac4dbf7bb0e8526868162e04db4482<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 29 12:59:47 2016 -0500
-
-#### Yet another travis test
-commit 6c7a1a5af877d213e4558c1ebdc33933f79e7f71<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 29 12:43:26 2016 -0500
-
-#### Another test
-commit 221bdbec458e9696b3b6f18124a88307dd2e90fc<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 29 12:22:33 2016 -0500
-
-#### Test
-commit d4e23f60f5236b27eb9047beee6aa3df1e36a24a<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 29 12:14:45 2016 -0500
-
-#### Another potential travis fix
-commit e645fd867f4ca4835780c5c37adfb23960e0aecf<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 29 11:56:55 2016 -0500
-
-#### Another test
-commit 095aed8db9b05224bf0896b41727663a1cb4af78<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 29 11:37:51 2016 -0500
-
-#### Too much logging for Travis
-commit 2e49c408548429a309bc64b2db2a04189f62d927<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 29 11:03:36 2016 -0500
-
-#### Potential fix for travis ci
-commit f7ec203be930bb89e6df07ed8907f6fbd4d46683<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 29 10:49:49 2016 -0500
-
-#### Enforce context through builder constructor
-commit 2a0f5f81a9d918a13fbf260c161e9384544a644b<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Mon Oct 24 00:00:49 2016 -0500
-    
-    close #25
-
-#### More crazy experiments
-commit b0a73d81fb16d6580da73559c63fdf30f77a9a70<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sun Oct 23 22:49:29 2016 -0500
-
-#### Update
-commit 196ca252e3903a3957831bdb156e00fdebe77d8d<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sun Oct 23 21:40:28 2016 -0500
-
-####  Spaces
-commit c4d1abc12d482e31920148328a87bd1d9ddd7781<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sun Oct 23 20:56:11 2016 -0500
-
-#### Another try
-commit df6ead8e07adf0fcc1d64657c968927fb3876f9f<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sun Oct 23 20:55:09 2016 -0500
-
-#### Support libs?
-commit fe3ad453bb3edfefd8a2f2960894dbd1cba44f5f<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sun Oct 23 20:25:15 2016 -0500
-
-#### Bump
-commit f87264db901d40b992408dcd1c005ec60b1a74d3<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sun Oct 23 20:11:14 2016 -0500
-
-#### Yet another attempt
-commit ad81e789526d6355e2e9ffe1d6ab16503d1bb975<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sun Oct 23 19:59:50 2016 -0500
-
-#### Another attempt
-commit 7d53c231da354faf2ef3562eee3ca0a6800a6c80<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sun Oct 23 19:50:01 2016 -0500
-
-#### Increment again
-commit 8a0c52c8c4a3435545e0aa5104df3b9366fe5a1f<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sun Oct 23 19:29:03 2016 -0500
-
-#### Trying to bump down build tools
-commit 7b7e36d4bc75f2231b1e8f58d7e37c8d173afd05<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sun Oct 23 19:10:13 2016 -0500
-
-#### Another test
-commit cb5526001046099374991ade4585f1132cef110d<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sun Oct 23 18:28:56 2016 -0500
-
-#### Update travis.yml
-commit ca88ab0ef050795d259aa893a23d5c164d781c8c<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sun Oct 23 17:56:28 2016 -0500
-
-#### One day travis ci will work with me
-commit 035eaa75a5c0a3276926b5b58713499dd2f0216a<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sun Oct 23 14:42:28 2016 -0500
-
-#### Forgot to add tag
-commit 204f753393c2101c08748bd24b1e4ebf06b19717<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sun Oct 23 14:32:31 2016 -0500
-
-#### Add tag, move to ENV variables
-commit fe7f01311d6bab0b26fb411447e55408e9819650<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sun Oct 23 14:21:34 2016 -0500
-
-#### :(
-commit c000de375e4f2863cce68db849fdc371ca09eea5<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sun Oct 23 14:05:23 2016 -0500
-   
-#### Add abi
-commit 4b6e3a020af842d44953eceeb5145b6017f37922<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sun Oct 23 13:56:12 2016 -0500  
-
-#### Wait for emulator
-commit eb6e5e9ac68884f37de6ae2be620556e4fe766dd<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sun Oct 23 13:47:02 2016 -0500
-
-#### Emulator
-commit acc2615abb18deb4d959701e3a6d9d39baf7754d<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sun Oct 23 13:34:28 2016 -0500
-
-#### Another attempt
-commit d9bc598ed20f37c97d25586d790d7da9618d1c91<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sun Oct 23 13:24:16 2016 -0500  
-
-#### Another test
-commit 7b34b0d529de9c7026f7f8604dfe6eac9eee9593<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sun Oct 23 13:19:04 2016 -0500
-
-#### Trying another update
-commit 9164d2cd463923ba132e0fd3db662a79de5a09c5<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sun Oct 23 12:37:02 2016 -0500
-
-#### travis.yml updates
-commit 95829f1ff7a69eed20b71fbafef5e680f01ab9b0<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sun Oct 23 12:32:16 2016 -0500
-
-#### Move travis.yml
-commit 816f72fcac20311ebf5a62a0b35952750de72b5e<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sun Oct 23 12:27:46 2016 -0500
-
-#### Add Travis badge
-commit e04ab71ee15ac0193d528eb94f21a8a655c72724<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sun Oct 23 12:26:39 2016 -0500
-
-#### Builder pattern updates, javadocs, new package name, updated README, and travis config
-commit bdb6ea7c3958cb29dbe80c6f9f5f8bdda9390022<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sun Oct 23 12:20:34 2016 -0500
-
-    close #16
-    close #20
-    close #21
-    close #22
-    close #23
-    close #24
-
-#### Merge branch 'master' into develop
-commit 3512ea1fc44ae55b82125fcf096ecf597819b7e0<br/>
-Merge: 4d45db3 5ee444c<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 22 15:20:48 2016 -0500
-
-#### Merge pull request #18 from isuPatches/develop
-commit 5ee444c66e83ce17730df31f1442daaab09ea328<br/>
-Merge: c8292ba 4d45db3<br/>
-Author: Patches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 22 15:20:18 2016 -0500
-
-    Develop
-
-#### Update docs again
-commit 4d45db3287a278dff512381d994cf05c5e3d1ebb<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 22 15:19:31 2016 -0500
-
-#### Merge branch 'master' into develop
-commit d584eaf2aba3996709fc4c92254004ed03bd3a02<br/>
-Merge: 643dd75 c8292ba<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 22 15:15:40 2016 -0500
-
-#### Update CHANGE.md
-commit c8292baba16805731221cbb07c49e787b946a93c<br/>
-Author: Patches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 22 15:14:57 2016 -0500
-
-## v1.0.3 - 10/22/2016
-
-#### Merge branch 'master' into develop
-commit 643dd759b21bbf9b3062b3566215bf84f02922e2<br/>
-Merge: a9d5f6a 0363b6e<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 22 15:04:35 2016 -0500
-
-#### Merge pull request #17 from isuPatches/develop
-commit 0363b6e3987ba1952f4c2244af94a8848a3d37fb<br/>
-Merge: 2e2246e a9d5f6a<br/>
-Author: Patches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 22 14:57:29 2016 -0500
-
-    v1.0.3
-
-#### Increment versionName and versionCode
-commit a9d5f6aee10545c265680b92477cb33331d3d9f4<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 22 14:56:20 2016 -0500
-
-#### Missed one spot in documentation
-commit 5f839d5fb115ef66cef2fe113ad82623f11ec663<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 22 14:34:59 2016 -0500
-
-#### Update ready
-commit 9895f5dc9567a80b63b5f84fbcd3b884a0cf5106<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 22 14:32:27 2016 -0500
-
-#### Move to builder pattern, use real time values, and update documentation
-commit e61e85e817b542eaa572e527068e911ffdcdcc8e<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 22 14:32:09 2016 -0500
-    
-    close #13
-    close #14
-    close #15
-    close #16
-
-#### Merge branch 'master' into develop
-commit 88c05d013caffd7b688cde44b8efea74f69ba3e4
-Merge: cd98623 2e2246e<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 22 04:08:26 2016 -0500
-
-#### More functionality, switching to espresso tests, updating libs, and providing logging option
-commit 2e2246e63fb4dc3b16b3a59c2081b9e9c39c4388<br/>
-Author: isuPatches <isuPatches@yahoo.com><br/>
-Date:   Sat Oct 22 04:08:05 2016 -0500
-    
-    closes #9
-    closes #10
-    closes #11
-    closes #12
-
-## v1.0.2 - 04/30/2016
-
-#### Update README.md
-commit cd98623b74763e4d12a0c682b5023fdd5f169d91<br/>
-Author: Patches <isuPatches@yahoo.com><br/>
-Date:   Sat Apr 30 15:02:43 2016 -0500
-
-#### Update CHANGE.md
-commit af298c3a986c4418cf0003e33f9d591daec58dc5<br/>
-Author: Patches <isuPatches@yahoo.com><br/>
-Date:   Sat Apr 30 14:54:13 2016 -0500
-
-#### Create CHANGE.md
-commit c16118744ff2a52881c4af6f4afc8438262888c8<br/>
-Author: Patches <isuPatches@yahoo.com><br/>
-Date:   Sat Apr 30 14:46:44 2016 -0500
-
-#### Merge pull request #7 from isuPatches/develop
-commit cdc66951cfca2a8e964f411f67b6c27a592de222<br/>
-Merge: 3ba209b 12bb210<br/>
-Author: Patches <isuPatches@yahoo.com><br/>
-Date:   Sat Apr 30 14:29:51 2016 -0500
-    
-    v1.0.2
-    
-#### Increment versionName and versionCode for release
-commit 12bb210b2aa6513b0140a2e6de7594f0e1d0e64f<br/>
-Author: isuPatches <sarah.klinefelter@metova.com><br/>
-Date:   Sat Apr 30 14:27:52 2016 -0500
-
-#### Merge pull request #6 from isuPatches/issue-5
-commit a2aefadc1e46785d6f78c17d6130aa574cb05ac6<br/>
-Merge: 772558b ae81d49<br/>
-Author: Patches <isuPatches@yahoo.com><br/>
-Date:   Sat Apr 30 14:25:29 2016 -0500
-    
-    issue-5
-
-#### Adding isWifiEnabled functionality
-commit ae81d49fcac0421cc8d5a10730359e7d1e723aec<br/>
-Author: isuPatches <sarah.klinefelter@metova.com><br/>
-Date:   Sat Apr 30 14:23:43 2016 -0500
-
-## v1.0.1 - 04/28/2016
-
-#### Merge pull request #3 from isuPatches/develop
-commit 3ba209b036b99f6cfd432b76b8e75616cdc1fc1c<br/>
-Merge: db745f2 772558b<br/>
-Author: Patches <isuPatches@yahoo.com><br/>
-Date:   Thu Apr 28 09:07:06 2016 -0500
-    
-    Fix README
-    
-#### Fix README
-commit 772558bc98f20b42849baf0eeacd012b0b383f0a<br/>
-Author: isuPatches <sarah.klinefelter@metova.com><br/>
-Date:   Thu Apr 28 09:05:24 2016 -0500
-    
-#### Merge pull request #1 from isuPatches/develop
-commit db745f25d2caf0768ee259aa11ed0ad57c7d8ee4<br/>
-Merge: 3df4638 b309b1c<br/>
-Author: Patches <isuPatches@yahoo.com><br/>
-Date:   Thu Apr 28 08:57:21 2016 -0500
-    
-    v1.0.1
-
-#### Add isSecure functionality
-commit b309b1c0c2550c08e92130c2e8bfb1ef1b0e48db<br/>
-Author: isuPatches <sarah.klinefelter@metova.com><br/>
-Date:   Thu Apr 28 08:53:19 2016 -0500
-
-## v1.0.0 - 04/26/2016
-
-#### Create README.md
-commit 3df46380676592b033a4c512ec6d67e7b4e39ace<br/>
-Author: Patches <isuPatches@yahoo.com><br/>
-Date:   Tue Apr 26 15:25:33 2016 -0500
-
-#### Initial commit
-commit 58826f9cd9002b5407c6bbaa540c49da46eee3f5<br/>
-Author: isuPatches <sarah.klinefelter@metova.com><br/>
-Date:   Tue Apr 26 15:09:41 2016 -0500
+[2.x Changes](/changes/2.x.md)
diff --git a/README.md b/README.md
index fd9f27b7..64713aac 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ Wifi configuration and util library built for Android.
 
 > <br/>*Developed by Patches 04/24/2016 - present* <br/>
 > 
-> <br/>Supports Android SDK levels 16-25<br/><br/>
+> <br/>Supports Android SDK levels 16-26<br/><br/>
 
 [![Android Weekly](https://img.shields.io/badge/Android%20Weekly-%23230-blue.svg)](http://androidweekly.net/issues/issue-230) [![Build Status](https://travis-ci.org/isuPatches/WiseFy.svg?branch=master)](https://travis-ci.org/isuPatches/WiseFy) [ ![Download](https://api.bintray.com/packages/isupatches/Maven/wisefy/images/download.svg) ](https://bintray.com/isupatches/Maven/wisefy/_latestVersion) <a href="http://www.methodscount.com/?lib=com.isupatches%3Awisefy%3A1.0.10"><img src="https://img.shields.io/badge/Methods and size-108 | 13 KB-e91e63.svg"/></a>
 
@@ -12,61 +12,61 @@ Wifi configuration and util library built for Android.
 
 Make sure you have one of the following repositories accessible:
 
-```
-repositories {
-    jcenter()
-}
+```groovy
+    repositories {
+        jcenter()
+    }
 ```
 
-```
-repositories {
-    mavenCentral()
-}
+```groovy
+    repositories {
+        mavenCentral()
+    }
 ```
 
-```
-repositories {
-    maven {
-        url  "http://dl.bintray.com/isupatches/Maven" 
+```groovy
+    repositories {
+        maven {
+            url  "http://dl.bintray.com/isupatches/Maven"
+        }
     }
-}
 ```
 
-Then add it as a dependency (please see https://github.com/isuPatches/WiseFy/releases for the lastest version):
+Then add it as a dependency (please see https://github.com/isuPatches/WiseFy/releases for the latest version):
 
-Gradle:
+For Gradle:
 
-```
-compile 'com.isupatches:wisefy:<LATEST_VERSION>'
+```groovy
+    compile 'com.isupatches:wisefy:<LATEST_VERSION>'
 ```
 
-Maven:
+For Maven:
 
-```
-<dependency>
-  <groupId>com.isupatches</groupId>
-  <artifactId>wisefy</artifactId>
-  <version><LATEST_VERSION></version>
-  <type>pom</type>
-</dependency>
+```xml
+    <dependency>
+      <groupId>com.isupatches</groupId>
+      <artifactId>wisefy</artifactId>
+      <version><LATEST_VERSION></version>
+      <type>pom</type>
+    </dependency>
 ```
 
 You may also download the @aar from the <a href="https://github.com/isuPatches/WiseFy/releases" title="WiseFy Releases">releases page</a> and import it into your project manually. 
 
 ## Getting An Instance
 
-WiseFy now supports the builder pattern so cool functionality can be added later!
+WiseFy is constructed with the builder pattern that allows you access to the synchronous and asynchronous APIs.
 
 To grab a default instance:
 
 ```java
-WiseFy mWiseFy = new WiseFy.withContext(getActivity()).getSmarts();
+WiseFy mWiseFy = new WiseFy.brains(getActivity()).getSmarts();
 ```
 
 To grab an instance with logging enabled:
 
 ```java
-WiseFy mWiseFy = new WiseFy.withContext(getActivity()).logging(true).getSmarts();
+WiseFy mWiseFy = new WiseFy.brains(getActivity()).logging(true).getSmarts();
 ```
 
 ## Permissions
@@ -84,164 +84,13 @@ For the sake of transparency and because you're probably curious as to what perm
 
 <strong> * NOTE * </strong>
 
-If a search for an SSID is failing (returning false or NULL depending on the method) on >= 6.x devices but the network is visible, it's most likely because you haven't asked in your application for the `Manifest.permission.ACCESS_COARSE_LOCATION` permission which is what allows us to see the access points nearby. It has been up for debate on if it would be beneficial to move permission requests to the WiseFy library, but at this time, it remains as-is so users can determine their own UI/UX and to not add additional package bloat.
-
-## Commands
-
-To add an open network:
-
-```java
-int addedSuccessfully = mWiseFy.addOpenNetwork("Open Network");
-```
-
-To add a WEP network:
-
-```java
-int addedSuccessfully = mWiseFy.addWEPNetwork("WEP Network", "123456");
-```
-
-To add a WPA2 network:
-
-```java
-int addedSuccessfully = mWiseFy.addWPA2Network("WPA2 Network", "12345678");
-```
-
-To calculate number of bars given a networks signal strength and total number of bars:
-
-```java
-int bars = mWiseFy.calculateBars(-35, 5);
-```
-
-To compare the signal strength of two networks:
-
-```java
-int result = mWiseFy.compareSignalLevel(-35, -70);
-```
-
-To connect to a network given an SSID:
-
-```java
-boolean connectedSuccessfully = mWiseFy.connectToNetwork("SSID To Connect To", 30000);
-```
-
-To disable wifi:
-
-```java
-boolean disabledWifiSuccessfully = mWiseFy.disableWifi();
-```
-
-To disconnect from current network:
-
-```java
-boolean disconnectedSuccessfully = mWiseFy.disconnectFromCurrentNetwork();
-```
-
-To enable wifi:
-
-```java
-boolean wifiEnabled = mWiseFy.enableWiFi();
-```
-
-To get current network:
-
-```java
-WifiInfo currentNetwork = mWiseFy.getCurrentNetwork();
-```
-
-To get the frequency of the devices current network:<br/><br/>
-<strong>* NOTE *</strong>  Only supported on API >= 21
-
-```java
-int frequency = mWiseFy.getFrequency();
-```
-
-To get the frequency of a network:<br/><br/>
-<strong>* NOTE *</strong>  Only supported on API >= 21
-
-```java
-int frequency = mWiseFy.getFrequency(wifiInfo);
-```
-
-To get nearby access points:<br/><br/>
-<strong>Setting filterDuplicates to true will not return SSIDs with a weaker signal strength (will always take the highest)</strong>
-
-```java
-List<ScanResult> nearbyAccessPoints = mWiseFy.getNearbyAccessPoints(true);
-```
-
-To get the networks whose configuration is already stored:
+If access points or SSIDs are not being returned on >= 6.x devices but there are visible networks, it's most likely because you haven't asked in your application for the `Manifest.permission.ACCESS_COARSE_LOCATION` permission which is what allows us to see the access points nearby. This permission request will not be added to the WiseFy library to reduce package bloat and so users can determine their own UI/UX.
 
-```java
-List<WifiConfiguration> savedNetworks = mWiseFy.getSavedNetworks();
-```
-
-To check and see if the device is connected to a mobile network:
-
-```java
-boolean isConnected = mWiseFy.isDeviceConnectedToMobileNetwork();
-```
-
-To check and see if the device is connected to a mobile or wifi network:
-
-```java
-boolean isConnected = mWiseFy.isDeviceConnectedToMobileOrWifiNetwork();
-```
-
-To check and see if the device is connected to a given SSID:
-
-```java
-boolean isConnected = mWiseFy.isDeviceConnectedToSSID("SSID");
-```
-
-To check and see if the device is connected to a wifi network:
-
-```java
-boolean isConnected = mWiseFy.isDeviceConnectedToWifiNetwork();
-```
+Please check [the permssions example](/documentation/permissions_example.md) for a sample of how to request permissions for WiseFy.
 
-To check if the device's current network is 5gHz:<br/><br/>
-<strong>* NOTE *</strong>  Only supported on API >= 21
+## Usage
 
-```java
-boolean is5gHz = mWiseFy.isNetwork5gHz();
-```
-
-To check if a network is 5gHz:<br/><br/>
-<strong>* NOTE *</strong>  Only supported on API >= 21
-
-```java
-boolean is5gHz = mWiseFy.isNetwork5gHz(wifiInfo);
-```
-
-To check and see if a given SSID is in the devices set of configured networks:
-
-```java
-boolean isConfigured = mWiseFy.isNetworkInConfigurationList("SSID");
-```
-
-To check and see if a network is secure (WEP/PSK/EAP capabilities):
-
-```java
-boolean isSecure = mWiseFy.isNetworkSecure(scanResult);
-```
-
-To check and see if Wifi is enabled on a device:
-
-```java
-boolean wifiEnabled = mWiseFy.isWifiEnabled();
-```
-
-To remove a configured network:
-
-```java
-boolean removedSuccessfully = mWiseFy.removeNetwork("SSID To Remove");
-```
-
-To search for an SSID given a search string:
-
-```java
-String ssid = mWiseFy.searchForSSID("SSID To Search For", 30000);
-```
+Please check [the documentation markdown directory](/documentation) for usage examples and details about both the synchronous and asynchronous API.
 
 ## License ##
 Copyright 2017 Patches Klinefelter
diff --git a/build.gradle b/build.gradle
index b5931a63..429ef1e0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:2.3.2"
+        classpath "com.android.tools.build:gradle:2.3.3"
         classpath "com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.7.1"
         classpath "com.github.dcendents:android-maven-gradle-plugin:1.5"
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3"
diff --git a/changes/1.x.md b/changes/1.x.md
new file mode 100644
index 00000000..cdf4efd6
--- /dev/null
+++ b/changes/1.x.md
@@ -0,0 +1,716 @@
+## v1.0.9 - 07/03/2017
+
+#### Undo bintray props
+commit 6603ea2112e3281b1974442cfcbe9a6e62f0b9cf<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Mon Jul 3 11:09:32 2017 -0500
+
+#### Add local.properties back to gitignore
+commit 43b2a6cd322a86a4ecc329800a96cabd3729575c<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Mon Jul 3 10:48:36 2017 -0500
+
+#### Remove local properties for travis-ci
+commit c4944e0c24538630687c70a3c02807e2f835e32c<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Mon Jul 3 10:47:26 2017 -0500
+
+#### Remove unused resources
+commit 67543bfeaea1e9d0c2a993d8a3ba06e34163c30c<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Mon Jul 3 10:44:53 2017 -0500
+
+#### Adjust package for return codes
+commit 7486de70fbf295fe975588ba9025149e81c54f33<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Mon Jul 3 10:20:09 2017 -0500
+
+#### More adjustments for Binary
+commit b10efc7e037b7f02dd39aec11a2bbad4b7ca8ca8<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Mon Jul 3 10:00:19 2017 -0500
+
+#### Adjust tests and WiseFy for scope and return unique code for network already configured
+commit 2ddf9f731d11d6cc6f1065ddba7e8863bc145631<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Mon Jul 3 09:28:00 2017 -0500
+
+    close #51
+    close #52
+    close #53
+
+#### Merge branch 'master' into develop
+commit 74b4ae81e645c3d9f637baa030866450ea41412c<br/>
+Merge: fdedcc0 4e22889<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sun Jul 2 15:43:18 2017 -0500
+
+#### Merge branch 'master' into develop
+commit fdedcc03c892f1af56c145e54d3987ebe19058b5<br/>
+Merge: d18109d a0f8a3b<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sun Jul 2 15:42:42 2017 -0500
+
+#### Update CHANGE.md
+commit 4e228895dbf5260824acf27208c76e1433e6dd68<br/>
+Author: Patches <isuPatches@yahoo.com><br/>
+Date:   Sun Jul 2 15:42:15 2017 -0500
+
+#### Merge pull request #49 from isuPatches/develop
+commit a0f8a3bbb2c6631a3566a5970cd6df8e60e73ffc<br/>
+Merge: 0b7a808 d18109d<br/>
+Author: Patches <isuPatches@yahoo.com><br/>
+Date:   Sun Jul 2 15:35:33 2017 -0500
+
+    v1.0.8
+
+## v1.0.8 - 07/02/2017
+
+#### Update Javadocs again
+commit d18109d7c3093015423541151595c7de25ce80c8<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sun Jul 2 14:58:28 2017 -0500
+
+#### Add more tests, switch to String.format, update more libs, and restore travis-ci functionality
+commit db218ba7122453097b696d45bc3a43d9d05ade9c<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sun Jul 2 14:57:17 2017 -0500
+
+#### Test for travis_wait
+commit 2cb4425e5b232b67b936da2e75a99d2fcc1ca310<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sun Jul 2 12:57:35 2017 -0500
+
+#### Update README to include permission blurb
+commit 40ce82ce7c9c00e8b6ef31a08cdba4d7b1c87cc9<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sun Jul 2 09:38:32 2017 -0500
+
+#### Adding travis_wait
+commit 64168a57918dd887ddb8da2de93c134f4d3688c0<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sun Jul 2 09:17:39 2017 -0500
+
+#### Test for travis-ci
+commit b8e5449ea6f23a41a503988dd1c41ad71702b68a<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sun Jul 2 08:53:09 2017 -0500
+
+#### Update test naming schema
+commit 292487515bb1dd5883d5929f84a180066e5d8112<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sun Jul 2 01:26:05 2017 -0500
+
+    close #48
+
+#### Rename GetManagerUtil
+commit 5495cf97f54c5d74bff5a8e2226fe0b4fbd6e077<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Jul 1 23:54:04 2017 -0500
+
+    close #46
+
+#### Update Javadocs, eliminate potential memory leak on Android N
+commit 716997a3d6e88b89e5999603664fc7f748ad4ec4<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Jul 1 23:48:02 2017 -0500
+
+    close #45
+
+#### Adjust scope for withContext, bump some versions, remove potential manifest conflicts
+commit 48def3c09edd2b5ae54129084bc6d2f266396fb2<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Jul 1 23:13:48 2017 -0500
+
+    close #41
+
+#### Merge branch 'master' into develop
+commit c9b9cb726be57e62a925f9ac2d84682e94c2c0b0<br/>
+Merge: b1da078 0b7a808<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Mar 25 23:07:56 2017 -0500
+
+#### Update CHANGE.md
+commit 0b7a808eabd41a2d2eb8fd1a1c29dcd19f1be455<br/>
+Author: Patches <isuPatches@yahoo.com><br/>
+Date:   Sat Mar 25 23:05:20 2017 -0500
+
+#### Merge branch 'master' into develop
+commit b1da078eb48f0b29ba140a8a334a5fd54d242316<br/>
+Merge: e9f087b a836baf<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Mar 25 22:45:21 2017 -0500
+
+## v1.0.7 - 03/25/2017
+
+#### Merge pull request #37 from isuPatches/develop
+commit a836baf09b974ea5332c037e236a153e9f30cf8d<br/>
+Merge: 31217ab e9f087b<br/>
+Author: Patches <isuPatches@yahoo.com><br/>
+Date:   Sat Mar 25 22:44:26 2017 -0500
+
+    v1.0.7
+
+#### Revert Travis CI changes
+commit e9f087beb8f262c3b805843d45a6b7b09cf89546<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Mar 25 22:22:53 2017 -0500
+
+#### Going to try to cut down Travis CI time
+commit ef49b55b20277c3854eece485a827f8c39157b17<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Mar 25 22:10:53 2017 -0500
+
+#### Update deps, update java docs, extract jacoco gradle logic
+commit d3a3a2c343e7b0b8be60a0751d2add05aca571b1<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Mar 25 21:43:40 2017 -0500
+
+#### Merge branch 'master' into develop
+commit 53cdb27b90586128514cf53a0611a1b2f4fd7032<br/>
+Merge: 2a59351 31217ab<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Feb 4 21:19:48 2017 -0600
+
+#### Update CHANGE.md
+commit 31217ab1b96b8e1b4907607050936e73e7e296a0<br/>
+Author: Patches <isuPatches@yahoo.com><br/>
+Date:   Sat Feb 4 21:18:44 2017 -0600
+
+## v1.0.6 - 02/04/2017
+
+#### Merge pull request #36 from isuPatches/develop
+commit 85640461ba06babdc4b37591249af269bec60c28<br/>
+Merge: 7ed8ed1 2a59351<br/>
+Author: Patches <isuPatches@yahoo.com><br/>
+Date:   Sat Feb 4 21:11:52 2017 -0600
+
+    v1.0.6
+
+#### Update README version for release
+commit 2a593513ce0638d04202ff4a9de01cc2cd16b964<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Feb 4 20:47:52 2017 -0600
+
+#### Update bin again
+commit a88e55a64e96e2fe40a3e673b56a669825811462<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Feb 4 20:20:48 2017 -0600
+
+#### Add getFrequency and isNetwork5gHz for >= 21 devices, update javadocs, adjust visibility, library updates, etc.
+commit a83f4fa6a8c3af1b7f357a7259fe420d57950979<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Feb 4 20:19:52 2017 -0600
+
+    close #31
+    close #32
+    close #33
+    close #34
+    close #35
+
+#### Merge branch 'master' into develop
+commit 71a7151f7fdb7471d83f85eeedf46674803ed742<br/>
+Merge: 2c2cafd 7ed8ed1<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Nov 5 14:43:04 2016 -0500
+
+#### Update README.md
+commit 7ed8ed10bab57bf1ae8186e405db181a054f68f4<br/>
+Author: Patches <isuPatches@yahoo.com><br/>
+Date:   Sat Nov 5 14:42:27 2016 -0500
+
+#### Merge branch 'master' into develop
+commit 2c2cafdc09b140e914dfb9b9a14324dbbfb5817b<br/>
+Merge: 7bdd39e 716899f<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Nov 5 14:09:18 2016 -0500
+
+#### Update CHANGE.md
+commit 716899f792b4e88def76da74bcd2fec8df78e463<br/>
+Author: Patches <isuPatches@yahoo.com><br/>
+Date:   Sat Nov 5 14:08:51 2016 -0500
+
+## v1.0.5 - 11/05/2016
+
+#### Merge pull request #29 from isuPatches/develop
+commit 0f670e635c7fe2cd1997446890ec6c6450cd6e9e<br/>
+Merge: ecbe2dc 7bdd39e<br/>
+Author: Patches <isuPatches@yahoo.com><br/>
+Date:   Sat Nov 5 14:06:26 2016 -0500
+
+    v1.0.5
+
+#### Update change and readme files
+commit 7bdd39e8df97158c3f667ed128f4fc0f3466d852<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Nov 5 14:04:30 2016 -0500
+
+#### Adjust file structure for Bintray
+commit 3685c42d198fc700976a57217175c7f8e62f6719<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sun Oct 30 08:35:11 2016 -0500
+
+#### Merge branch 'master' into develop
+commit 3d3e552ab7da0d46f7dd15d1367fd753268dca1d<br/>
+Merge: 948493f ecbe2dc<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 29 21:26:29 2016 -0500
+
+#### Add gradle logic to publish to Binary
+commit 948493f42bd53283f6e7f8162fb9adaefd74b2e4<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 29 21:23:21 2016 -0500
+
+    closes #19
+
+#### Merge pull request #28 from isuPatches/develop
+commit ecbe2dc67a4c9d86324901fb2fae9ff58aaefe92<br/>
+Merge: 7a3014c a41b4b6<br/>
+Author: Patches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 29 18:57:11 2016 -0500
+
+    Add short license to readme
+
+#### Add short license to read
+commit a41b4b6ef55ccbf976ecec4172a90bf20286c0ea<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 29 18:56:35 2016 -0500
+
+## v1.0.4 - 10/29/2016
+
+#### Merge pull request #27 from isuPatches/develop
+commit 7a3014ce415db2f621d39e05193ffa5242c082d6<br/>
+Merge: 5ee444c 3ecb389<br/>
+Author: Patches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 29 18:55:24 2016 -0500
+
+    v1.0.4
+
+#### Update javadoc
+commit 3ecb3893952449ccc71aefa8930af08dd6c6bb2a<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 29 18:53:10 2016 -0500
+
+#### More license stuff
+commit 797008957e441a6e79991f4f06c2f95dd36dfe4d<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 29 18:48:08 2016 -0500
+
+#### Update LICENSE.md
+commit 882f6877a37bbf66324fd4a02a22f7565b62ff3d<br/>
+Author: Patches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 29 18:46:00 2016 -0500
+
+#### Update LICENSE.md
+commit 9d89ef7a6dbeacbce54b93a41a51524b7c60d9cf<br/>
+Author: Patches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 29 18:42:49 2016 -0500
+
+#### Move license to separate file
+commit fb464859eee4a0fe877a00bc0b538c59820b13bf<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 29 18:38:13 2016 -0500
+
+#### Remove unnecessary files
+commit cce36df939677677db363049085027f98dc3229a<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 29 18:35:59 2016 -0500
+
+#### GAH...just work
+commit cb4326f6f2c4af7d3161b6fedd4130d0dac7d658<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 29 18:06:20 2016 -0500
+
+#### Another test
+commit e2755d24f1adb079e146448db6d9db1124f0ad66<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 29 17:46:17 2016 -0500
+
+#### Trying another thing
+commit 5d96b2ad1d4dc0150e6df67f6ac24440968532b9<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 29 17:18:20 2016 -0500
+
+#### Trying a lower API level
+commit 4a94ad26d9c059e8090f059ed622b1633b35e500<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 29 17:02:10 2016 -0500
+
+#### Adjust adoptions
+commit 341cee9340afb9a4f0f891db238a55dcaa39d425<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 29 15:00:38 2016 -0500
+
+#### More updates
+commit ec8bf2898c3ae6e6145fd8b608b63ec3dc47efe0<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 29 14:32:42 2016 -0500
+
+#### Removing signed bit
+commit d00d586869510ea65b366922f38b8bed3c1d1a28<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 29 14:27:55 2016 -0500
+
+#### Another experiment
+commit 9e00962af97bad9cf789c579b3d36b7082018992<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 29 14:06:22 2016 -0500
+
+#### More tinkering
+commit 52fa35942bfe0dfdcfc5410de2610fb397359134<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 29 13:38:41 2016 -0500
+
+#### Update
+commit 1715ec5560ac4dbf7bb0e8526868162e04db4482<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 29 12:59:47 2016 -0500
+
+#### Yet another travis test
+commit 6c7a1a5af877d213e4558c1ebdc33933f79e7f71<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 29 12:43:26 2016 -0500
+
+#### Another test
+commit 221bdbec458e9696b3b6f18124a88307dd2e90fc<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 29 12:22:33 2016 -0500
+
+#### Test
+commit d4e23f60f5236b27eb9047beee6aa3df1e36a24a<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 29 12:14:45 2016 -0500
+
+#### Another potential travis fix
+commit e645fd867f4ca4835780c5c37adfb23960e0aecf<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 29 11:56:55 2016 -0500
+
+#### Another test
+commit 095aed8db9b05224bf0896b41727663a1cb4af78<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 29 11:37:51 2016 -0500
+
+#### Too much logging for Travis
+commit 2e49c408548429a309bc64b2db2a04189f62d927<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 29 11:03:36 2016 -0500
+
+#### Potential fix for travis ci
+commit f7ec203be930bb89e6df07ed8907f6fbd4d46683<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 29 10:49:49 2016 -0500
+
+#### Enforce context through builder constructor
+commit 2a0f5f81a9d918a13fbf260c161e9384544a644b<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Mon Oct 24 00:00:49 2016 -0500
+
+    close #25
+
+#### More crazy experiments
+commit b0a73d81fb16d6580da73559c63fdf30f77a9a70<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sun Oct 23 22:49:29 2016 -0500
+
+#### Update
+commit 196ca252e3903a3957831bdb156e00fdebe77d8d<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sun Oct 23 21:40:28 2016 -0500
+
+####  Spaces
+commit c4d1abc12d482e31920148328a87bd1d9ddd7781<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sun Oct 23 20:56:11 2016 -0500
+
+#### Another try
+commit df6ead8e07adf0fcc1d64657c968927fb3876f9f<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sun Oct 23 20:55:09 2016 -0500
+
+#### Support libs?
+commit fe3ad453bb3edfefd8a2f2960894dbd1cba44f5f<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sun Oct 23 20:25:15 2016 -0500
+
+#### Bump
+commit f87264db901d40b992408dcd1c005ec60b1a74d3<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sun Oct 23 20:11:14 2016 -0500
+
+#### Yet another attempt
+commit ad81e789526d6355e2e9ffe1d6ab16503d1bb975<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sun Oct 23 19:59:50 2016 -0500
+
+#### Another attempt
+commit 7d53c231da354faf2ef3562eee3ca0a6800a6c80<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sun Oct 23 19:50:01 2016 -0500
+
+#### Increment again
+commit 8a0c52c8c4a3435545e0aa5104df3b9366fe5a1f<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sun Oct 23 19:29:03 2016 -0500
+
+#### Trying to bump down build tools
+commit 7b7e36d4bc75f2231b1e8f58d7e37c8d173afd05<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sun Oct 23 19:10:13 2016 -0500
+
+#### Another test
+commit cb5526001046099374991ade4585f1132cef110d<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sun Oct 23 18:28:56 2016 -0500
+
+#### Update travis.yml
+commit ca88ab0ef050795d259aa893a23d5c164d781c8c<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sun Oct 23 17:56:28 2016 -0500
+
+#### One day travis ci will work with me
+commit 035eaa75a5c0a3276926b5b58713499dd2f0216a<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sun Oct 23 14:42:28 2016 -0500
+
+#### Forgot to add tag
+commit 204f753393c2101c08748bd24b1e4ebf06b19717<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sun Oct 23 14:32:31 2016 -0500
+
+#### Add tag, move to ENV variables
+commit fe7f01311d6bab0b26fb411447e55408e9819650<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sun Oct 23 14:21:34 2016 -0500
+
+#### :(
+commit c000de375e4f2863cce68db849fdc371ca09eea5<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sun Oct 23 14:05:23 2016 -0500
+
+#### Add abi
+commit 4b6e3a020af842d44953eceeb5145b6017f37922<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sun Oct 23 13:56:12 2016 -0500
+
+#### Wait for emulator
+commit eb6e5e9ac68884f37de6ae2be620556e4fe766dd<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sun Oct 23 13:47:02 2016 -0500
+
+#### Emulator
+commit acc2615abb18deb4d959701e3a6d9d39baf7754d<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sun Oct 23 13:34:28 2016 -0500
+
+#### Another attempt
+commit d9bc598ed20f37c97d25586d790d7da9618d1c91<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sun Oct 23 13:24:16 2016 -0500
+
+#### Another test
+commit 7b34b0d529de9c7026f7f8604dfe6eac9eee9593<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sun Oct 23 13:19:04 2016 -0500
+
+#### Trying another update
+commit 9164d2cd463923ba132e0fd3db662a79de5a09c5<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sun Oct 23 12:37:02 2016 -0500
+
+#### travis.yml updates
+commit 95829f1ff7a69eed20b71fbafef5e680f01ab9b0<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sun Oct 23 12:32:16 2016 -0500
+
+#### Move travis.yml
+commit 816f72fcac20311ebf5a62a0b35952750de72b5e<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sun Oct 23 12:27:46 2016 -0500
+
+#### Add Travis badge
+commit e04ab71ee15ac0193d528eb94f21a8a655c72724<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sun Oct 23 12:26:39 2016 -0500
+
+#### Builder pattern updates, javadocs, new package name, updated README, and travis config
+commit bdb6ea7c3958cb29dbe80c6f9f5f8bdda9390022<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sun Oct 23 12:20:34 2016 -0500
+
+    close #16
+    close #20
+    close #21
+    close #22
+    close #23
+    close #24
+
+#### Merge branch 'master' into develop
+commit 3512ea1fc44ae55b82125fcf096ecf597819b7e0<br/>
+Merge: 4d45db3 5ee444c<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 22 15:20:48 2016 -0500
+
+#### Merge pull request #18 from isuPatches/develop
+commit 5ee444c66e83ce17730df31f1442daaab09ea328<br/>
+Merge: c8292ba 4d45db3<br/>
+Author: Patches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 22 15:20:18 2016 -0500
+
+    Develop
+
+#### Update docs again
+commit 4d45db3287a278dff512381d994cf05c5e3d1ebb<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 22 15:19:31 2016 -0500
+
+#### Merge branch 'master' into develop
+commit d584eaf2aba3996709fc4c92254004ed03bd3a02<br/>
+Merge: 643dd75 c8292ba<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 22 15:15:40 2016 -0500
+
+#### Update CHANGE.md
+commit c8292baba16805731221cbb07c49e787b946a93c<br/>
+Author: Patches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 22 15:14:57 2016 -0500
+
+## v1.0.3 - 10/22/2016
+
+#### Merge branch 'master' into develop
+commit 643dd759b21bbf9b3062b3566215bf84f02922e2<br/>
+Merge: a9d5f6a 0363b6e<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 22 15:04:35 2016 -0500
+
+#### Merge pull request #17 from isuPatches/develop
+commit 0363b6e3987ba1952f4c2244af94a8848a3d37fb<br/>
+Merge: 2e2246e a9d5f6a<br/>
+Author: Patches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 22 14:57:29 2016 -0500
+
+    v1.0.3
+
+#### Increment versionName and versionCode
+commit a9d5f6aee10545c265680b92477cb33331d3d9f4<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 22 14:56:20 2016 -0500
+
+#### Missed one spot in documentation
+commit 5f839d5fb115ef66cef2fe113ad82623f11ec663<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 22 14:34:59 2016 -0500
+
+#### Update ready
+commit 9895f5dc9567a80b63b5f84fbcd3b884a0cf5106<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 22 14:32:27 2016 -0500
+
+#### Move to builder pattern, use real time values, and update documentation
+commit e61e85e817b542eaa572e527068e911ffdcdcc8e<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 22 14:32:09 2016 -0500
+
+    close #13
+    close #14
+    close #15
+    close #16
+
+#### Merge branch 'master' into develop
+commit 88c05d013caffd7b688cde44b8efea74f69ba3e4
+Merge: cd98623 2e2246e<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 22 04:08:26 2016 -0500
+
+#### More functionality, switching to espresso tests, updating libs, and providing logging option
+commit 2e2246e63fb4dc3b16b3a59c2081b9e9c39c4388<br/>
+Author: isuPatches <isuPatches@yahoo.com><br/>
+Date:   Sat Oct 22 04:08:05 2016 -0500
+
+    closes #9
+    closes #10
+    closes #11
+    closes #12
+
+## v1.0.2 - 04/30/2016
+
+#### Update README.md
+commit cd98623b74763e4d12a0c682b5023fdd5f169d91<br/>
+Author: Patches <isuPatches@yahoo.com><br/>
+Date:   Sat Apr 30 15:02:43 2016 -0500
+
+#### Update CHANGE.md
+commit af298c3a986c4418cf0003e33f9d591daec58dc5<br/>
+Author: Patches <isuPatches@yahoo.com><br/>
+Date:   Sat Apr 30 14:54:13 2016 -0500
+
+#### Create CHANGE.md
+commit c16118744ff2a52881c4af6f4afc8438262888c8<br/>
+Author: Patches <isuPatches@yahoo.com><br/>
+Date:   Sat Apr 30 14:46:44 2016 -0500
+
+#### Merge pull request #7 from isuPatches/develop
+commit cdc66951cfca2a8e964f411f67b6c27a592de222<br/>
+Merge: 3ba209b 12bb210<br/>
+Author: Patches <isuPatches@yahoo.com><br/>
+Date:   Sat Apr 30 14:29:51 2016 -0500
+
+    v1.0.2
+
+#### Increment versionName and versionCode for release
+commit 12bb210b2aa6513b0140a2e6de7594f0e1d0e64f<br/>
+Author: isuPatches <sarah.klinefelter@metova.com><br/>
+Date:   Sat Apr 30 14:27:52 2016 -0500
+
+#### Merge pull request #6 from isuPatches/issue-5
+commit a2aefadc1e46785d6f78c17d6130aa574cb05ac6<br/>
+Merge: 772558b ae81d49<br/>
+Author: Patches <isuPatches@yahoo.com><br/>
+Date:   Sat Apr 30 14:25:29 2016 -0500
+
+    issue-5
+
+#### Adding isWifiEnabled functionality
+commit ae81d49fcac0421cc8d5a10730359e7d1e723aec<br/>
+Author: isuPatches <sarah.klinefelter@metova.com><br/>
+Date:   Sat Apr 30 14:23:43 2016 -0500
+
+## v1.0.1 - 04/28/2016
+
+#### Merge pull request #3 from isuPatches/develop
+commit 3ba209b036b99f6cfd432b76b8e75616cdc1fc1c<br/>
+Merge: db745f2 772558b<br/>
+Author: Patches <isuPatches@yahoo.com><br/>
+Date:   Thu Apr 28 09:07:06 2016 -0500
+
+    Fix README
+
+#### Fix README
+commit 772558bc98f20b42849baf0eeacd012b0b383f0a<br/>
+Author: isuPatches <sarah.klinefelter@metova.com><br/>
+Date:   Thu Apr 28 09:05:24 2016 -0500
+
+#### Merge pull request #1 from isuPatches/develop
+commit db745f25d2caf0768ee259aa11ed0ad57c7d8ee4<br/>
+Merge: 3df4638 b309b1c<br/>
+Author: Patches <isuPatches@yahoo.com><br/>
+Date:   Thu Apr 28 08:57:21 2016 -0500
+
+    v1.0.1
+
+#### Add isSecure functionality
+commit b309b1c0c2550c08e92130c2e8bfb1ef1b0e48db<br/>
+Author: isuPatches <sarah.klinefelter@metova.com><br/>
+Date:   Thu Apr 28 08:53:19 2016 -0500
+
+## v1.0.0 - 04/26/2016
+
+#### Create README.md
+commit 3df46380676592b033a4c512ec6d67e7b4e39ace<br/>
+Author: Patches <isuPatches@yahoo.com><br/>
+Date:   Tue Apr 26 15:25:33 2016 -0500
+
+#### Initial commit
+commit 58826f9cd9002b5407c6bbaa540c49da46eee3f5<br/>
+Author: isuPatches <sarah.klinefelter@metova.com><br/>
+Date:   Tue Apr 26 15:09:41 2016 -0500
diff --git a/changes/2.x.md b/changes/2.x.md
new file mode 100644
index 00000000..e69de29b
diff --git a/documentation/adding_and_removing_networks.md b/documentation/adding_and_removing_networks.md
new file mode 100644
index 00000000..fcff666e
--- /dev/null
+++ b/documentation/adding_and_removing_networks.md
@@ -0,0 +1,122 @@
+#### Via The Synchronous API
+
+To add an open network:
+
+```java
+int addedSuccessfully = mWiseFy.addOpenNetwork("Open Network");
+```
+
+To add a WEP network:
+
+```java
+int addedSuccessfully = mWiseFy.addWEPNetwork("WEP Network", "123456");
+```
+
+To add a WPA2 network:
+
+```java
+int addedSuccessfully = mWiseFy.addWPA2Network("WPA2 Network", "12345678");
+```
+
+To remove a configured network:
+
+```java
+boolean removedSuccessfully = mWiseFy.removeNetwork("SSID to remove");
+```
+
+#### Via The Asynchronous API
+
+To add an open network:
+
+```java
+mWiseFy.addOpenNetwork("Open Network", new AddOpenNetworkCallbacks() {
+    @Override
+    public void addOpenNetworkWiseFyFailure(Integer wisefyReturnCode) {
+
+    }
+
+    @Override
+    public void failureAddingOpenNetwork(Integer wifiManagerReturnCode) {
+
+    }
+
+    @Override
+    public void openNetworkAdded(WifiConfiguration wifiConfiguration) {
+
+    }
+});
+```
+
+To add a WEP network:
+
+```java
+mWiseFy.addWEPNetwork("WEP Network", "123456", new AddWEPNetworkCallbacks() {
+    @Override
+    public void addWEPNetworkWiseFyFailure(Integer wisefyReturnCode) {
+
+    }
+
+    @Override
+    public void failureAddingWEPNetwork(Integer wifiManagerReturnCode) {
+
+    }
+
+    @Override
+    public void wepNetworkAdded(WifiConfiguration wifiConfiguration) {
+
+    }
+});
+```
+
+To add a WPA2 network:
+
+```java
+mWiseFy.addWPA2Network("WPA2 Network", "12345678", new AddWPA2NetworkCallbacks() {
+    @Override
+    public void addWPA2NetworkWiseFyFailure(Integer wisefyReturnCode) {
+
+    }
+
+    @Override
+    public void failureAddingWPA2Network(Integer wifiManagerReturnCode) {
+
+    }
+
+    @Override
+    public void wpa2NetworkAdded(WifiConfiguration wifiConfiguration) {
+
+    }
+});
+```
+
+To remove a configured network:
+
+```java
+mWiseFy.removeNetwork("SSID to remove", new RemoveNetworkCallbacks() {
+    @Override
+    public void failureRemovingNetwork() {
+
+    }
+
+    @Override
+    public void networkNotFoundToRemove() {
+
+    }
+
+    @Override
+    public void networkRemoved() {
+
+    }
+
+    @Override
+    public void removeNetworkWiseFyFailure(Integer wisefyReturnCode) {
+
+    }
+});
+```
+
+***Notes***
+
+- Will return a WiseFy error code if network is already a saved configuration
+- Will return a WiseFy error code if parameter is missing
+- Will return a WiseFy error code if the instance has a missing prerequisite
\ No newline at end of file
diff --git a/documentation/checking_device_connectivity.md b/documentation/checking_device_connectivity.md
new file mode 100644
index 00000000..8044ce76
--- /dev/null
+++ b/documentation/checking_device_connectivity.md
@@ -0,0 +1,31 @@
+#### Via The Synchronous API
+
+To check and see if the device is connected to a mobile network:
+
+```java
+boolean isConnected = mWiseFy.isDeviceConnectedToMobileNetwork();
+```
+
+To check and see if the device is connected to a mobile or wifi network:
+
+```java
+boolean isConnected = mWiseFy.isDeviceConnectedToMobileOrWifiNetwork();
+```
+
+To check and see if the device is connected to a given SSID:
+
+```java
+boolean isConnected = mWiseFy.isDeviceConnectedToSSID("SSID");
+```
+
+To check and see if the device is connected to a wifi network:
+
+```java
+boolean isConnected = mWiseFy.isDeviceConnectedToWifiNetwork();
+```
+
+To check and see if Wifi is enabled on a device:
+
+```java
+boolean wifiEnabled = mWiseFy.isWifiEnabled();
+```
\ No newline at end of file
diff --git a/documentation/connecting_and_disconnecting_from_networks.md b/documentation/connecting_and_disconnecting_from_networks.md
new file mode 100644
index 00000000..81bfe652
--- /dev/null
+++ b/documentation/connecting_and_disconnecting_from_networks.md
@@ -0,0 +1,67 @@
+#### Via The Synchronous API
+
+To connect to a network given an SSID:
+
+```java
+boolean connectedSuccessfully = mWiseFy.connectToNetwork("SSID to connect to", 30000);
+```
+
+To disconnect from current network:
+
+```java
+boolean disconnectedSuccessfully = mWiseFy.disconnectFromCurrentNetwork();
+```
+
+#### Via The Asynchronous API
+
+To connect to a network given an SSID:
+
+```java
+mWiseFy.connectToNetwork("SSID to connect to", 30000, new ConnectToNetworkCallbacks() {
+    @Override
+    public void connectedToNetwork() {
+
+    }
+
+    @Override
+    public void connectToNetworkWiseFyFailure(Integer wisefyReturnCode) {
+
+    }
+
+    @Override
+    public void failureConnectingToNetwork() {
+
+    }
+
+    @Override
+    public void networkNotFoundToConnectTo() {
+
+    }
+});
+```
+
+To disconnect from current network:
+
+```java
+mWiseFy.disconnectFromCurrentNetwork(new DisconnectFromCurrentNetworkCallbacks() {
+    @Override
+    public void disconnectedFromCurrentNetwork() {
+
+    }
+
+    @Override
+    public void disconnectFromCurrentNetworkWiseFyFailure(Integer wisefyReturnCode) {
+
+    }
+
+    @Override
+    public void failureDisconnectingFromCurrentNetwork() {
+
+    }
+});
+```
+
+***Notes***
+
+- Will return a WiseFy error code if parameter is missing
+- Will return a WiseFy error code if the instance has a missing prerequisite
\ No newline at end of file
diff --git a/documentation/current_network.md b/documentation/current_network.md
new file mode 100644
index 00000000..19833bfc
--- /dev/null
+++ b/documentation/current_network.md
@@ -0,0 +1,30 @@
+#### Via The Synchronous API
+
+To get current network:
+
+```java
+WifiInfo currentNetwork = mWiseFy.getCurrentNetwork();
+```
+
+#### Via The Asynchronous API
+
+To get current network:
+
+```java
+mWiseFy.getCurrentNetwork(new GetCurrentNetworkCallbacks() {
+    @Override
+    public void getCurrentNetworkWiseFyFailure(Integer wisefyReturnCode) {
+
+    }
+
+    @Override
+    public void retrievedCurrentNetwork(WifiInfo currentNetwork) {
+
+    }
+});
+```
+
+***Notes***
+
+- Will return a WiseFy error code if parameter is missing
+- Will return a WiseFy error code if the instance has a missing prerequisite
\ No newline at end of file
diff --git a/documentation/enabling_and_disabling_wifi.md b/documentation/enabling_and_disabling_wifi.md
new file mode 100644
index 00000000..aae3b432
--- /dev/null
+++ b/documentation/enabling_and_disabling_wifi.md
@@ -0,0 +1,62 @@
+#### Via The Synchronous API
+
+To disable wifi:
+
+```java
+boolean disabledWifiSuccessfully = mWiseFy.disableWifi();
+```
+
+To enable wifi:
+
+```java
+boolean wifiEnabled = mWiseFy.enableWiFi();
+```
+
+#### Via The Asynchronous API
+
+To disable wifi:
+
+```java
+mWiseFy.disableWifi(new DisableWifiCallbacks() {
+    @Override
+    public void disableWifiWiseFyFailure(Integer wisefyReturnCode) {
+
+    }
+
+    @Override
+    public void failureDisablingWifi() {
+
+    }
+
+    @Override
+    public void wifiDisabled() {
+
+    }
+});
+```
+
+To enable wifi:
+
+```java
+mWiseFy.enableWifi(new EnableWifiCallbacks() {
+    @Override
+    public void enableWifiWiseFyFailure(Integer wisefyReturnCode) {
+
+    }
+
+    @Override
+    public void failureEnablingWifi() {
+
+    }
+
+    @Override
+    public void wifiEnabled() {
+
+    }
+});
+```
+
+***Notes***
+
+- Will return a WiseFy error code if parameter is missing
+- Will return a WiseFy error code if the instance has a missing prerequisite
\ No newline at end of file
diff --git a/documentation/frequency.md b/documentation/frequency.md
new file mode 100644
index 00000000..445e578d
--- /dev/null
+++ b/documentation/frequency.md
@@ -0,0 +1,75 @@
+#### Via The Synchronous API
+
+To get the frequency of the devices current network:<br/><br/>
+<strong>* NOTE *</strong> Only supported on API >= 21
+
+```java
+int frequency = mWiseFy.getFrequency();
+```
+
+To get the frequency of a network:<br/><br/>
+<strong>* NOTE *</strong> Only supported on API >= 21
+
+```java
+int frequency = mWiseFy.getFrequency(wifiInfo);
+```
+
+To check if the device's current network is 5gHz:<br/><br/>
+<strong>* NOTE *</strong> Only supported on API >= 21
+
+```java
+boolean is5gHz = mWiseFy.isNetwork5gHz();
+```
+
+To check if a network is 5gHz:<br/><br/>
+<strong>* NOTE *</strong> Only supported on API >= 21
+
+```java
+boolean is5gHz = mWiseFy.isNetwork5gHz(wifiInfo);
+```
+
+#### Via The Asynchronous API
+
+To get the frequency of the devices current network:<br/><br/>
+<strong>* NOTE *</strong> Only supported on API >= 21
+
+```java
+mWiseFy.getFrequency(new GetFrequencyCallbacks() {
+    @Override
+    public void failureGettingFrequency() {
+
+    }
+
+    @Override
+    public void getFrequencyWiseFyFailure(Integer wisefyReturnCode) {
+
+    }
+
+    @Override
+    public void retrievedFrequency(int frequency) {
+
+    }
+});
+```
+
+To get the frequency of a network:<br/><br/>
+<strong>* NOTE *</strong> Only supported on API >= 21
+
+```java
+mWiseFy.getFrequency(wifiInfo, new GetFrequencyCallbacks() {
+    @Override
+    public void failureGettingFrequency() {
+
+    }
+
+    @Override
+    public void getFrequencyWiseFyFailure(Integer wisefyReturnCode) {
+
+    }
+
+    @Override
+    public void retrievedFrequency(int frequency) {
+
+    }
+});
+```
\ No newline at end of file
diff --git a/documentation/nearby_access_points.md b/documentation/nearby_access_points.md
new file mode 100644
index 00000000..c4440098
--- /dev/null
+++ b/documentation/nearby_access_points.md
@@ -0,0 +1,86 @@
+#### Via The Synchronous API
+
+To get nearby access points:<br/><br/>
+<strong>Setting filterDuplicates to true will not return SSIDs with a weaker signal strength (will always take the highest)</strong>
+
+```java
+List<ScanResult> nearbyAccessPoints = mWiseFy.getNearbyAccessPoints(true);
+```
+
+To search for an SSID given a regex (will return first match):
+
+```java
+String ssid = mWiseFy.searchForSSID("regex for SSID", 3000);
+```
+
+To search for all SSIDs matching a given regex:
+
+```java
+List<String> ssids = mWiseFy.searchForSSIDs("regex for SSIDs");
+```
+
+#### Via The Asynchronous API
+
+To get all nearby access points:<br/><br/>
+<strong>Setting filterDuplicates to true will not return SSIDs with a weaker signal strength (will always take the highest)</strong>
+
+```java
+WiseFy.getNearbyAccessPoints(true, new GetNearbyAccessPointsCallbacks() {
+    @Override
+    public void getNearbyAccessPointsWiseFyFailure(Integer wisefyReturnCode) {
+
+    }
+
+    @Override
+    public void retrievedNearbyAccessPoints(List<ScanResult> nearbyAccessPoints) {
+
+    }
+});
+```
+
+To search for an SSID given a regex (will return first match):
+
+```java
+mWiseFy.searchForSSID("regex for SSID", 3000, new SearchForSSIDCallbacks() {
+    @Override
+    public void searchForSSIDWiseFyFailure(Integer wisefyReturnCode) {
+
+    }
+
+    @Override
+    public void ssidFound(String ssid) {
+
+    }
+
+    @Override
+    public void ssidNotFound() {
+
+    }
+});
+```
+
+To search for all SSIDs matching a given regex:
+
+```java
+mWiseFy.searchForSSIDs("regex for SSIDs", new SearchForSSIDsCallbacks() {
+    @Override
+    public void searchForSSIDsWiseFyFailure(Integer wisefyReturnCode) {
+
+    }
+
+    @Override
+    public void retrievedSSIDs(List<String> ssids) {
+
+    }
+
+    @Override
+    public void noSSIDsFound() {
+
+    }
+});
+```
+
+***Notes***
+
+- Will return a WiseFy error code if parameter is missing
+- Will return a WiseFy error code if the instance has a missing prerequisite
\ No newline at end of file
diff --git a/documentation/network_security.md b/documentation/network_security.md
new file mode 100644
index 00000000..2a816987
--- /dev/null
+++ b/documentation/network_security.md
@@ -0,0 +1,37 @@
+#### Via The Synchronous API
+
+To check and see if a network is secure (defined by having EAP/PSK/WPA/WPA2 capabilities):
+
+```java
+boolean isSecure = mWiseFy.isNetworkSecure(scanResult);
+```
+
+To check and see if a network has EAP capabilities):
+
+```java
+boolean hasEAPCapabilities = mWiseFy.isNetworkEAP(scanResult);
+```
+
+To check and see if a network has PSK capabilities):
+
+```java
+boolean hasPSKCapabilities = mWiseFy.isNetworkPSK(scanResult);
+```
+
+To check and see if a network has WEP capabilities):
+
+```java
+boolean hasWEPCapabilities = mWiseFy.isNetworkWEP(scanResult);
+```
+
+To check and see if a network has WPA capabilities):
+
+```java
+boolean hasWPACapabilities = mWiseFy.isNetworkWPA(scanResult);
+```
+
+To check and see if a network has WPA2 capabilities):
+
+```java
+boolean hasWPA2Capabilities = mWiseFy.isNetworkWPA2(scanResult);
+```
\ No newline at end of file
diff --git a/documentation/permissions_example.md b/documentation/permissions_example.md
new file mode 100644
index 00000000..0aeda3a8
--- /dev/null
+++ b/documentation/permissions_example.md
@@ -0,0 +1,162 @@
+The `ACCESS_COARSE_LOCATION` location permission is necessary to query for nearby access points.
+
+First we define the permissions in the manifest:
+
+```xml
+ <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+
+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+ <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+```
+
+Then on the activity using WiseFy then we can start asking for permissions and handling the permission callbacks.
+
+```java
+package wisefy_sample.isupatches.com.wisefysample.ui;
+
+
+import android.content.pm.PackageManager;
+import android.net.wifi.ScanResult;
+import android.support.annotation.NonNull;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.util.Log;
+import com.isupatches.wisefy.WiseFy;
+import com.isupatches.wisefy.callbacks.GetNearbyAccessPointsCallbacks;
+import java.util.List;
+import wisefy_sample.isupatches.com.wisefysample.R;
+import wisefy_sample.isupatches.com.wisefysample.constants.Permissions;
+import wisefy_sample.isupatches.com.wisefysample.util.PermissionUtil;
+import static android.Manifest.permission.ACCESS_COARSE_LOCATION;
+
+
+public class MainActivity extends AppCompatActivity {
+
+    private static final String TAG = MainActivity.class.getSimpleName();
+
+    private WiseFy mWiseFy;
+
+    private PermissionUtil mPermissionUtil = PermissionUtil.getInstance();
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        if (checkForPermissions()) {
+            getNearbyAccessPoints();
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        mWiseFy.dump();
+    }
+
+    private boolean checkForPermissions() {
+        return isPermissionGranted(ACCESS_COARSE_LOCATION, R.string.access_course_location_permission_rationale, Permissions.ACCESS_COARSE_LOCATION_RESULT_CODE);
+    }
+
+    public boolean isPermissionGranted(String permission, int rationaleResId, int requestCode) {
+        if (mPermissionUtil.permissionNotGranted(this, permission)) {
+            if (mPermissionUtil.shouldShowPermissionRationale(this, permission)) {
+                // Display dialog or rationale for requesting permission here
+            } else {
+                mPermissionUtil.requestPermissions(this, new String[]{permission}, requestCode);
+            }
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String permissions[], @NonNull int[] grantResults) {
+        switch (requestCode) {
+            case Permissions.ACCESS_COARSE_LOCATION_RESULT_CODE:
+                if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                    Log.d(TAG, "Access course location permission granted");
+                    // Continue WiseFy logic here
+                } else {
+                    Log.e(TAG, "Access course location permission denied");
+                    // Display permission error here
+                }
+                break;
+            default:
+                Log.wtf(TAG, "Weird permission requested, not handled");
+                // Display permission error here
+                break;
+        }
+    }
+
+    private void getNearbyAccessPoints() {
+        mWiseFy = new WiseFy.brains(this).logging(true).getSmarts();
+
+        mWiseFy.getNearbyAccessPoints(true, new GetNearbyAccessPointsCallbacks() {
+            @Override
+            public void getNearbyAccessPointsWiseFyFailure(Integer integer) {
+
+            }
+
+            @Override
+            public void retrievedNearbyAccessPoints(List<ScanResult> list) {
+                // You should see this populate with results after approving the
+                // the ACCESS_COARSE_LOCATION permission
+                Log.d(TAG, "List: " + list.toString());
+            }
+        });
+    }
+}
+```
+
+In this example, PermissionUtil is just an abstracted, shared piece of logic:
+
+```java
+package wisefy_sample.isupatches.com.wisefysample.util;
+
+
+import android.app.Activity;
+import android.content.pm.PackageManager;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
+
+
+public class PermissionUtil {
+
+    private static final PermissionUtil PERMISSION_UTIL = new PermissionUtil();
+
+    private PermissionUtil() {
+
+    }
+
+    public static PermissionUtil getInstance() {
+        return PERMISSION_UTIL;
+    }
+
+    public boolean permissionNotGranted(Activity activity, String permission) {
+        return ContextCompat.checkSelfPermission(activity, permission) != PackageManager.PERMISSION_GRANTED;
+    }
+
+    public boolean shouldShowPermissionRationale(Activity activity, String permission) {
+        return ActivityCompat.shouldShowRequestPermissionRationale(activity, permission);
+    }
+
+    public void requestPermissions(Activity activity, String[] permissions, int requestCode) {
+        ActivityCompat.requestPermissions(activity, permissions, requestCode);
+    }
+}
+```
+
+And there is a class for storing constants for permission checks:
+
+```java
+package wisefy_sample.isupatches.com.wisefysample.constants;
+
+
+public class Permissions {
+    public static final int ACCESS_COARSE_LOCATION_RESULT_CODE = 1;
+}
+```
\ No newline at end of file
diff --git a/documentation/rssi.md b/documentation/rssi.md
new file mode 100644
index 00000000..5246672d
--- /dev/null
+++ b/documentation/rssi.md
@@ -0,0 +1,47 @@
+#### Via The Synchronous API
+
+To calculate number of bars given a networks signal strength and total number of bars:
+
+```java
+int bars = mWiseFy.calculateBars(-35, 5);
+```
+
+To compare the signal strength of two networks:
+
+```java
+int result = mWiseFy.compareSignalLevel(-35, -70);
+```
+
+To get the RSSI of the first SSID matching a given regex:
+
+```java
+Integer rssi = mWiseFy.getRSSI("regex for SSID", true, 3000);
+```
+
+#### Via The Asynchronous API
+
+To get the RSSI of the first SSID matching a given regex:
+
+```java
+mWiseFy.getRSSI("regex for SSID", true, 3000, new GetRSSICallbacks() {
+    @Override
+    public void retrievedRSSI(Integer rssi) {
+
+    }
+
+    @Override
+    public void networkNotFoundToRetrieveRSSI() {
+
+    }
+
+    @Override
+    public void getRSSIWiseFyFailure(Integer wisefyReturnCode) {
+
+    }
+});
+```
+
+***Notes***
+
+- Will return a WiseFy error code if parameter is missing
+- Will return a WiseFy error code if the instance has a missing prerequisite
\ No newline at end of file
diff --git a/documentation/saved_networks.md b/documentation/saved_networks.md
new file mode 100644
index 00000000..415ddde9
--- /dev/null
+++ b/documentation/saved_networks.md
@@ -0,0 +1,92 @@
+#### Via The Synchronous API
+
+To get the first saved network that matches a given regex:
+
+```java
+WifiConfiguration savedNetwork = mWiseFy.getSavedNetwork("regex for SSID");
+```
+
+To retrieve all of the saved networks:
+
+```java
+List<WifiConfiguration> savedNetworks = mWiseFy.getSavedNetworks();
+```
+
+To return all saved networks that match a given regex:
+
+```java
+List<WifiConfiguration> savedNetworks = mWiseFy.getSavedNetworks("regex for SSID");
+```
+
+To check and see if a given SSID is in the devices set of configured networks:
+
+```java
+boolean isConfigured = mWiseFy.isNetworkInConfigurationList("regex for SSID");
+```
+
+#### Via The Asynchronous API
+
+To get the first saved network that matches a given regex:
+
+```java
+  mWiseFy.getSavedNetwork("regex for SSID", new GetSavedNetworkCallbacks() {
+    @Override
+    public void getSavedNetworkWiseFyFailure(Integer wisefyReturnCode) {
+
+    }
+
+    @Override
+    public void savedNetworkNotFound() {
+
+    }
+
+    @Override
+    public void retrievedSavedNetwork(WifiConfiguration savedNetwork) {
+
+    }
+});
+```
+To retrieve all of the saved networks:
+
+```java
+mWiseFy.getSavedNetworks(new GetSavedNetworksCallbacks() {
+    @Override
+    public void getSavedNetworksWiseFyFailure(Integer wisefyReturnCode) {
+
+    }
+
+    @Override
+    public void noSavedNetworksFound() {
+
+    }
+
+    @Override
+    public void retrievedSavedNetworks(List<WifiConfiguration> savedNetworks) {
+
+    }
+});
+```
+To return all saved networks that match a given regex:
+
+```java
+mWiseFy.getSavedNetwork("regex for SSID", new GetSavedNetworkCallbacks() {
+    @Override
+    public void getSavedNetworkWiseFyFailure(Integer wisefyReturnCode) {
+
+    }
+
+    @Override
+    public void savedNetworkNotFound() {
+
+    }
+
+    @Override
+    public void retrievedSavedNetwork(WifiConfiguration savedNetwork) {
+
+    }
+});
+```
+***Notes***
+
+- Will return a WiseFy error code if parameter is missing
+- Will return a WiseFy error code if the instance has a missing prerequisite
\ No newline at end of file
diff --git a/javadoc/allclasses-frame.html b/javadoc/allclasses-frame.html
index 77fd708d..d8c55f18 100644
--- a/javadoc/allclasses-frame.html
+++ b/javadoc/allclasses-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Tue Jul 04 09:39:45 CDT 2017 -->
-<title>All Classes (wisefy 1.0.10 API)</title>
-<meta name="date" content="2017-07-04">
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>All Classes (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -12,14 +12,40 @@
 <h1 class="bar">All&nbsp;Classes</h1>
 <div class="indexContainer">
 <ul>
+<li><a href="com/isupatches/wisefy/callbacks/AddOpenNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks" target="classFrame"><span class="interfaceName">AddOpenNetworkCallbacks</span></a></li>
+<li><a href="com/isupatches/wisefy/callbacks/AddWEPNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks" target="classFrame"><span class="interfaceName">AddWEPNetworkCallbacks</span></a></li>
+<li><a href="com/isupatches/wisefy/callbacks/AddWPA2NetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks" target="classFrame"><span class="interfaceName">AddWPA2NetworkCallbacks</span></a></li>
+<li><a href="com/isupatches/wisefy/annotations/Async.html" title="annotation in com.isupatches.wisefy.annotations" target="classFrame">Async</a></li>
+<li><a href="com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations" target="classFrame">CallingThread</a></li>
 <li><a href="com/isupatches/wisefy/constants/Capabilities.html" title="class in com.isupatches.wisefy.constants" target="classFrame">Capabilities</a></li>
+<li><a href="com/isupatches/wisefy/callbacks/ConnectToNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks" target="classFrame"><span class="interfaceName">ConnectToNetworkCallbacks</span></a></li>
+<li><a href="com/isupatches/wisefy/callbacks/DisableWifiCallbacks.html" title="interface in com.isupatches.wisefy.callbacks" target="classFrame"><span class="interfaceName">DisableWifiCallbacks</span></a></li>
+<li><a href="com/isupatches/wisefy/callbacks/DisconnectFromCurrentNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks" target="classFrame"><span class="interfaceName">DisconnectFromCurrentNetworkCallbacks</span></a></li>
+<li><a href="com/isupatches/wisefy/callbacks/EnableWifiCallbacks.html" title="interface in com.isupatches.wisefy.callbacks" target="classFrame"><span class="interfaceName">EnableWifiCallbacks</span></a></li>
+<li><a href="com/isupatches/wisefy/callbacks/GetCurrentNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks" target="classFrame"><span class="interfaceName">GetCurrentNetworkCallbacks</span></a></li>
+<li><a href="com/isupatches/wisefy/callbacks/GetFrequencyCallbacks.html" title="interface in com.isupatches.wisefy.callbacks" target="classFrame"><span class="interfaceName">GetFrequencyCallbacks</span></a></li>
+<li><a href="com/isupatches/wisefy/callbacks/GetNearbyAccessPointsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks" target="classFrame"><span class="interfaceName">GetNearbyAccessPointsCallbacks</span></a></li>
+<li><a href="com/isupatches/wisefy/callbacks/GetRSSICallbacks.html" title="interface in com.isupatches.wisefy.callbacks" target="classFrame"><span class="interfaceName">GetRSSICallbacks</span></a></li>
+<li><a href="com/isupatches/wisefy/callbacks/GetSavedNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks" target="classFrame"><span class="interfaceName">GetSavedNetworkCallbacks</span></a></li>
+<li><a href="com/isupatches/wisefy/callbacks/GetSavedNetworksCallbacks.html" title="interface in com.isupatches.wisefy.callbacks" target="classFrame"><span class="interfaceName">GetSavedNetworksCallbacks</span></a></li>
 <li><a href="com/isupatches/wisefy/util/LogUtil.html" title="class in com.isupatches.wisefy.util" target="classFrame">LogUtil</a></li>
 <li><a href="com/isupatches/wisefy/util/ManagerUtil.html" title="class in com.isupatches.wisefy.util" target="classFrame">ManagerUtil</a></li>
 <li><a href="com/isupatches/wisefy/constants/NetworkTypes.html" title="class in com.isupatches.wisefy.constants" target="classFrame">NetworkTypes</a></li>
+<li><a href="com/isupatches/wisefy/callbacks/RemoveNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks" target="classFrame"><span class="interfaceName">RemoveNetworkCallbacks</span></a></li>
+<li><a href="com/isupatches/wisefy/callbacks/SearchForAccessPointCallbacks.html" title="interface in com.isupatches.wisefy.callbacks" target="classFrame"><span class="interfaceName">SearchForAccessPointCallbacks</span></a></li>
+<li><a href="com/isupatches/wisefy/callbacks/SearchForAccessPointsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks" target="classFrame"><span class="interfaceName">SearchForAccessPointsCallbacks</span></a></li>
+<li><a href="com/isupatches/wisefy/callbacks/SearchForSSIDCallbacks.html" title="interface in com.isupatches.wisefy.callbacks" target="classFrame"><span class="interfaceName">SearchForSSIDCallbacks</span></a></li>
+<li><a href="com/isupatches/wisefy/callbacks/SearchForSSIDsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks" target="classFrame"><span class="interfaceName">SearchForSSIDsCallbacks</span></a></li>
+<li><a href="com/isupatches/wisefy/util/SleepUtil.html" title="class in com.isupatches.wisefy.util" target="classFrame">SleepUtil</a></li>
 <li><a href="com/isupatches/wisefy/util/SSIDUtil.html" title="class in com.isupatches.wisefy.util" target="classFrame">SSIDUtil</a></li>
+<li><a href="com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations" target="classFrame">Sync</a></li>
+<li><a href="com/isupatches/wisefy/annotations/WaitsForTimeout.html" title="annotation in com.isupatches.wisefy.annotations" target="classFrame">WaitsForTimeout</a></li>
+<li><a href="com/isupatches/wisefy/util/WifiConfigurationUtil.html" title="class in com.isupatches.wisefy.util" target="classFrame">WifiConfigurationUtil</a></li>
 <li><a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy" target="classFrame">WiseFy</a></li>
-<li><a href="com/isupatches/wisefy/WiseFy.withContext.html" title="class in com.isupatches.wisefy" target="classFrame">WiseFy.withContext</a></li>
+<li><a href="com/isupatches/wisefy/WiseFy.brains.html" title="class in com.isupatches.wisefy" target="classFrame">WiseFy.brains</a></li>
 <li><a href="com/isupatches/wisefy/constants/WiseFyCodes.html" title="class in com.isupatches.wisefy.constants" target="classFrame">WiseFyCodes</a></li>
+<li><a href="com/isupatches/wisefy/threads/WiseFyHandlerThread.html" title="class in com.isupatches.wisefy.threads" target="classFrame">WiseFyHandlerThread</a></li>
+<li><a href="com/isupatches/wisefy/annotations/WiseFyThread.html" title="annotation in com.isupatches.wisefy.annotations" target="classFrame">WiseFyThread</a></li>
 </ul>
 </div>
 </body>
diff --git a/javadoc/allclasses-noframe.html b/javadoc/allclasses-noframe.html
index 59b0f2e6..915cfe67 100644
--- a/javadoc/allclasses-noframe.html
+++ b/javadoc/allclasses-noframe.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Tue Jul 04 09:39:45 CDT 2017 -->
-<title>All Classes (wisefy 1.0.10 API)</title>
-<meta name="date" content="2017-07-04">
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>All Classes (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -12,14 +12,40 @@
 <h1 class="bar">All&nbsp;Classes</h1>
 <div class="indexContainer">
 <ul>
+<li><a href="com/isupatches/wisefy/callbacks/AddOpenNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="interfaceName">AddOpenNetworkCallbacks</span></a></li>
+<li><a href="com/isupatches/wisefy/callbacks/AddWEPNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="interfaceName">AddWEPNetworkCallbacks</span></a></li>
+<li><a href="com/isupatches/wisefy/callbacks/AddWPA2NetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="interfaceName">AddWPA2NetworkCallbacks</span></a></li>
+<li><a href="com/isupatches/wisefy/annotations/Async.html" title="annotation in com.isupatches.wisefy.annotations">Async</a></li>
+<li><a href="com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations">CallingThread</a></li>
 <li><a href="com/isupatches/wisefy/constants/Capabilities.html" title="class in com.isupatches.wisefy.constants">Capabilities</a></li>
+<li><a href="com/isupatches/wisefy/callbacks/ConnectToNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="interfaceName">ConnectToNetworkCallbacks</span></a></li>
+<li><a href="com/isupatches/wisefy/callbacks/DisableWifiCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="interfaceName">DisableWifiCallbacks</span></a></li>
+<li><a href="com/isupatches/wisefy/callbacks/DisconnectFromCurrentNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="interfaceName">DisconnectFromCurrentNetworkCallbacks</span></a></li>
+<li><a href="com/isupatches/wisefy/callbacks/EnableWifiCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="interfaceName">EnableWifiCallbacks</span></a></li>
+<li><a href="com/isupatches/wisefy/callbacks/GetCurrentNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="interfaceName">GetCurrentNetworkCallbacks</span></a></li>
+<li><a href="com/isupatches/wisefy/callbacks/GetFrequencyCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="interfaceName">GetFrequencyCallbacks</span></a></li>
+<li><a href="com/isupatches/wisefy/callbacks/GetNearbyAccessPointsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="interfaceName">GetNearbyAccessPointsCallbacks</span></a></li>
+<li><a href="com/isupatches/wisefy/callbacks/GetRSSICallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="interfaceName">GetRSSICallbacks</span></a></li>
+<li><a href="com/isupatches/wisefy/callbacks/GetSavedNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="interfaceName">GetSavedNetworkCallbacks</span></a></li>
+<li><a href="com/isupatches/wisefy/callbacks/GetSavedNetworksCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="interfaceName">GetSavedNetworksCallbacks</span></a></li>
 <li><a href="com/isupatches/wisefy/util/LogUtil.html" title="class in com.isupatches.wisefy.util">LogUtil</a></li>
 <li><a href="com/isupatches/wisefy/util/ManagerUtil.html" title="class in com.isupatches.wisefy.util">ManagerUtil</a></li>
 <li><a href="com/isupatches/wisefy/constants/NetworkTypes.html" title="class in com.isupatches.wisefy.constants">NetworkTypes</a></li>
+<li><a href="com/isupatches/wisefy/callbacks/RemoveNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="interfaceName">RemoveNetworkCallbacks</span></a></li>
+<li><a href="com/isupatches/wisefy/callbacks/SearchForAccessPointCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="interfaceName">SearchForAccessPointCallbacks</span></a></li>
+<li><a href="com/isupatches/wisefy/callbacks/SearchForAccessPointsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="interfaceName">SearchForAccessPointsCallbacks</span></a></li>
+<li><a href="com/isupatches/wisefy/callbacks/SearchForSSIDCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="interfaceName">SearchForSSIDCallbacks</span></a></li>
+<li><a href="com/isupatches/wisefy/callbacks/SearchForSSIDsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="interfaceName">SearchForSSIDsCallbacks</span></a></li>
+<li><a href="com/isupatches/wisefy/util/SleepUtil.html" title="class in com.isupatches.wisefy.util">SleepUtil</a></li>
 <li><a href="com/isupatches/wisefy/util/SSIDUtil.html" title="class in com.isupatches.wisefy.util">SSIDUtil</a></li>
+<li><a href="com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations">Sync</a></li>
+<li><a href="com/isupatches/wisefy/annotations/WaitsForTimeout.html" title="annotation in com.isupatches.wisefy.annotations">WaitsForTimeout</a></li>
+<li><a href="com/isupatches/wisefy/util/WifiConfigurationUtil.html" title="class in com.isupatches.wisefy.util">WifiConfigurationUtil</a></li>
 <li><a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></li>
-<li><a href="com/isupatches/wisefy/WiseFy.withContext.html" title="class in com.isupatches.wisefy">WiseFy.withContext</a></li>
+<li><a href="com/isupatches/wisefy/WiseFy.brains.html" title="class in com.isupatches.wisefy">WiseFy.brains</a></li>
 <li><a href="com/isupatches/wisefy/constants/WiseFyCodes.html" title="class in com.isupatches.wisefy.constants">WiseFyCodes</a></li>
+<li><a href="com/isupatches/wisefy/threads/WiseFyHandlerThread.html" title="class in com.isupatches.wisefy.threads">WiseFyHandlerThread</a></li>
+<li><a href="com/isupatches/wisefy/annotations/WiseFyThread.html" title="annotation in com.isupatches.wisefy.annotations">WiseFyThread</a></li>
 </ul>
 </div>
 </body>
diff --git a/javadoc/com/isupatches/wisefy/WiseFy.brains.html b/javadoc/com/isupatches/wisefy/WiseFy.brains.html
new file mode 100644
index 00000000..7dc17b9b
--- /dev/null
+++ b/javadoc/com/isupatches/wisefy/WiseFy.brains.html
@@ -0,0 +1,320 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>WiseFy.brains (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="WiseFy.brains (wisefy 2.0.0-BETA API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-all.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../index.html?com/isupatches/wisefy/WiseFy.brains.html" target="_top">Frames</a></li>
+<li><a href="WiseFy.brains.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">com.isupatches.wisefy</div>
+<h2 title="Class WiseFy.brains" class="title">Class WiseFy.brains</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>com.isupatches.wisefy.WiseFy.brains</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>Enclosing class:</dt>
+<dd><a href="../../../com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public static class <span class="typeNameLabel">WiseFy.brains</span>
+extends java.lang.Object</pre>
+<div class="block">Static class for builder pattern
+
+ Implements builder interfaces #<code>Logging</code> #<code>GetSmarts</code></div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.brains.html#brains-android.content.Context-">brains</a></span>(android.content.Context&nbsp;context)</code>
+<div class="block">Mandatory - The public constructor for the builder that requires a context</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code><a href="../../../com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.brains.html#getSmarts--">getSmarts</a></span>()</code>
+<div class="block">Mandatory - To build and return a WiseFy instance
+
+ Must be called after brains
+ <a href="../../../com/isupatches/wisefy/WiseFy.brains.html" title="class in com.isupatches.wisefy"><code>WiseFy.brains</code></a></div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="../../../com/isupatches/wisefy/WiseFy.brains.html" title="class in com.isupatches.wisefy">WiseFy.brains</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.brains.html#logging-boolean-">logging</a></span>(boolean&nbsp;loggingEnabled)</code>
+<div class="block">Optional - Builder method that enables/disables logging for a WiseWy instance</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="brains-android.content.Context-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>brains</h4>
+<pre>public&nbsp;brains(android.content.Context&nbsp;context)</pre>
+<div class="block">Mandatory - The public constructor for the builder that requires a context</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>context</code> - The activity or application context to get a WifiConfiguration and
+ ConnectivityManager instance</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getSmarts--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getSmarts</h4>
+<pre>public&nbsp;<a href="../../../com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a>&nbsp;getSmarts()</pre>
+<div class="block">Mandatory - To build and return a WiseFy instance
+
+ Must be called after brains
+ <a href="../../../com/isupatches/wisefy/WiseFy.brains.html" title="class in com.isupatches.wisefy"><code>WiseFy.brains</code></a></div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>WiseFy - The instance created by the builder</dd>
+</dl>
+</li>
+</ul>
+<a name="logging-boolean-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>logging</h4>
+<pre>public&nbsp;<a href="../../../com/isupatches/wisefy/WiseFy.brains.html" title="class in com.isupatches.wisefy">WiseFy.brains</a>&nbsp;logging(boolean&nbsp;loggingEnabled)</pre>
+<div class="block">Optional - Builder method that enables/disables logging for a WiseWy instance</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>loggingEnabled</code> - If logging is enabled or disabled for an instance
+ <code>Logging</code></dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>brains - The builder with updated logging setting</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-all.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../index.html?com/isupatches/wisefy/WiseFy.brains.html" target="_top">Frames</a></li>
+<li><a href="WiseFy.brains.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/com/isupatches/wisefy/WiseFy.html b/javadoc/com/isupatches/wisefy/WiseFy.html
index 8b08d5cf..52fd8017 100644
--- a/javadoc/com/isupatches/wisefy/WiseFy.html
+++ b/javadoc/com/isupatches/wisefy/WiseFy.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Tue Jul 04 09:39:44 CDT 2017 -->
-<title>WiseFy (wisefy 1.0.10 API)</title>
-<meta name="date" content="2017-07-04">
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>WiseFy (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -12,13 +12,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="WiseFy (wisefy 1.0.10 API)";
+            parent.document.title="WiseFy (wisefy 2.0.0-BETA API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":10,"i43":10,"i44":10,"i45":10,"i46":10,"i47":10,"i48":10,"i49":10,"i50":10,"i51":10,"i52":10,"i53":10,"i54":10,"i55":10,"i56":10,"i57":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -49,7 +49,7 @@
 <div class="subNav">
 <ul class="navList">
 <li>Prev&nbsp;Class</li>
-<li><a href="../../../com/isupatches/wisefy/WiseFy.withContext.html" title="class in com.isupatches.wisefy"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../com/isupatches/wisefy/WiseFy.brains.html" title="class in com.isupatches.wisefy"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../index.html?com/isupatches/wisefy/WiseFy.html" target="_top">Frames</a></li>
@@ -110,9 +110,8 @@ <h2 title="Class WiseFy" class="title">Class WiseFy</h2>
 <br>
 <pre>public class <span class="typeNameLabel">WiseFy</span>
 extends java.lang.Object</pre>
-<div class="block">Main class to manipulate and query network settings on an Android device
-
- Uses the builder pattern for creation - <a href="../../../com/isupatches/wisefy/WiseFy.withContext.html" title="class in com.isupatches.wisefy"><code>WiseFy.withContext</code></a></div>
+<div class="block">Main class for WiseFy that provides a synchronous and asynchronous API to manipulate and query
+ for different parts of a device's wifi configuration and status.</div>
 </li>
 </ul>
 </div>
@@ -133,7 +132,7 @@ <h3>Nested Class Summary</h3>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.withContext.html" title="class in com.isupatches.wisefy">WiseFy.withContext</a></span></code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.brains.html" title="class in com.isupatches.wisefy">WiseFy.brains</a></span></code>
 <div class="block">Static class for builder pattern
 
  Implements builder interfaces #<code>Logging</code> #<code>GetSmarts</code></div>
@@ -159,17 +158,9 @@ <h3>Field Summary</h3>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#MAX_FREQUENCY_5GHZ">MAX_FREQUENCY_5GHZ</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>android.net.ConnectivityManager</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#mConnectivityManager">mConnectivityManager</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#MIN_FREQUENCY_5GHZ">MIN_FREQUENCY_5GHZ</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
-<td class="colFirst"><code>android.net.wifi.WifiManager</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#mWifiManager">mWifiManager</a></span></code>&nbsp;</td>
-</tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#WIFI_MANAGER_FAILURE">WIFI_MANAGER_FAILURE</a></span></code>&nbsp;</td>
@@ -192,86 +183,159 @@ <h3>Method Summary</h3>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#addOpenNetwork-java.lang.String-">addOpenNetwork</a></span>(java.lang.String&nbsp;ssid)</code>
-<div class="block">To add an open network to the user's configured network list</div>
+<div class="block">To add an open network to the user's configured network list (synchronously)</div>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#addOpenNetwork-java.lang.String-com.isupatches.wisefy.callbacks.AddOpenNetworkCallbacks-">addOpenNetwork</a></span>(java.lang.String&nbsp;ssid,
+              <a href="../../../com/isupatches/wisefy/callbacks/AddOpenNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">AddOpenNetworkCallbacks</a>&nbsp;callbacks)</code>
+<div class="block">To add an open network to the user's configured network list (asynchronously)</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#addWEPNetwork-java.lang.String-java.lang.String-">addWEPNetwork</a></span>(java.lang.String&nbsp;ssid,
              java.lang.String&nbsp;password)</code>
-<div class="block">To add a WEP network to the user's configured network list</div>
+<div class="block">To add a WEP network to the user's configured network list (synchronously)</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#addWEPNetwork-java.lang.String-java.lang.String-com.isupatches.wisefy.callbacks.AddWEPNetworkCallbacks-">addWEPNetwork</a></span>(java.lang.String&nbsp;ssid,
+             java.lang.String&nbsp;password,
+             <a href="../../../com/isupatches/wisefy/callbacks/AddWEPNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">AddWEPNetworkCallbacks</a>&nbsp;callbacks)</code>
+<div class="block">To add a WEP network to the user's configured network list (asynchronously)</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#addWPA2Network-java.lang.String-java.lang.String-">addWPA2Network</a></span>(java.lang.String&nbsp;ssid,
               java.lang.String&nbsp;password)</code>
-<div class="block">To add a WPA2 network to the user's configured network list</div>
+<div class="block">To add a WPA2 network to the user's configured network list (synchronously)</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#addWPA2Network-java.lang.String-java.lang.String-com.isupatches.wisefy.callbacks.AddWPA2NetworkCallbacks-">addWPA2Network</a></span>(java.lang.String&nbsp;ssid,
+              java.lang.String&nbsp;password,
+              <a href="../../../com/isupatches/wisefy/callbacks/AddWPA2NetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">AddWPA2NetworkCallbacks</a>&nbsp;callbacks)</code>
+<div class="block">To add a WPA2 network to the user's configured network list (asynchronously)</div>
+</td>
+</tr>
+<tr id="i6" class="altColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#calculateBars-int-int-">calculateBars</a></span>(int&nbsp;rssiLevel,
              int&nbsp;targetNumberOfBars)</code>
 <div class="block">To convert an RSSI level for a network to a number of bars</div>
 </td>
 </tr>
-<tr id="i4" class="altColor">
+<tr id="i7" class="rowColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#compareSignalLevel-int-int-">compareSignalLevel</a></span>(int&nbsp;rssi1,
                   int&nbsp;rssi2)</code>
 <div class="block">To compare the signal strength of two networks</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr id="i8" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#connectToNetwork-java.lang.String-int-">connectToNetwork</a></span>(java.lang.String&nbsp;ssidToConnectTo,
                 int&nbsp;timeoutInMillis)</code>
-<div class="block">Used to connect to a network
+<div class="block">Used to connect to a network (synchronously)
 
- Gets a list of saved networks, connects/reconnects to the given ssid, and then calls waitToConnectToSSID to verify connectivity</div>
+ Gets a list of saved networks, connects to the given ssid if found, and verifies connectivity</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#connectToNetwork-java.lang.String-int-com.isupatches.wisefy.callbacks.ConnectToNetworkCallbacks-">connectToNetwork</a></span>(java.lang.String&nbsp;ssidToConnectTo,
+                int&nbsp;timeoutInMillis,
+                <a href="../../../com/isupatches/wisefy/callbacks/ConnectToNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">ConnectToNetworkCallbacks</a>&nbsp;callbacks)</code>
+<div class="block">Used to connect to a network (asynchronously)
+
+ Gets a list of saved networks, connects to the given ssid if found, and verifies connectivity</div>
+</td>
+</tr>
+<tr id="i10" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#disableWifi--">disableWifi</a></span>()</code>
-<div class="block">To disable Wifi on a user's device</div>
+<div class="block">To disable Wifi on a user's device (synchronously)</div>
 </td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr id="i11" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#disableWifi-com.isupatches.wisefy.callbacks.DisableWifiCallbacks-">disableWifi</a></span>(<a href="../../../com/isupatches/wisefy/callbacks/DisableWifiCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">DisableWifiCallbacks</a>&nbsp;callbacks)</code>
+<div class="block">To disable Wifi on a user's device (asynchronously)</div>
+</td>
+</tr>
+<tr id="i12" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#disconnectFromCurrentNetwork--">disconnectFromCurrentNetwork</a></span>()</code>
-<div class="block">To disconnect the user from their current network</div>
+<div class="block">To disconnect the user from their current network (synchronously)</div>
 </td>
 </tr>
-<tr id="i8" class="altColor">
+<tr id="i13" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#disconnectFromCurrentNetwork-com.isupatches.wisefy.callbacks.DisconnectFromCurrentNetworkCallbacks-">disconnectFromCurrentNetwork</a></span>(<a href="../../../com/isupatches/wisefy/callbacks/DisconnectFromCurrentNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">DisconnectFromCurrentNetworkCallbacks</a>&nbsp;callbacks)</code>
+<div class="block">To disconnect the user from their current network (asynchronously)</div>
+</td>
+</tr>
+<tr id="i14" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#dump--">dump</a></span>()</code>
+<div class="block">Used to cleanup the thread started by WiseFy</div>
+</td>
+</tr>
+<tr id="i15" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#enableWifi--">enableWifi</a></span>()</code>
 <div class="block">To enable Wifi on a user's device</div>
 </td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr id="i16" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#enableWifi-com.isupatches.wisefy.callbacks.EnableWifiCallbacks-">enableWifi</a></span>(<a href="../../../com/isupatches/wisefy/callbacks/EnableWifiCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">EnableWifiCallbacks</a>&nbsp;callbacks)</code>
+<div class="block">To enable Wifi on a user's device</div>
+</td>
+</tr>
+<tr id="i17" class="rowColor">
 <td class="colFirst"><code>android.net.wifi.WifiInfo</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#getCurrentNetwork--">getCurrentNetwork</a></span>()</code>
 <div class="block">To retrieve the user's current network</div>
 </td>
 </tr>
-<tr id="i10" class="altColor">
-<td class="colFirst"><code>int</code></td>
+<tr id="i18" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#getCurrentNetwork-com.isupatches.wisefy.callbacks.GetCurrentNetworkCallbacks-">getCurrentNetwork</a></span>(<a href="../../../com/isupatches/wisefy/callbacks/GetCurrentNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">GetCurrentNetworkCallbacks</a>&nbsp;callbacks)</code>
+<div class="block">To retrieve the user's current network</div>
+</td>
+</tr>
+<tr id="i19" class="rowColor">
+<td class="colFirst"><code>java.lang.Integer</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#getFrequency--">getFrequency</a></span>()</code>
-<div class="block">To retrieve the frequency of the device's current network
-
- Used by isNetwork5gHz
- <a href="../../../com/isupatches/wisefy/WiseFy.html#isNetwork5gHz--"><code>isNetwork5gHz()</code></a></div>
+<div class="block">To retrieve the frequency of the device's current network</div>
 </td>
 </tr>
-<tr id="i11" class="rowColor">
-<td class="colFirst"><code>int</code></td>
+<tr id="i20" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#getFrequency-com.isupatches.wisefy.callbacks.GetFrequencyCallbacks-">getFrequency</a></span>(<a href="../../../com/isupatches/wisefy/callbacks/GetFrequencyCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">GetFrequencyCallbacks</a>&nbsp;callbacks)</code>
+<div class="block">To retrieve the frequency of the device's current network</div>
+</td>
+</tr>
+<tr id="i21" class="rowColor">
+<td class="colFirst"><code>java.lang.Integer</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#getFrequency-android.net.wifi.WifiInfo-">getFrequency</a></span>(android.net.wifi.WifiInfo&nbsp;network)</code>
 <div class="block">To retrieve the frequency of a network</div>
 </td>
 </tr>
-<tr id="i12" class="altColor">
+<tr id="i22" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#getFrequency-android.net.wifi.WifiInfo-com.isupatches.wisefy.callbacks.GetFrequencyCallbacks-">getFrequency</a></span>(android.net.wifi.WifiInfo&nbsp;network,
+            <a href="../../../com/isupatches/wisefy/callbacks/GetFrequencyCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">GetFrequencyCallbacks</a>&nbsp;callbacks)</code>
+<div class="block">To retrieve the frequency of a network</div>
+</td>
+</tr>
+<tr id="i23" class="rowColor">
 <td class="colFirst"><code>java.util.List&lt;android.net.wifi.ScanResult&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#getNearbyAccessPoints-boolean-">getNearbyAccessPoints</a></span>(boolean&nbsp;filterDuplicates)</code>
 <div class="block">To retrieve a list of nearby access points
@@ -279,25 +343,75 @@ <h3>Method Summary</h3>
  *NOTE* Setting filterDuplicates to true will not return SSIDs with a weaker signal strength (will always take the highest)</div>
 </td>
 </tr>
-<tr id="i13" class="rowColor">
+<tr id="i24" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#getNearbyAccessPoints-boolean-com.isupatches.wisefy.callbacks.GetNearbyAccessPointsCallbacks-">getNearbyAccessPoints</a></span>(boolean&nbsp;filterDuplicates,
+                     <a href="../../../com/isupatches/wisefy/callbacks/GetNearbyAccessPointsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">GetNearbyAccessPointsCallbacks</a>&nbsp;callbacks)</code>
+<div class="block">To retrieve a list of nearby access points
+
+ *NOTE* Setting filterDuplicates to true will not return SSIDs with a weaker signal strength (will always take the highest)</div>
+</td>
+</tr>
+<tr id="i25" class="rowColor">
+<td class="colFirst"><code>java.lang.Integer</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#getRSSI-java.lang.String-boolean-int-">getRSSI</a></span>(java.lang.String&nbsp;regexForSSID,
+       boolean&nbsp;takeHighest,
+       int&nbsp;timeoutInMillis)</code>&nbsp;</td>
+</tr>
+<tr id="i26" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#getRSSI-java.lang.String-boolean-int-com.isupatches.wisefy.callbacks.GetRSSICallbacks-">getRSSI</a></span>(java.lang.String&nbsp;regexForSSID,
+       boolean&nbsp;takeHighest,
+       int&nbsp;timeoutInMillis,
+       <a href="../../../com/isupatches/wisefy/callbacks/GetRSSICallbacks.html" title="interface in com.isupatches.wisefy.callbacks">GetRSSICallbacks</a>&nbsp;callbacks)</code>&nbsp;</td>
+</tr>
+<tr id="i27" class="rowColor">
+<td class="colFirst"><code>android.net.wifi.WifiConfiguration</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#getSavedNetwork-java.lang.String-">getSavedNetwork</a></span>(java.lang.String&nbsp;regexForSSID)</code>
+<div class="block">To search for and return a saved WiFiConfiguration given an SSID</div>
+</td>
+</tr>
+<tr id="i28" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#getSavedNetwork-java.lang.String-com.isupatches.wisefy.callbacks.GetSavedNetworkCallbacks-">getSavedNetwork</a></span>(java.lang.String&nbsp;regexForSSID,
+               <a href="../../../com/isupatches/wisefy/callbacks/GetSavedNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">GetSavedNetworkCallbacks</a>&nbsp;callbacks)</code>
+<div class="block">To search for and return a saved WiFiConfiguration given an SSID</div>
+</td>
+</tr>
+<tr id="i29" class="rowColor">
 <td class="colFirst"><code>java.util.List&lt;android.net.wifi.WifiConfiguration&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#getSavedNetworks--">getSavedNetworks</a></span>()</code>
 <div class="block">To retrieve a list of saved networks on a user's device</div>
 </td>
 </tr>
-<tr id="i14" class="altColor">
+<tr id="i30" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#getSavedNetworks-com.isupatches.wisefy.callbacks.GetSavedNetworksCallbacks-">getSavedNetworks</a></span>(<a href="../../../com/isupatches/wisefy/callbacks/GetSavedNetworksCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">GetSavedNetworksCallbacks</a>&nbsp;callbacks)</code>
+<div class="block">To retrieve a list of saved networks on a user's device</div>
+</td>
+</tr>
+<tr id="i31" class="rowColor">
+<td class="colFirst"><code>java.util.List&lt;android.net.wifi.WifiConfiguration&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#getSavedNetworks-java.lang.String-">getSavedNetworks</a></span>(java.lang.String&nbsp;regexForSSID)</code>&nbsp;</td>
+</tr>
+<tr id="i32" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#getSavedNetworks-java.lang.String-com.isupatches.wisefy.callbacks.GetSavedNetworksCallbacks-">getSavedNetworks</a></span>(java.lang.String&nbsp;regexForSSID,
+                <a href="../../../com/isupatches/wisefy/callbacks/GetSavedNetworksCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">GetSavedNetworksCallbacks</a>&nbsp;callbacks)</code>&nbsp;</td>
+</tr>
+<tr id="i33" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#isDeviceConnectedToMobileNetwork--">isDeviceConnectedToMobileNetwork</a></span>()</code>
 <div class="block">To check if the device is connected to a mobile network</div>
 </td>
 </tr>
-<tr id="i15" class="rowColor">
+<tr id="i34" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#isDeviceConnectedToMobileOrWifiNetwork--">isDeviceConnectedToMobileOrWifiNetwork</a></span>()</code>
 <div class="block">To check if the device is connected to a mobile or wifi network</div>
 </td>
 </tr>
-<tr id="i16" class="altColor">
+<tr id="i35" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#isDeviceConnectedToSSID-java.lang.String-">isDeviceConnectedToSSID</a></span>(java.lang.String&nbsp;ssid)</code>
 <div class="block">To check if the device is connected to a given SSID
@@ -305,61 +419,141 @@ <h3>Method Summary</h3>
  Used by connectToNetwork</div>
 </td>
 </tr>
-<tr id="i17" class="rowColor">
+<tr id="i36" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#isDeviceConnectedToWifiNetwork--">isDeviceConnectedToWifiNetwork</a></span>()</code>
 <div class="block">To check if the device is connected to a wifi network</div>
 </td>
 </tr>
-<tr id="i18" class="altColor">
+<tr id="i37" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#isLoggingEnabled--">isLoggingEnabled</a></span>()</code>
 <div class="block">To query if logging is enabled or disabled for a WiseFy instance</div>
 </td>
 </tr>
-<tr id="i19" class="rowColor">
+<tr id="i38" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#isNetwork5gHz--">isNetwork5gHz</a></span>()</code>
-<div class="block">To check if the device's current network is 5gHz
-
- <a href="../../../com/isupatches/wisefy/WiseFy.html#getFrequency--"><code>getFrequency()</code></a></div>
+<div class="block">To check if the device's current network is 5gHz</div>
 </td>
 </tr>
-<tr id="i20" class="altColor">
+<tr id="i39" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#isNetwork5gHz-android.net.wifi.WifiInfo-">isNetwork5gHz</a></span>(android.net.wifi.WifiInfo&nbsp;network)</code>
 <div class="block">To check if a given network is 5gHz</div>
 </td>
 </tr>
-<tr id="i21" class="rowColor">
+<tr id="i40" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#isNetworkEAP-android.net.wifi.ScanResult-">isNetworkEAP</a></span>(android.net.wifi.ScanResult&nbsp;scanResult)</code>
+<div class="block">To check and return if a network is a EAP network</div>
+</td>
+</tr>
+<tr id="i41" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#isNetworkInConfigurationList-java.lang.String-">isNetworkInConfigurationList</a></span>(java.lang.String&nbsp;ssid)</code>
 <div class="block">To check if an SSID is in the list of configured networks</div>
 </td>
 </tr>
-<tr id="i22" class="altColor">
+<tr id="i42" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#isNetworkPSK-android.net.wifi.ScanResult-">isNetworkPSK</a></span>(android.net.wifi.ScanResult&nbsp;scanResult)</code>
+<div class="block">To check and return if a network is a PSK network</div>
+</td>
+</tr>
+<tr id="i43" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#isNetworkSecure-android.net.wifi.ScanResult-">isNetworkSecure</a></span>(android.net.wifi.ScanResult&nbsp;scanResult)</code>
-<div class="block">To check and return if a network is secure (WEP/PSK/EAP capabilities)</div>
+<div class="block">To check and return if a network is secure (WEP/WPA/WPA2 capabilities)</div>
 </td>
 </tr>
-<tr id="i23" class="rowColor">
+<tr id="i44" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#isNetworkWEP-android.net.wifi.ScanResult-">isNetworkWEP</a></span>(android.net.wifi.ScanResult&nbsp;scanResult)</code>
+<div class="block">To check and return if a network is a WEP network</div>
+</td>
+</tr>
+<tr id="i45" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#isNetworkWPA-android.net.wifi.ScanResult-">isNetworkWPA</a></span>(android.net.wifi.ScanResult&nbsp;scanResult)</code>
+<div class="block">To check and return if a network is a WPA network</div>
+</td>
+</tr>
+<tr id="i46" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#isNetworkWPA2-android.net.wifi.ScanResult-">isNetworkWPA2</a></span>(android.net.wifi.ScanResult&nbsp;scanResult)</code>
+<div class="block">To check and return if a network is a WPA2 network</div>
+</td>
+</tr>
+<tr id="i47" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#isWifiEnabled--">isWifiEnabled</a></span>()</code>
 <div class="block">To check if Wifi is enabled on the device or not</div>
 </td>
 </tr>
-<tr id="i24" class="altColor">
+<tr id="i48" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#removeNetwork-java.lang.String-">removeNetwork</a></span>(java.lang.String&nbsp;ssidToRemove)</code>
 <div class="block">To remove a configured network</div>
 </td>
 </tr>
-<tr id="i25" class="rowColor">
+<tr id="i49" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#removeNetwork-java.lang.String-com.isupatches.wisefy.callbacks.RemoveNetworkCallbacks-">removeNetwork</a></span>(java.lang.String&nbsp;ssidToRemove,
+             <a href="../../../com/isupatches/wisefy/callbacks/RemoveNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">RemoveNetworkCallbacks</a>&nbsp;callbacks)</code>
+<div class="block">To remove a configured network</div>
+</td>
+</tr>
+<tr id="i50" class="altColor">
+<td class="colFirst"><code>android.net.wifi.ScanResult</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#searchForAccessPoint-java.lang.String-int-boolean-">searchForAccessPoint</a></span>(java.lang.String&nbsp;regexForSSID,
+                    int&nbsp;timeoutInMillis,
+                    boolean&nbsp;filterDuplicates)</code>&nbsp;</td>
+</tr>
+<tr id="i51" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#searchForAccessPoint-java.lang.String-int-boolean-com.isupatches.wisefy.callbacks.SearchForAccessPointCallbacks-">searchForAccessPoint</a></span>(java.lang.String&nbsp;regexForSSID,
+                    int&nbsp;timeoutInMillis,
+                    boolean&nbsp;filterDuplicates,
+                    <a href="../../../com/isupatches/wisefy/callbacks/SearchForAccessPointCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">SearchForAccessPointCallbacks</a>&nbsp;callbacks)</code>&nbsp;</td>
+</tr>
+<tr id="i52" class="altColor">
+<td class="colFirst"><code>java.util.List&lt;android.net.wifi.ScanResult&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#searchForAccessPoints-java.lang.String-boolean-">searchForAccessPoints</a></span>(java.lang.String&nbsp;regexForSSID,
+                     boolean&nbsp;filterDuplicates)</code>&nbsp;</td>
+</tr>
+<tr id="i53" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#searchForAccessPoints-java.lang.String-boolean-com.isupatches.wisefy.callbacks.SearchForAccessPointsCallbacks-">searchForAccessPoints</a></span>(java.lang.String&nbsp;regexForSSID,
+                     boolean&nbsp;filterDuplicates,
+                     <a href="../../../com/isupatches/wisefy/callbacks/SearchForAccessPointsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">SearchForAccessPointsCallbacks</a>&nbsp;callbacks)</code>&nbsp;</td>
+</tr>
+<tr id="i54" class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#searchForSSID-java.lang.String-int-">searchForSSID</a></span>(java.lang.String&nbsp;ssidToSearchFor,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#searchForSSID-java.lang.String-int-">searchForSSID</a></span>(java.lang.String&nbsp;regexForSSID,
              int&nbsp;timeoutInMillis)</code>
-<div class="block">To search local networks and return the first one that contains a given ssid (non-case sensitive)</div>
+<div class="block">To search local networks and return the first one that contains a given ssid</div>
+</td>
+</tr>
+<tr id="i55" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#searchForSSID-java.lang.String-int-com.isupatches.wisefy.callbacks.SearchForSSIDCallbacks-">searchForSSID</a></span>(java.lang.String&nbsp;regexForSSID,
+             int&nbsp;timeoutInMillis,
+             <a href="../../../com/isupatches/wisefy/callbacks/SearchForSSIDCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">SearchForSSIDCallbacks</a>&nbsp;callbacks)</code>
+<div class="block">To search local networks and return the first one that contains a given ssid</div>
+</td>
+</tr>
+<tr id="i56" class="altColor">
+<td class="colFirst"><code>java.util.List&lt;java.lang.String&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#searchForSSIDs-java.lang.String-">searchForSSIDs</a></span>(java.lang.String&nbsp;regexForSSID)</code>
+<div class="block">To search local networks and return the first one that contains a given ssid</div>
+</td>
+</tr>
+<tr id="i57" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFy.html#searchForSSIDs-java.lang.String-com.isupatches.wisefy.callbacks.SearchForSSIDsCallbacks-">searchForSSIDs</a></span>(java.lang.String&nbsp;regexForSSID,
+              <a href="../../../com/isupatches/wisefy/callbacks/SearchForSSIDsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">SearchForSSIDsCallbacks</a>&nbsp;callbacks)</code>
+<div class="block">To search local networks and return the first one that contains a given ssid</div>
 </td>
 </tr>
 </table>
@@ -413,7 +607,7 @@ <h4>MIN_FREQUENCY_5GHZ</h4>
 <a name="MAX_FREQUENCY_5GHZ">
 <!--   -->
 </a>
-<ul class="blockList">
+<ul class="blockListLast">
 <li class="blockList">
 <h4>MAX_FREQUENCY_5GHZ</h4>
 <pre>public static final&nbsp;int MAX_FREQUENCY_5GHZ</pre>
@@ -423,24 +617,6 @@ <h4>MAX_FREQUENCY_5GHZ</h4>
 </dl>
 </li>
 </ul>
-<a name="mConnectivityManager">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>mConnectivityManager</h4>
-<pre>public&nbsp;android.net.ConnectivityManager mConnectivityManager</pre>
-</li>
-</ul>
-<a name="mWifiManager">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>mWifiManager</h4>
-<pre>public&nbsp;android.net.wifi.WifiManager mWifiManager</pre>
-</li>
-</ul>
 </li>
 </ul>
 <!-- ============ METHOD DETAIL ========== -->
@@ -455,16 +631,49 @@ <h3>Method Detail</h3>
 <ul class="blockList">
 <li class="blockList">
 <h4>addOpenNetwork</h4>
-<pre>public&nbsp;int&nbsp;addOpenNetwork(java.lang.String&nbsp;ssid)</pre>
-<div class="block">To add an open network to the user's configured network list</div>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations">@Sync</a>
+ <a href="../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations">@CallingThread</a>
+public&nbsp;int&nbsp;addOpenNetwork(java.lang.String&nbsp;ssid)</pre>
+<div class="block">To add an open network to the user's configured network list (synchronously)</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>ssid</code> - - The ssid of the open network you want to add
-
- <a href="../../../com/isupatches/wisefy/constants/WiseFyCodes.html#FAILURE"><code>WiseFyCodes.FAILURE</code></a>
- <a href="../../../com/isupatches/wisefy/constants/WiseFyCodes.html#NETWORK_ALREADY_CONFIGURED"><code>WiseFyCodes.NETWORK_ALREADY_CONFIGURED</code></a></dd>
+<dd><code>ssid</code> - The ssid of the open network you want to add</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>int - The return code from WifiManager for network creation (-1 for failure)</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../com/isupatches/wisefy/WiseFy.html#addNetworkConfiguration-android.net.wifi.WifiConfiguration-"><code>addNetworkConfiguration(WifiConfiguration)</code></a>, 
+<a href="../../../com/isupatches/wisefy/util/WifiConfigurationUtil.html#generateOpenNetworkConfiguration-java.lang.String-"><code>WifiConfigurationUtil.generateOpenNetworkConfiguration(String)</code></a>, 
+<a href="../../../com/isupatches/wisefy/constants/WiseFyCodes.html" title="class in com.isupatches.wisefy.constants"><code>WiseFyCodes</code></a>, 
+<code>WiseFyConfiguration.isLoggingEnabled()</code>, 
+<code>WiseFyPrerequisites.hasPrerequisites()</code>, 
+<code>WiseFySearch.isNetworkASavedConfiguration(String)</code></dd>
+</dl>
+</li>
+</ul>
+<a name="addOpenNetwork-java.lang.String-com.isupatches.wisefy.callbacks.AddOpenNetworkCallbacks-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>addOpenNetwork</h4>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Async.html" title="annotation in com.isupatches.wisefy.annotations">@Async</a>
+ <a href="../../../com/isupatches/wisefy/annotations/WiseFyThread.html" title="annotation in com.isupatches.wisefy.annotations">@WiseFyThread</a>
+public&nbsp;void&nbsp;addOpenNetwork(java.lang.String&nbsp;ssid,
+                                                 <a href="../../../com/isupatches/wisefy/callbacks/AddOpenNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">AddOpenNetworkCallbacks</a>&nbsp;callbacks)</pre>
+<div class="block">To add an open network to the user's configured network list (asynchronously)</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>ssid</code> - The ssid of the open network you want to add</dd>
+<dd><code>callbacks</code> - The listener to return results to</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../com/isupatches/wisefy/WiseFy.html#addNetworkConfiguration-android.net.wifi.WifiConfiguration-"><code>addNetworkConfiguration(WifiConfiguration)</code></a>, 
+<a href="../../../com/isupatches/wisefy/WiseFy.html#execute-java.lang.Runnable-"><code>execute(Runnable)</code></a>, 
+<a href="../../../com/isupatches/wisefy/callbacks/AddOpenNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><code>AddOpenNetworkCallbacks</code></a>, 
+<a href="../../../com/isupatches/wisefy/util/WifiConfigurationUtil.html#generateOpenNetworkConfiguration-java.lang.String-"><code>WifiConfigurationUtil.generateOpenNetworkConfiguration(String)</code></a>, 
+<a href="../../../com/isupatches/wisefy/constants/WiseFyCodes.html" title="class in com.isupatches.wisefy.constants"><code>WiseFyCodes</code></a>, 
+<code>WiseFyConfiguration.isLoggingEnabled()</code>, 
+<code>WiseFyPrerequisites.hasPrerequisites()</code>, 
+<code>WiseFySearch.isNetworkASavedConfiguration(String)</code></dd>
 </dl>
 </li>
 </ul>
@@ -474,18 +683,53 @@ <h4>addOpenNetwork</h4>
 <ul class="blockList">
 <li class="blockList">
 <h4>addWEPNetwork</h4>
-<pre>public&nbsp;int&nbsp;addWEPNetwork(java.lang.String&nbsp;ssid,
-                         java.lang.String&nbsp;password)</pre>
-<div class="block">To add a WEP network to the user's configured network list</div>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations">@Sync</a>
+ <a href="../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations">@CallingThread</a>
+public&nbsp;int&nbsp;addWEPNetwork(java.lang.String&nbsp;ssid,
+                                               java.lang.String&nbsp;password)</pre>
+<div class="block">To add a WEP network to the user's configured network list (synchronously)</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>ssid</code> - - The ssid of the WEP network you want to add</dd>
-<dd><code>password</code> - - The password for the WEP network being added
-
- <a href="../../../com/isupatches/wisefy/constants/WiseFyCodes.html#FAILURE"><code>WiseFyCodes.FAILURE</code></a>
- <a href="../../../com/isupatches/wisefy/constants/WiseFyCodes.html#NETWORK_ALREADY_CONFIGURED"><code>WiseFyCodes.NETWORK_ALREADY_CONFIGURED</code></a></dd>
+<dd><code>ssid</code> - The ssid of the WEP network you want to add</dd>
+<dd><code>password</code> - The password for the WEP network being added</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>int - The return code from WifiManager for network creation (-1 for failure)</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../com/isupatches/wisefy/WiseFy.html#addNetworkConfiguration-android.net.wifi.WifiConfiguration-"><code>addNetworkConfiguration(WifiConfiguration)</code></a>, 
+<a href="../../../com/isupatches/wisefy/util/WifiConfigurationUtil.html#generateWEPNetworkConfiguration-java.lang.String-java.lang.String-"><code>WifiConfigurationUtil.generateWEPNetworkConfiguration(String, String)</code></a>, 
+<a href="../../../com/isupatches/wisefy/constants/WiseFyCodes.html" title="class in com.isupatches.wisefy.constants"><code>WiseFyCodes</code></a>, 
+<code>WiseFyConfiguration.isLoggingEnabled()</code>, 
+<code>WiseFyPrerequisites.hasPrerequisites()</code>, 
+<code>WiseFySearch.isNetworkASavedConfiguration(String)</code></dd>
+</dl>
+</li>
+</ul>
+<a name="addWEPNetwork-java.lang.String-java.lang.String-com.isupatches.wisefy.callbacks.AddWEPNetworkCallbacks-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>addWEPNetwork</h4>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Async.html" title="annotation in com.isupatches.wisefy.annotations">@Async</a>
+ <a href="../../../com/isupatches/wisefy/annotations/WiseFyThread.html" title="annotation in com.isupatches.wisefy.annotations">@WiseFyThread</a>
+public&nbsp;void&nbsp;addWEPNetwork(java.lang.String&nbsp;ssid,
+                                                java.lang.String&nbsp;password,
+                                                <a href="../../../com/isupatches/wisefy/callbacks/AddWEPNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">AddWEPNetworkCallbacks</a>&nbsp;callbacks)</pre>
+<div class="block">To add a WEP network to the user's configured network list (asynchronously)</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>ssid</code> - The ssid of the WEP network you want to add</dd>
+<dd><code>password</code> - The password for the WEP network being added</dd>
+<dd><code>callbacks</code> - The listener to return results to</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../com/isupatches/wisefy/WiseFy.html#addNetworkConfiguration-android.net.wifi.WifiConfiguration-"><code>addNetworkConfiguration(WifiConfiguration)</code></a>, 
+<a href="../../../com/isupatches/wisefy/WiseFy.html#execute-java.lang.Runnable-"><code>execute(Runnable)</code></a>, 
+<a href="../../../com/isupatches/wisefy/callbacks/AddWEPNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><code>AddWEPNetworkCallbacks</code></a>, 
+<a href="../../../com/isupatches/wisefy/util/WifiConfigurationUtil.html#generateWEPNetworkConfiguration-java.lang.String-java.lang.String-"><code>WifiConfigurationUtil.generateWEPNetworkConfiguration(String, String)</code></a>, 
+<a href="../../../com/isupatches/wisefy/constants/WiseFyCodes.html" title="class in com.isupatches.wisefy.constants"><code>WiseFyCodes</code></a>, 
+<code>WiseFyConfiguration.isLoggingEnabled()</code>, 
+<code>WiseFyPrerequisites.hasPrerequisites()</code>, 
+<code>WiseFySearch.isNetworkASavedConfiguration(String)</code></dd>
 </dl>
 </li>
 </ul>
@@ -495,18 +739,53 @@ <h4>addWEPNetwork</h4>
 <ul class="blockList">
 <li class="blockList">
 <h4>addWPA2Network</h4>
-<pre>public&nbsp;int&nbsp;addWPA2Network(java.lang.String&nbsp;ssid,
-                          java.lang.String&nbsp;password)</pre>
-<div class="block">To add a WPA2 network to the user's configured network list</div>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations">@Sync</a>
+ <a href="../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations">@CallingThread</a>
+public&nbsp;int&nbsp;addWPA2Network(java.lang.String&nbsp;ssid,
+                                                java.lang.String&nbsp;password)</pre>
+<div class="block">To add a WPA2 network to the user's configured network list (synchronously)</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>ssid</code> - - The ssid of the WPA2 network you want to add</dd>
-<dd><code>password</code> - - The password for the WPA2 network being added
-
- <a href="../../../com/isupatches/wisefy/constants/WiseFyCodes.html#FAILURE"><code>WiseFyCodes.FAILURE</code></a>
- <a href="../../../com/isupatches/wisefy/constants/WiseFyCodes.html#NETWORK_ALREADY_CONFIGURED"><code>WiseFyCodes.NETWORK_ALREADY_CONFIGURED</code></a></dd>
+<dd><code>ssid</code> - The ssid of the WPA2 network you want to add</dd>
+<dd><code>password</code> - The password for the WPA2 network being added</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>int - The return code from WifiManager for network creation (-1 for failure)</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../com/isupatches/wisefy/WiseFy.html#addNetworkConfiguration-android.net.wifi.WifiConfiguration-"><code>addNetworkConfiguration(WifiConfiguration)</code></a>, 
+<a href="../../../com/isupatches/wisefy/util/WifiConfigurationUtil.html#generateWPA2NetworkConfiguration-java.lang.String-java.lang.String-"><code>WifiConfigurationUtil.generateWPA2NetworkConfiguration(String, String)</code></a>, 
+<a href="../../../com/isupatches/wisefy/constants/WiseFyCodes.html" title="class in com.isupatches.wisefy.constants"><code>WiseFyCodes</code></a>, 
+<code>WiseFyConfiguration.isLoggingEnabled()</code>, 
+<code>WiseFyPrerequisites.hasPrerequisites()</code>, 
+<code>WiseFySearch.isNetworkASavedConfiguration(String)</code></dd>
+</dl>
+</li>
+</ul>
+<a name="addWPA2Network-java.lang.String-java.lang.String-com.isupatches.wisefy.callbacks.AddWPA2NetworkCallbacks-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>addWPA2Network</h4>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Async.html" title="annotation in com.isupatches.wisefy.annotations">@Async</a>
+ <a href="../../../com/isupatches/wisefy/annotations/WiseFyThread.html" title="annotation in com.isupatches.wisefy.annotations">@WiseFyThread</a>
+public&nbsp;void&nbsp;addWPA2Network(java.lang.String&nbsp;ssid,
+                                                 java.lang.String&nbsp;password,
+                                                 <a href="../../../com/isupatches/wisefy/callbacks/AddWPA2NetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">AddWPA2NetworkCallbacks</a>&nbsp;callbacks)</pre>
+<div class="block">To add a WPA2 network to the user's configured network list (asynchronously)</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>ssid</code> - The ssid of the WPA2 network you want to add</dd>
+<dd><code>password</code> - The password for the WPA2 network being added</dd>
+<dd><code>callbacks</code> - The listener to return results to</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../com/isupatches/wisefy/WiseFy.html#addNetworkConfiguration-android.net.wifi.WifiConfiguration-"><code>addNetworkConfiguration(WifiConfiguration)</code></a>, 
+<a href="../../../com/isupatches/wisefy/WiseFy.html#execute-java.lang.Runnable-"><code>execute(Runnable)</code></a>, 
+<a href="../../../com/isupatches/wisefy/callbacks/AddWPA2NetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><code>AddWPA2NetworkCallbacks</code></a>, 
+<a href="../../../com/isupatches/wisefy/util/WifiConfigurationUtil.html#generateWPA2NetworkConfiguration-java.lang.String-java.lang.String-"><code>WifiConfigurationUtil.generateWPA2NetworkConfiguration(String, String)</code></a>, 
+<a href="../../../com/isupatches/wisefy/constants/WiseFyCodes.html" title="class in com.isupatches.wisefy.constants"><code>WiseFyCodes</code></a>, 
+<code>WiseFyConfiguration.isLoggingEnabled()</code>, 
+<code>WiseFyPrerequisites.hasPrerequisites()</code>, 
+<code>WiseFySearch.isNetworkASavedConfiguration(String)</code></dd>
 </dl>
 </li>
 </ul>
@@ -516,13 +795,15 @@ <h4>addWPA2Network</h4>
 <ul class="blockList">
 <li class="blockList">
 <h4>calculateBars</h4>
-<pre>public&nbsp;int&nbsp;calculateBars(int&nbsp;rssiLevel,
-                         int&nbsp;targetNumberOfBars)</pre>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations">@Sync</a>
+ <a href="../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations">@CallingThread</a>
+public&nbsp;int&nbsp;calculateBars(int&nbsp;rssiLevel,
+                                               int&nbsp;targetNumberOfBars)</pre>
 <div class="block">To convert an RSSI level for a network to a number of bars</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>rssiLevel</code> - - The signal strength of the network</dd>
-<dd><code>targetNumberOfBars</code> - - How many bars or levels there will be total</dd>
+<dd><code>rssiLevel</code> - The signal strength of the network</dd>
+<dd><code>targetNumberOfBars</code> - How many bars or levels there will be total</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>int - The number of bars for the given RSSI value</dd>
 </dl>
@@ -534,13 +815,15 @@ <h4>calculateBars</h4>
 <ul class="blockList">
 <li class="blockList">
 <h4>compareSignalLevel</h4>
-<pre>public&nbsp;int&nbsp;compareSignalLevel(int&nbsp;rssi1,
-                              int&nbsp;rssi2)</pre>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations">@Sync</a>
+ <a href="../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations">@CallingThread</a>
+public&nbsp;int&nbsp;compareSignalLevel(int&nbsp;rssi1,
+                                                    int&nbsp;rssi2)</pre>
 <div class="block">To compare the signal strength of two networks</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>rssi1</code> - - The signal strength of network 1</dd>
-<dd><code>rssi2</code> - - The signal strength of network 2</dd>
+<dd><code>rssi1</code> - The signal strength of network 1</dd>
+<dd><code>rssi2</code> - The signal strength of network 2</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>int - Returns negative value if the first signal is weaker than the second signal, 0 if the two
  signals have the same strength, and a positive value if the first signal is stronger than the second signal.</dd>
@@ -553,17 +836,54 @@ <h4>compareSignalLevel</h4>
 <ul class="blockList">
 <li class="blockList">
 <h4>connectToNetwork</h4>
-<pre>public&nbsp;boolean&nbsp;connectToNetwork(java.lang.String&nbsp;ssidToConnectTo,
-                                int&nbsp;timeoutInMillis)</pre>
-<div class="block">Used to connect to a network
+<pre><a href="../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations">@Sync</a>
+ <a href="../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations">@CallingThread</a>
+ <a href="../../../com/isupatches/wisefy/annotations/WaitsForTimeout.html" title="annotation in com.isupatches.wisefy.annotations">@WaitsForTimeout</a>
+public&nbsp;boolean&nbsp;connectToNetwork(java.lang.String&nbsp;ssidToConnectTo,
+                                                                        int&nbsp;timeoutInMillis)</pre>
+<div class="block">Used to connect to a network (synchronously)
 
- Gets a list of saved networks, connects/reconnects to the given ssid, and then calls waitToConnectToSSID to verify connectivity</div>
+ Gets a list of saved networks, connects to the given ssid if found, and verifies connectivity</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>ssidToConnectTo</code> - - The ssid to connect/reconnect to</dd>
-<dd><code>timeoutInMillis</code> - - The number of milliseconds to continue waiting for the device to connect to the given SSID</dd>
+<dd><code>ssidToConnectTo</code> - The ssid to connect/reconnect to</dd>
+<dd><code>timeoutInMillis</code> - The number of milliseconds to continue waiting for the device to connect to the given SSID</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>boolean - If the network was successfully reconnected</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><code>WiseFyConnection.waitToConnectToSSID(String, int)</code>, 
+<code>WiseFyPrerequisites.hasPrerequisites()</code>, 
+<code>WiseFySearch.findSavedNetworkByRegex(String)</code></dd>
+</dl>
+</li>
+</ul>
+<a name="connectToNetwork-java.lang.String-int-com.isupatches.wisefy.callbacks.ConnectToNetworkCallbacks-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>connectToNetwork</h4>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Async.html" title="annotation in com.isupatches.wisefy.annotations">@Async</a>
+ <a href="../../../com/isupatches/wisefy/annotations/WiseFyThread.html" title="annotation in com.isupatches.wisefy.annotations">@WiseFyThread</a>
+ <a href="../../../com/isupatches/wisefy/annotations/WaitsForTimeout.html" title="annotation in com.isupatches.wisefy.annotations">@WaitsForTimeout</a>
+public&nbsp;void&nbsp;connectToNetwork(java.lang.String&nbsp;ssidToConnectTo,
+                                                                     int&nbsp;timeoutInMillis,
+                                                                     <a href="../../../com/isupatches/wisefy/callbacks/ConnectToNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">ConnectToNetworkCallbacks</a>&nbsp;callbacks)</pre>
+<div class="block">Used to connect to a network (asynchronously)
+
+ Gets a list of saved networks, connects to the given ssid if found, and verifies connectivity</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>ssidToConnectTo</code> - The ssid to connect/reconnect to</dd>
+<dd><code>timeoutInMillis</code> - The number of milliseconds to continue waiting for the device to connect to the given SSID</dd>
+<dd><code>callbacks</code> - The listener to return results to</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../com/isupatches/wisefy/WiseFy.html#execute-java.lang.Runnable-"><code>execute(Runnable)</code></a>, 
+<a href="../../../com/isupatches/wisefy/callbacks/ConnectToNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><code>ConnectToNetworkCallbacks</code></a>, 
+<a href="../../../com/isupatches/wisefy/constants/WiseFyCodes.html" title="class in com.isupatches.wisefy.constants"><code>WiseFyCodes</code></a>, 
+<code>WiseFyConnection.waitToConnectToSSID(String, int)</code>, 
+<code>WiseFyPrerequisites.hasPrerequisites()</code>, 
+<code>WiseFySearch.findSavedNetworkByRegex(String)</code></dd>
 </dl>
 </li>
 </ul>
@@ -573,11 +893,36 @@ <h4>connectToNetwork</h4>
 <ul class="blockList">
 <li class="blockList">
 <h4>disableWifi</h4>
-<pre>public&nbsp;boolean&nbsp;disableWifi()</pre>
-<div class="block">To disable Wifi on a user's device</div>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations">@Sync</a>
+ <a href="../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations">@CallingThread</a>
+public&nbsp;boolean&nbsp;disableWifi()</pre>
+<div class="block">To disable Wifi on a user's device (synchronously)</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
-<dd>boolean - If the command succeeded in disabling wifi</dd>
+<dd>boolean - True if the command succeeded in disabling wifi</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><code>WiseFyPrerequisites.hasPrerequisites()</code></dd>
+</dl>
+</li>
+</ul>
+<a name="disableWifi-com.isupatches.wisefy.callbacks.DisableWifiCallbacks-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>disableWifi</h4>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Async.html" title="annotation in com.isupatches.wisefy.annotations">@Async</a>
+ <a href="../../../com/isupatches/wisefy/annotations/WiseFyThread.html" title="annotation in com.isupatches.wisefy.annotations">@WiseFyThread</a>
+public&nbsp;void&nbsp;disableWifi(<a href="../../../com/isupatches/wisefy/callbacks/DisableWifiCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">DisableWifiCallbacks</a>&nbsp;callbacks)</pre>
+<div class="block">To disable Wifi on a user's device (asynchronously)</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>callbacks</code> - The listener to return results to</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../com/isupatches/wisefy/WiseFy.html#execute-java.lang.Runnable-"><code>execute(Runnable)</code></a>, 
+<a href="../../../com/isupatches/wisefy/callbacks/DisableWifiCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><code>DisableWifiCallbacks</code></a>, 
+<a href="../../../com/isupatches/wisefy/constants/WiseFyCodes.html" title="class in com.isupatches.wisefy.constants"><code>WiseFyCodes</code></a>, 
+<code>WiseFyPrerequisites.hasPrerequisites()</code></dd>
 </dl>
 </li>
 </ul>
@@ -587,25 +932,85 @@ <h4>disableWifi</h4>
 <ul class="blockList">
 <li class="blockList">
 <h4>disconnectFromCurrentNetwork</h4>
-<pre>public&nbsp;boolean&nbsp;disconnectFromCurrentNetwork()</pre>
-<div class="block">To disconnect the user from their current network</div>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations">@Sync</a>
+ <a href="../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations">@CallingThread</a>
+public&nbsp;boolean&nbsp;disconnectFromCurrentNetwork()</pre>
+<div class="block">To disconnect the user from their current network (synchronously)</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>boolean - If the command succeeded in disconnecting the device from the current network</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><code>WiseFyPrerequisites.hasPrerequisites()</code></dd>
 </dl>
 </li>
 </ul>
+<a name="disconnectFromCurrentNetwork-com.isupatches.wisefy.callbacks.DisconnectFromCurrentNetworkCallbacks-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>disconnectFromCurrentNetwork</h4>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Async.html" title="annotation in com.isupatches.wisefy.annotations">@Async</a>
+ <a href="../../../com/isupatches/wisefy/annotations/WiseFyThread.html" title="annotation in com.isupatches.wisefy.annotations">@WiseFyThread</a>
+public&nbsp;void&nbsp;disconnectFromCurrentNetwork(<a href="../../../com/isupatches/wisefy/callbacks/DisconnectFromCurrentNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">DisconnectFromCurrentNetworkCallbacks</a>&nbsp;callbacks)</pre>
+<div class="block">To disconnect the user from their current network (asynchronously)</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>callbacks</code> - The listener to return results to</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../com/isupatches/wisefy/WiseFy.html#execute-java.lang.Runnable-"><code>execute(Runnable)</code></a>, 
+<a href="../../../com/isupatches/wisefy/callbacks/DisconnectFromCurrentNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><code>DisconnectFromCurrentNetworkCallbacks</code></a>, 
+<a href="../../../com/isupatches/wisefy/constants/WiseFyCodes.html" title="class in com.isupatches.wisefy.constants"><code>WiseFyCodes</code></a>, 
+<code>WiseFyPrerequisites.hasPrerequisites()</code></dd>
+</dl>
+</li>
+</ul>
+<a name="dump--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>dump</h4>
+<pre>public&nbsp;void&nbsp;dump()</pre>
+<div class="block">Used to cleanup the thread started by WiseFy</div>
+</li>
+</ul>
 <a name="enableWifi--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>enableWifi</h4>
-<pre>public&nbsp;boolean&nbsp;enableWifi()</pre>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations">@Sync</a>
+ <a href="../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations">@CallingThread</a>
+public&nbsp;boolean&nbsp;enableWifi()</pre>
 <div class="block">To enable Wifi on a user's device</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>boolean - If the command succeeded in enabling wifi</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><code>WiseFyPrerequisites.hasPrerequisites()</code></dd>
+</dl>
+</li>
+</ul>
+<a name="enableWifi-com.isupatches.wisefy.callbacks.EnableWifiCallbacks-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>enableWifi</h4>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Async.html" title="annotation in com.isupatches.wisefy.annotations">@Async</a>
+ <a href="../../../com/isupatches/wisefy/annotations/WiseFyThread.html" title="annotation in com.isupatches.wisefy.annotations">@WiseFyThread</a>
+public&nbsp;void&nbsp;enableWifi(<a href="../../../com/isupatches/wisefy/callbacks/EnableWifiCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">EnableWifiCallbacks</a>&nbsp;callbacks)</pre>
+<div class="block">To enable Wifi on a user's device</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>callbacks</code> - The listener to return results to</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../com/isupatches/wisefy/WiseFy.html#execute-java.lang.Runnable-"><code>execute(Runnable)</code></a>, 
+<a href="../../../com/isupatches/wisefy/callbacks/EnableWifiCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><code>EnableWifiCallbacks</code></a>, 
+<a href="../../../com/isupatches/wisefy/constants/WiseFyCodes.html" title="class in com.isupatches.wisefy.constants"><code>WiseFyCodes</code></a>, 
+<code>WiseFyPrerequisites.hasPrerequisites()</code></dd>
 </dl>
 </li>
 </ul>
@@ -615,11 +1020,36 @@ <h4>enableWifi</h4>
 <ul class="blockList">
 <li class="blockList">
 <h4>getCurrentNetwork</h4>
-<pre>public&nbsp;android.net.wifi.WifiInfo&nbsp;getCurrentNetwork()</pre>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations">@Sync</a>
+ <a href="../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations">@CallingThread</a>
+public&nbsp;android.net.wifi.WifiInfo&nbsp;getCurrentNetwork()</pre>
 <div class="block">To retrieve the user's current network</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>WifiInfo|null - The user's current network information</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><code>WiseFyPrerequisites.hasPrerequisites()</code></dd>
+</dl>
+</li>
+</ul>
+<a name="getCurrentNetwork-com.isupatches.wisefy.callbacks.GetCurrentNetworkCallbacks-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getCurrentNetwork</h4>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Async.html" title="annotation in com.isupatches.wisefy.annotations">@Async</a>
+ <a href="../../../com/isupatches/wisefy/annotations/WiseFyThread.html" title="annotation in com.isupatches.wisefy.annotations">@WiseFyThread</a>
+public&nbsp;void&nbsp;getCurrentNetwork(<a href="../../../com/isupatches/wisefy/callbacks/GetCurrentNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">GetCurrentNetworkCallbacks</a>&nbsp;callbacks)</pre>
+<div class="block">To retrieve the user's current network</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>callbacks</code> - The listener to return results to</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../com/isupatches/wisefy/WiseFy.html#execute-java.lang.Runnable-"><code>execute(Runnable)</code></a>, 
+<a href="../../../com/isupatches/wisefy/callbacks/GetCurrentNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><code>GetCurrentNetworkCallbacks</code></a>, 
+<a href="../../../com/isupatches/wisefy/constants/WiseFyCodes.html" title="class in com.isupatches.wisefy.constants"><code>WiseFyCodes</code></a>, 
+<code>WiseFyPrerequisites.hasPrerequisites()</code></dd>
 </dl>
 </li>
 </ul>
@@ -629,14 +1059,35 @@ <h4>getCurrentNetwork</h4>
 <ul class="blockList">
 <li class="blockList">
 <h4>getFrequency</h4>
-<pre>public&nbsp;int&nbsp;getFrequency()</pre>
-<div class="block">To retrieve the frequency of the device's current network
-
- Used by isNetwork5gHz
- <a href="../../../com/isupatches/wisefy/WiseFy.html#isNetwork5gHz--"><code>isNetwork5gHz()</code></a></div>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations">@Sync</a>
+ <a href="../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations">@CallingThread</a>
+public&nbsp;java.lang.Integer&nbsp;getFrequency()</pre>
+<div class="block">To retrieve the frequency of the device's current network</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
-<dd>int - The frequency of the devices current network</dd>
+<dd>Integer - The frequency of the devices current network or null if no network</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../com/isupatches/wisefy/WiseFy.html#getCurrentNetwork--"><code>getCurrentNetwork()</code></a></dd>
+</dl>
+</li>
+</ul>
+<a name="getFrequency-com.isupatches.wisefy.callbacks.GetFrequencyCallbacks-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getFrequency</h4>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Async.html" title="annotation in com.isupatches.wisefy.annotations">@Async</a>
+ <a href="../../../com/isupatches/wisefy/annotations/WiseFyThread.html" title="annotation in com.isupatches.wisefy.annotations">@WiseFyThread</a>
+public&nbsp;void&nbsp;getFrequency(<a href="../../../com/isupatches/wisefy/callbacks/GetFrequencyCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">GetFrequencyCallbacks</a>&nbsp;callbacks)</pre>
+<div class="block">To retrieve the frequency of the device's current network</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>callbacks</code> - The listener to return results to</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../com/isupatches/wisefy/WiseFy.html#execute-java.lang.Runnable-"><code>execute(Runnable)</code></a>, 
+<a href="../../../com/isupatches/wisefy/WiseFy.html#getCurrentNetwork-com.isupatches.wisefy.callbacks.GetCurrentNetworkCallbacks-"><code>getCurrentNetwork(GetCurrentNetworkCallbacks)</code></a>, 
+<a href="../../../com/isupatches/wisefy/callbacks/GetFrequencyCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><code>GetFrequencyCallbacks</code></a></dd>
 </dl>
 </li>
 </ul>
@@ -646,16 +1097,37 @@ <h4>getFrequency</h4>
 <ul class="blockList">
 <li class="blockList">
 <h4>getFrequency</h4>
-<pre>public&nbsp;int&nbsp;getFrequency(android.net.wifi.WifiInfo&nbsp;network)</pre>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations">@Sync</a>
+ <a href="../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations">@CallingThread</a>
+public&nbsp;java.lang.Integer&nbsp;getFrequency(android.net.wifi.WifiInfo&nbsp;network)</pre>
 <div class="block">To retrieve the frequency of a network</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>network</code> - - The network to return the frequency of
-
- Used by isNetwork5gHz
- <a href="../../../com/isupatches/wisefy/WiseFy.html#isNetwork5gHz-android.net.wifi.WifiInfo-"><code>isNetwork5gHz(WifiInfo)</code></a></dd>
+<dd><code>network</code> - The network to return the frequency of</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
-<dd>int - The frequency of the network</dd>
+<dd>Integer - The frequency of the devices current network or null if no network</dd>
+</dl>
+</li>
+</ul>
+<a name="getFrequency-android.net.wifi.WifiInfo-com.isupatches.wisefy.callbacks.GetFrequencyCallbacks-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getFrequency</h4>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Async.html" title="annotation in com.isupatches.wisefy.annotations">@Async</a>
+ <a href="../../../com/isupatches/wisefy/annotations/WiseFyThread.html" title="annotation in com.isupatches.wisefy.annotations">@WiseFyThread</a>
+public&nbsp;void&nbsp;getFrequency(android.net.wifi.WifiInfo&nbsp;network,
+                                               <a href="../../../com/isupatches/wisefy/callbacks/GetFrequencyCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">GetFrequencyCallbacks</a>&nbsp;callbacks)</pre>
+<div class="block">To retrieve the frequency of a network</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>network</code> - The network to return the frequency of</dd>
+<dd><code>callbacks</code> - The listener to return results to</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../com/isupatches/wisefy/WiseFy.html#execute-java.lang.Runnable-"><code>execute(Runnable)</code></a>, 
+<a href="../../../com/isupatches/wisefy/callbacks/GetFrequencyCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><code>GetFrequencyCallbacks</code></a>, 
+<a href="../../../com/isupatches/wisefy/constants/WiseFyCodes.html" title="class in com.isupatches.wisefy.constants"><code>WiseFyCodes</code></a></dd>
 </dl>
 </li>
 </ul>
@@ -665,15 +1137,120 @@ <h4>getFrequency</h4>
 <ul class="blockList">
 <li class="blockList">
 <h4>getNearbyAccessPoints</h4>
-<pre>public&nbsp;java.util.List&lt;android.net.wifi.ScanResult&gt;&nbsp;getNearbyAccessPoints(boolean&nbsp;filterDuplicates)</pre>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations">@Sync</a>
+ <a href="../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations">@CallingThread</a>
+public&nbsp;java.util.List&lt;android.net.wifi.ScanResult&gt;&nbsp;getNearbyAccessPoints(boolean&nbsp;filterDuplicates)</pre>
 <div class="block">To retrieve a list of nearby access points
 
  *NOTE* Setting filterDuplicates to true will not return SSIDs with a weaker signal strength (will always take the highest)</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>filterDuplicates</code> - - If you want to exclude SSIDs with that same name that have a weaker signal strength</dd>
+<dd><code>filterDuplicates</code> - If you want to exclude SSIDs with that same name that have a weaker signal strength</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>List of ScanResults|null - List of nearby access points</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><code>WiseFyPrerequisites.hasPrerequisites()</code>, 
+<code>WiseFySearch.removeEntriesWithLowerSignalStrength(List)</code></dd>
+</dl>
+</li>
+</ul>
+<a name="getNearbyAccessPoints-boolean-com.isupatches.wisefy.callbacks.GetNearbyAccessPointsCallbacks-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getNearbyAccessPoints</h4>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Async.html" title="annotation in com.isupatches.wisefy.annotations">@Async</a>
+ <a href="../../../com/isupatches/wisefy/annotations/WiseFyThread.html" title="annotation in com.isupatches.wisefy.annotations">@WiseFyThread</a>
+public&nbsp;void&nbsp;getNearbyAccessPoints(boolean&nbsp;filterDuplicates,
+                                                        <a href="../../../com/isupatches/wisefy/callbacks/GetNearbyAccessPointsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">GetNearbyAccessPointsCallbacks</a>&nbsp;callbacks)</pre>
+<div class="block">To retrieve a list of nearby access points
+
+ *NOTE* Setting filterDuplicates to true will not return SSIDs with a weaker signal strength (will always take the highest)</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>filterDuplicates</code> - If you want to exclude SSIDs with that same name that have a weaker signal strength</dd>
+<dd><code>callbacks</code> - The listener to return results to</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../com/isupatches/wisefy/WiseFy.html#execute-java.lang.Runnable-"><code>execute(Runnable)</code></a>, 
+<a href="../../../com/isupatches/wisefy/callbacks/GetNearbyAccessPointsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><code>GetNearbyAccessPointsCallbacks</code></a>, 
+<a href="../../../com/isupatches/wisefy/constants/WiseFyCodes.html" title="class in com.isupatches.wisefy.constants"><code>WiseFyCodes</code></a>, 
+<code>WiseFyPrerequisites.hasPrerequisites()</code>, 
+<code>WiseFySearch.removeEntriesWithLowerSignalStrength(List)</code></dd>
+</dl>
+</li>
+</ul>
+<a name="getRSSI-java.lang.String-boolean-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getRSSI</h4>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations">@Sync</a>
+ <a href="../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations">@CallingThread</a>
+ <a href="../../../com/isupatches/wisefy/annotations/WaitsForTimeout.html" title="annotation in com.isupatches.wisefy.annotations">@WaitsForTimeout</a>
+public&nbsp;java.lang.Integer&nbsp;getRSSI(java.lang.String&nbsp;regexForSSID,
+                                                                         boolean&nbsp;takeHighest,
+                                                                         int&nbsp;timeoutInMillis)</pre>
+</li>
+</ul>
+<a name="getRSSI-java.lang.String-boolean-int-com.isupatches.wisefy.callbacks.GetRSSICallbacks-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getRSSI</h4>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Async.html" title="annotation in com.isupatches.wisefy.annotations">@Async</a>
+ <a href="../../../com/isupatches/wisefy/annotations/WiseFyThread.html" title="annotation in com.isupatches.wisefy.annotations">@WiseFyThread</a>
+ <a href="../../../com/isupatches/wisefy/annotations/WaitsForTimeout.html" title="annotation in com.isupatches.wisefy.annotations">@WaitsForTimeout</a>
+public&nbsp;void&nbsp;getRSSI(java.lang.String&nbsp;regexForSSID,
+                                                            boolean&nbsp;takeHighest,
+                                                            int&nbsp;timeoutInMillis,
+                                                            <a href="../../../com/isupatches/wisefy/callbacks/GetRSSICallbacks.html" title="interface in com.isupatches.wisefy.callbacks">GetRSSICallbacks</a>&nbsp;callbacks)</pre>
+</li>
+</ul>
+<a name="getSavedNetwork-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getSavedNetwork</h4>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations">@Sync</a>
+ <a href="../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations">@CallingThread</a>
+public&nbsp;android.net.wifi.WifiConfiguration&nbsp;getSavedNetwork(java.lang.String&nbsp;regexForSSID)</pre>
+<div class="block">To search for and return a saved WiFiConfiguration given an SSID</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>regexForSSID</code> - The ssid to use while searching for saved configuration</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>WifiConfiguration|null - Saved network that matches the ssid</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><code>WiseFyPrerequisites.hasPrerequisites()</code>, 
+<code>WiseFySearch.findSavedNetworkByRegex(String)</code></dd>
+</dl>
+</li>
+</ul>
+<a name="getSavedNetwork-java.lang.String-com.isupatches.wisefy.callbacks.GetSavedNetworkCallbacks-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getSavedNetwork</h4>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Async.html" title="annotation in com.isupatches.wisefy.annotations">@Async</a>
+ <a href="../../../com/isupatches/wisefy/annotations/WiseFyThread.html" title="annotation in com.isupatches.wisefy.annotations">@WiseFyThread</a>
+public&nbsp;void&nbsp;getSavedNetwork(java.lang.String&nbsp;regexForSSID,
+                                                  <a href="../../../com/isupatches/wisefy/callbacks/GetSavedNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">GetSavedNetworkCallbacks</a>&nbsp;callbacks)</pre>
+<div class="block">To search for and return a saved WiFiConfiguration given an SSID</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>regexForSSID</code> - The ssid to use while searching for saved configuration</dd>
+<dd><code>callbacks</code> - The listener to return results to</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../com/isupatches/wisefy/WiseFy.html#execute-java.lang.Runnable-"><code>execute(Runnable)</code></a>, 
+<a href="../../../com/isupatches/wisefy/callbacks/GetSavedNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><code>GetSavedNetworkCallbacks</code></a>, 
+<a href="../../../com/isupatches/wisefy/constants/WiseFyCodes.html" title="class in com.isupatches.wisefy.constants"><code>WiseFyCodes</code></a>, 
+<code>WiseFyPrerequisites.hasPrerequisites()</code>, 
+<code>WiseFySearch.findSavedNetworkByRegex(String)</code></dd>
 </dl>
 </li>
 </ul>
@@ -683,25 +1260,79 @@ <h4>getNearbyAccessPoints</h4>
 <ul class="blockList">
 <li class="blockList">
 <h4>getSavedNetworks</h4>
-<pre>public&nbsp;java.util.List&lt;android.net.wifi.WifiConfiguration&gt;&nbsp;getSavedNetworks()</pre>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations">@Sync</a>
+ <a href="../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations">@CallingThread</a>
+public&nbsp;java.util.List&lt;android.net.wifi.WifiConfiguration&gt;&nbsp;getSavedNetworks()</pre>
 <div class="block">To retrieve a list of saved networks on a user's device</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>List of WifiConfiguration|null - List of saved networks on a users device</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><code>WiseFyPrerequisites.hasPrerequisites()</code></dd>
 </dl>
 </li>
 </ul>
+<a name="getSavedNetworks-com.isupatches.wisefy.callbacks.GetSavedNetworksCallbacks-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getSavedNetworks</h4>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Async.html" title="annotation in com.isupatches.wisefy.annotations">@Async</a>
+ <a href="../../../com/isupatches/wisefy/annotations/WiseFyThread.html" title="annotation in com.isupatches.wisefy.annotations">@WiseFyThread</a>
+public&nbsp;void&nbsp;getSavedNetworks(<a href="../../../com/isupatches/wisefy/callbacks/GetSavedNetworksCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">GetSavedNetworksCallbacks</a>&nbsp;callbacks)</pre>
+<div class="block">To retrieve a list of saved networks on a user's device</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>callbacks</code> - The listener to return results to</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../com/isupatches/wisefy/WiseFy.html#execute-java.lang.Runnable-"><code>execute(Runnable)</code></a>, 
+<a href="../../../com/isupatches/wisefy/callbacks/GetSavedNetworksCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><code>GetSavedNetworksCallbacks</code></a>, 
+<a href="../../../com/isupatches/wisefy/constants/WiseFyCodes.html" title="class in com.isupatches.wisefy.constants"><code>WiseFyCodes</code></a>, 
+<code>WiseFyPrerequisites.hasPrerequisites()</code></dd>
+</dl>
+</li>
+</ul>
+<a name="getSavedNetworks-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getSavedNetworks</h4>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations">@Sync</a>
+ <a href="../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations">@CallingThread</a>
+public&nbsp;java.util.List&lt;android.net.wifi.WifiConfiguration&gt;&nbsp;getSavedNetworks(java.lang.String&nbsp;regexForSSID)</pre>
+</li>
+</ul>
+<a name="getSavedNetworks-java.lang.String-com.isupatches.wisefy.callbacks.GetSavedNetworksCallbacks-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getSavedNetworks</h4>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Async.html" title="annotation in com.isupatches.wisefy.annotations">@Async</a>
+ <a href="../../../com/isupatches/wisefy/annotations/WiseFyThread.html" title="annotation in com.isupatches.wisefy.annotations">@WiseFyThread</a>
+public&nbsp;void&nbsp;getSavedNetworks(java.lang.String&nbsp;regexForSSID,
+                                                   <a href="../../../com/isupatches/wisefy/callbacks/GetSavedNetworksCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">GetSavedNetworksCallbacks</a>&nbsp;callbacks)</pre>
+</li>
+</ul>
 <a name="isDeviceConnectedToMobileNetwork--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>isDeviceConnectedToMobileNetwork</h4>
-<pre>public&nbsp;boolean&nbsp;isDeviceConnectedToMobileNetwork()</pre>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations">@Sync</a>
+ <a href="../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations">@CallingThread</a>
+public&nbsp;boolean&nbsp;isDeviceConnectedToMobileNetwork()</pre>
 <div class="block">To check if the device is connected to a mobile network</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>bool - If the device is currently connected to a mobile network</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../com/isupatches/wisefy/constants/NetworkTypes.html" title="class in com.isupatches.wisefy.constants"><code>NetworkTypes</code></a>, 
+<code>WiseFyConnection.isNetworkConnectedAndMatchesType(NetworkInfo, String)</code>, 
+<code>WiseFyPrerequisites.hasPrerequisites()</code></dd>
 </dl>
 </li>
 </ul>
@@ -711,11 +1342,16 @@ <h4>isDeviceConnectedToMobileNetwork</h4>
 <ul class="blockList">
 <li class="blockList">
 <h4>isDeviceConnectedToMobileOrWifiNetwork</h4>
-<pre>public&nbsp;boolean&nbsp;isDeviceConnectedToMobileOrWifiNetwork()</pre>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations">@Sync</a>
+ <a href="../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations">@CallingThread</a>
+public&nbsp;boolean&nbsp;isDeviceConnectedToMobileOrWifiNetwork()</pre>
 <div class="block">To check if the device is connected to a mobile or wifi network</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>bool - If the device is currently connected to a mobile or wifi network</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><code>WiseFyConnection.isNetworkConnected(NetworkInfo)</code>, 
+<code>WiseFyPrerequisites.hasPrerequisites()</code></dd>
 </dl>
 </li>
 </ul>
@@ -725,15 +1361,19 @@ <h4>isDeviceConnectedToMobileOrWifiNetwork</h4>
 <ul class="blockList">
 <li class="blockList">
 <h4>isDeviceConnectedToSSID</h4>
-<pre>public&nbsp;boolean&nbsp;isDeviceConnectedToSSID(java.lang.String&nbsp;ssid)</pre>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations">@Sync</a>
+ <a href="../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations">@CallingThread</a>
+public&nbsp;boolean&nbsp;isDeviceConnectedToSSID(java.lang.String&nbsp;ssid)</pre>
 <div class="block">To check if the device is connected to a given SSID
 
  Used by connectToNetwork</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>ssid</code> - - The SSID to check if the device is attached to</dd>
+<dd><code>ssid</code> - The SSID to check if the device is attached to</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>bool - If the device is currently attached to the given SSID</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><code>WiseFyConnection.isCurrentNetworkConnectedToSSID(String)</code></dd>
 </dl>
 </li>
 </ul>
@@ -743,11 +1383,17 @@ <h4>isDeviceConnectedToSSID</h4>
 <ul class="blockList">
 <li class="blockList">
 <h4>isDeviceConnectedToWifiNetwork</h4>
-<pre>public&nbsp;boolean&nbsp;isDeviceConnectedToWifiNetwork()</pre>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations">@Sync</a>
+ <a href="../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations">@CallingThread</a>
+public&nbsp;boolean&nbsp;isDeviceConnectedToWifiNetwork()</pre>
 <div class="block">To check if the device is connected to a wifi network</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>bool - If the device is currently connected to a wifi network</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../com/isupatches/wisefy/constants/NetworkTypes.html" title="class in com.isupatches.wisefy.constants"><code>NetworkTypes</code></a>, 
+<code>WiseFyPrerequisites.hasPrerequisites()</code>, 
+<code>WiseFyConnection.isNetworkConnectedAndMatchesType(NetworkInfo, String)</code></dd>
 </dl>
 </li>
 </ul>
@@ -757,7 +1403,9 @@ <h4>isDeviceConnectedToWifiNetwork</h4>
 <ul class="blockList">
 <li class="blockList">
 <h4>isLoggingEnabled</h4>
-<pre>public&nbsp;boolean&nbsp;isLoggingEnabled()</pre>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations">@Sync</a>
+ <a href="../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations">@CallingThread</a>
+public&nbsp;boolean&nbsp;isLoggingEnabled()</pre>
 <div class="block">To query if logging is enabled or disabled for a WiseFy instance</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -771,13 +1419,17 @@ <h4>isLoggingEnabled</h4>
 <ul class="blockList">
 <li class="blockList">
 <h4>isNetwork5gHz</h4>
-<pre>public&nbsp;boolean&nbsp;isNetwork5gHz()</pre>
-<div class="block">To check if the device's current network is 5gHz
-
- <a href="../../../com/isupatches/wisefy/WiseFy.html#getFrequency--"><code>getFrequency()</code></a></div>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations">@Sync</a>
+ <a href="../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations">@CallingThread</a>
+public&nbsp;boolean&nbsp;isNetwork5gHz()</pre>
+<div class="block">To check if the device's current network is 5gHz</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>boolean - If the network is 5gHz</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../com/isupatches/wisefy/WiseFy.html#getFrequency--"><code>getFrequency()</code></a>, 
+<a href="../../../com/isupatches/wisefy/WiseFy.html#MIN_FREQUENCY_5GHZ"><code>MIN_FREQUENCY_5GHZ</code></a>, 
+<a href="../../../com/isupatches/wisefy/WiseFy.html#MAX_FREQUENCY_5GHZ"><code>MAX_FREQUENCY_5GHZ</code></a></dd>
 </dl>
 </li>
 </ul>
@@ -787,15 +1439,19 @@ <h4>isNetwork5gHz</h4>
 <ul class="blockList">
 <li class="blockList">
 <h4>isNetwork5gHz</h4>
-<pre>public&nbsp;boolean&nbsp;isNetwork5gHz(android.net.wifi.WifiInfo&nbsp;network)</pre>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations">@Sync</a>
+ <a href="../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations">@CallingThread</a>
+public&nbsp;boolean&nbsp;isNetwork5gHz(android.net.wifi.WifiInfo&nbsp;network)</pre>
 <div class="block">To check if a given network is 5gHz</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>network</code> - - The network to check if it's 5gHz
-
- <a href="../../../com/isupatches/wisefy/WiseFy.html#getFrequency-android.net.wifi.WifiInfo-"><code>getFrequency(WifiInfo)</code></a></dd>
+<dd><code>network</code> - The network to check if it's 5gHz</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>boolean - If the network is 5gHz</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../com/isupatches/wisefy/WiseFy.html#getFrequency-android.net.wifi.WifiInfo-"><code>getFrequency(WifiInfo)</code></a>, 
+<a href="../../../com/isupatches/wisefy/WiseFy.html#MIN_FREQUENCY_5GHZ"><code>MIN_FREQUENCY_5GHZ</code></a>, 
+<a href="../../../com/isupatches/wisefy/WiseFy.html#MAX_FREQUENCY_5GHZ"><code>MAX_FREQUENCY_5GHZ</code></a></dd>
 </dl>
 </li>
 </ul>
@@ -805,13 +1461,58 @@ <h4>isNetwork5gHz</h4>
 <ul class="blockList">
 <li class="blockList">
 <h4>isNetworkInConfigurationList</h4>
-<pre>public&nbsp;boolean&nbsp;isNetworkInConfigurationList(java.lang.String&nbsp;ssid)</pre>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations">@Sync</a>
+ <a href="../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations">@CallingThread</a>
+public&nbsp;boolean&nbsp;isNetworkInConfigurationList(java.lang.String&nbsp;ssid)</pre>
 <div class="block">To check if an SSID is in the list of configured networks</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>ssid</code> - - The SSID to check and see if it's in the list of configured networks</dd>
+<dd><code>ssid</code> - The SSID to check and see if it's in the list of configured networks</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>boolean - If the SSID is in the list of configured networks</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><code>WiseFyPrerequisites.hasPrerequisites()</code>, 
+<code>WiseFySearch.isNetworkASavedConfiguration(String)</code></dd>
+</dl>
+</li>
+</ul>
+<a name="isNetworkEAP-android.net.wifi.ScanResult-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isNetworkEAP</h4>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations">@Sync</a>
+ <a href="../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations">@CallingThread</a>
+public&nbsp;boolean&nbsp;isNetworkEAP(android.net.wifi.ScanResult&nbsp;scanResult)</pre>
+<div class="block">To check and return if a network is a EAP network</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>scanResult</code> - The network to check</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>boolean - Whether the network has EAP capabilities listed</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../com/isupatches/wisefy/constants/Capabilities.html" title="class in com.isupatches.wisefy.constants"><code>Capabilities</code></a></dd>
+</dl>
+</li>
+</ul>
+<a name="isNetworkPSK-android.net.wifi.ScanResult-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isNetworkPSK</h4>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations">@Sync</a>
+ <a href="../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations">@CallingThread</a>
+public&nbsp;boolean&nbsp;isNetworkPSK(android.net.wifi.ScanResult&nbsp;scanResult)</pre>
+<div class="block">To check and return if a network is a PSK network</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>scanResult</code> - The network to check</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>boolean - Whether the network has PSK capabilities listed</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../com/isupatches/wisefy/constants/Capabilities.html" title="class in com.isupatches.wisefy.constants"><code>Capabilities</code></a></dd>
 </dl>
 </li>
 </ul>
@@ -821,13 +1522,77 @@ <h4>isNetworkInConfigurationList</h4>
 <ul class="blockList">
 <li class="blockList">
 <h4>isNetworkSecure</h4>
-<pre>public&nbsp;boolean&nbsp;isNetworkSecure(android.net.wifi.ScanResult&nbsp;scanResult)</pre>
-<div class="block">To check and return if a network is secure (WEP/PSK/EAP capabilities)</div>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations">@Sync</a>
+ <a href="../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations">@CallingThread</a>
+public&nbsp;boolean&nbsp;isNetworkSecure(android.net.wifi.ScanResult&nbsp;scanResult)</pre>
+<div class="block">To check and return if a network is secure (WEP/WPA/WPA2 capabilities)</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>scanResult</code> - - The network to see if it is secure</dd>
+<dd><code>scanResult</code> - The network to see if it is secure</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>boolean - Whether the network is secure</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../com/isupatches/wisefy/constants/Capabilities.html" title="class in com.isupatches.wisefy.constants"><code>Capabilities</code></a></dd>
+</dl>
+</li>
+</ul>
+<a name="isNetworkWEP-android.net.wifi.ScanResult-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isNetworkWEP</h4>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations">@Sync</a>
+ <a href="../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations">@CallingThread</a>
+public&nbsp;boolean&nbsp;isNetworkWEP(android.net.wifi.ScanResult&nbsp;scanResult)</pre>
+<div class="block">To check and return if a network is a WEP network</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>scanResult</code> - The network to check</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>boolean - Whether the network has WEP capabilities listed</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../com/isupatches/wisefy/constants/Capabilities.html" title="class in com.isupatches.wisefy.constants"><code>Capabilities</code></a></dd>
+</dl>
+</li>
+</ul>
+<a name="isNetworkWPA-android.net.wifi.ScanResult-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isNetworkWPA</h4>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations">@Sync</a>
+ <a href="../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations">@CallingThread</a>
+public&nbsp;boolean&nbsp;isNetworkWPA(android.net.wifi.ScanResult&nbsp;scanResult)</pre>
+<div class="block">To check and return if a network is a WPA network</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>scanResult</code> - The network to check</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>boolean - Whether the network has WPA capabilities listed</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../com/isupatches/wisefy/constants/Capabilities.html" title="class in com.isupatches.wisefy.constants"><code>Capabilities</code></a></dd>
+</dl>
+</li>
+</ul>
+<a name="isNetworkWPA2-android.net.wifi.ScanResult-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isNetworkWPA2</h4>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations">@Sync</a>
+ <a href="../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations">@CallingThread</a>
+public&nbsp;boolean&nbsp;isNetworkWPA2(android.net.wifi.ScanResult&nbsp;scanResult)</pre>
+<div class="block">To check and return if a network is a WPA2 network</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>scanResult</code> - The network to check</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>boolean - Whether the network has WPA2 capabilities listed</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../com/isupatches/wisefy/constants/Capabilities.html" title="class in com.isupatches.wisefy.constants"><code>Capabilities</code></a></dd>
 </dl>
 </li>
 </ul>
@@ -837,11 +1602,15 @@ <h4>isNetworkSecure</h4>
 <ul class="blockList">
 <li class="blockList">
 <h4>isWifiEnabled</h4>
-<pre>public&nbsp;boolean&nbsp;isWifiEnabled()</pre>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations">@Sync</a>
+ <a href="../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations">@CallingThread</a>
+public&nbsp;boolean&nbsp;isWifiEnabled()</pre>
 <div class="block">To check if Wifi is enabled on the device or not</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>boolean - if Wifi is enabled on device</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><code>WiseFyPrerequisites.hasPrerequisites()</code></dd>
 </dl>
 </li>
 </ul>
@@ -851,34 +1620,179 @@ <h4>isWifiEnabled</h4>
 <ul class="blockList">
 <li class="blockList">
 <h4>removeNetwork</h4>
-<pre>public&nbsp;boolean&nbsp;removeNetwork(java.lang.String&nbsp;ssidToRemove)</pre>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations">@Sync</a>
+ <a href="../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations">@CallingThread</a>
+public&nbsp;boolean&nbsp;removeNetwork(java.lang.String&nbsp;ssidToRemove)</pre>
 <div class="block">To remove a configured network</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>ssidToRemove</code> - - The ssid of the network you want to remove from the configured network list</dd>
+<dd><code>ssidToRemove</code> - The ssid of the network you want to remove from the configured network list</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>boolean - If the command succeeded in removing the network</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><code>WiseFyPrerequisites.hasPrerequisites()</code>, 
+<code>WiseFySearch.findSavedNetworkByRegex(String)</code></dd>
+</dl>
+</li>
+</ul>
+<a name="removeNetwork-java.lang.String-com.isupatches.wisefy.callbacks.RemoveNetworkCallbacks-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>removeNetwork</h4>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Async.html" title="annotation in com.isupatches.wisefy.annotations">@Async</a>
+ <a href="../../../com/isupatches/wisefy/annotations/WiseFyThread.html" title="annotation in com.isupatches.wisefy.annotations">@WiseFyThread</a>
+public&nbsp;void&nbsp;removeNetwork(java.lang.String&nbsp;ssidToRemove,
+                                                <a href="../../../com/isupatches/wisefy/callbacks/RemoveNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">RemoveNetworkCallbacks</a>&nbsp;callbacks)</pre>
+<div class="block">To remove a configured network</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>ssidToRemove</code> - The ssid of the network you want to remove from the configured network list</dd>
+<dd><code>callbacks</code> - The listener to return results to</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../com/isupatches/wisefy/WiseFy.html#execute-java.lang.Runnable-"><code>execute(Runnable)</code></a>, 
+<a href="../../../com/isupatches/wisefy/callbacks/RemoveNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><code>RemoveNetworkCallbacks</code></a>, 
+<a href="../../../com/isupatches/wisefy/constants/WiseFyCodes.html" title="class in com.isupatches.wisefy.constants"><code>WiseFyCodes</code></a>, 
+<code>WiseFyPrerequisites.hasPrerequisites()</code>, 
+<code>WiseFySearch.findSavedNetworkByRegex(String)</code></dd>
 </dl>
 </li>
 </ul>
+<a name="searchForAccessPoint-java.lang.String-int-boolean-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>searchForAccessPoint</h4>
+<pre>public&nbsp;android.net.wifi.ScanResult&nbsp;searchForAccessPoint(java.lang.String&nbsp;regexForSSID,
+                                                        int&nbsp;timeoutInMillis,
+                                                        boolean&nbsp;filterDuplicates)</pre>
+</li>
+</ul>
+<a name="searchForAccessPoint-java.lang.String-int-boolean-com.isupatches.wisefy.callbacks.SearchForAccessPointCallbacks-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>searchForAccessPoint</h4>
+<pre>public&nbsp;void&nbsp;searchForAccessPoint(java.lang.String&nbsp;regexForSSID,
+                                 int&nbsp;timeoutInMillis,
+                                 boolean&nbsp;filterDuplicates,
+                                 <a href="../../../com/isupatches/wisefy/callbacks/SearchForAccessPointCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">SearchForAccessPointCallbacks</a>&nbsp;callbacks)</pre>
+</li>
+</ul>
+<a name="searchForAccessPoints-java.lang.String-boolean-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>searchForAccessPoints</h4>
+<pre>public&nbsp;java.util.List&lt;android.net.wifi.ScanResult&gt;&nbsp;searchForAccessPoints(java.lang.String&nbsp;regexForSSID,
+                                                                         boolean&nbsp;filterDuplicates)</pre>
+</li>
+</ul>
+<a name="searchForAccessPoints-java.lang.String-boolean-com.isupatches.wisefy.callbacks.SearchForAccessPointsCallbacks-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>searchForAccessPoints</h4>
+<pre>public&nbsp;void&nbsp;searchForAccessPoints(java.lang.String&nbsp;regexForSSID,
+                                  boolean&nbsp;filterDuplicates,
+                                  <a href="../../../com/isupatches/wisefy/callbacks/SearchForAccessPointsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">SearchForAccessPointsCallbacks</a>&nbsp;callbacks)</pre>
+</li>
+</ul>
 <a name="searchForSSID-java.lang.String-int-">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>searchForSSID</h4>
-<pre>public&nbsp;java.lang.String&nbsp;searchForSSID(java.lang.String&nbsp;ssidToSearchFor,
-                                      int&nbsp;timeoutInMillis)</pre>
-<div class="block">To search local networks and return the first one that contains a given ssid (non-case sensitive)</div>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations">@Sync</a>
+ <a href="../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations">@CallingThread</a>
+ <a href="../../../com/isupatches/wisefy/annotations/WaitsForTimeout.html" title="annotation in com.isupatches.wisefy.annotations">@WaitsForTimeout</a>
+public&nbsp;java.lang.String&nbsp;searchForSSID(java.lang.String&nbsp;regexForSSID,
+                                                                              int&nbsp;timeoutInMillis)</pre>
+<div class="block">To search local networks and return the first one that contains a given ssid</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>ssidToSearchFor</code> - - The ssid to search for</dd>
-<dd><code>timeoutInMillis</code> - - The number of milliseconds to keep searching for the SSID</dd>
+<dd><code>regexForSSID</code> - The regex to be used to search for the ssid</dd>
+<dd><code>timeoutInMillis</code> - The number of milliseconds to keep searching for the SSID</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>String|null - The first SSID that contains the search ssid (if any, else null)</dd>
 </dl>
 </li>
 </ul>
+<a name="searchForSSID-java.lang.String-int-com.isupatches.wisefy.callbacks.SearchForSSIDCallbacks-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>searchForSSID</h4>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Async.html" title="annotation in com.isupatches.wisefy.annotations">@Async</a>
+ <a href="../../../com/isupatches/wisefy/annotations/WiseFyThread.html" title="annotation in com.isupatches.wisefy.annotations">@WiseFyThread</a>
+ <a href="../../../com/isupatches/wisefy/annotations/WaitsForTimeout.html" title="annotation in com.isupatches.wisefy.annotations">@WaitsForTimeout</a>
+public&nbsp;void&nbsp;searchForSSID(java.lang.String&nbsp;regexForSSID,
+                                                                  int&nbsp;timeoutInMillis,
+                                                                  <a href="../../../com/isupatches/wisefy/callbacks/SearchForSSIDCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">SearchForSSIDCallbacks</a>&nbsp;callbacks)</pre>
+<div class="block">To search local networks and return the first one that contains a given ssid</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>regexForSSID</code> - The regex to be used to search for the ssid</dd>
+<dd><code>timeoutInMillis</code> - The number of milliseconds to keep searching for the SSID</dd>
+<dd><code>callbacks</code> - The listener to return results to</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../com/isupatches/wisefy/WiseFy.html#execute-java.lang.Runnable-"><code>execute(Runnable)</code></a>, 
+<a href="../../../com/isupatches/wisefy/callbacks/SearchForSSIDCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><code>SearchForSSIDCallbacks</code></a>, 
+<a href="../../../com/isupatches/wisefy/constants/WiseFyCodes.html" title="class in com.isupatches.wisefy.constants"><code>WiseFyCodes</code></a>, 
+<code>WiseFySearch.findAccessPointByRegex(String, Integer, boolean)</code></dd>
+</dl>
+</li>
+</ul>
+<a name="searchForSSIDs-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>searchForSSIDs</h4>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations">@Sync</a>
+ <a href="../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations">@CallingThread</a>
+ <a href="../../../com/isupatches/wisefy/annotations/WaitsForTimeout.html" title="annotation in com.isupatches.wisefy.annotations">@WaitsForTimeout</a>
+public&nbsp;java.util.List&lt;java.lang.String&gt;&nbsp;searchForSSIDs(java.lang.String&nbsp;regexForSSID)</pre>
+<div class="block">To search local networks and return the first one that contains a given ssid</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>regexForSSID</code> - The regex to be used to search for the ssid</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>String|null - The first SSID that contains the search ssid (if any, else null)</dd>
+</dl>
+</li>
+</ul>
+<a name="searchForSSIDs-java.lang.String-com.isupatches.wisefy.callbacks.SearchForSSIDsCallbacks-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>searchForSSIDs</h4>
+<pre><a href="../../../com/isupatches/wisefy/annotations/Async.html" title="annotation in com.isupatches.wisefy.annotations">@Async</a>
+ <a href="../../../com/isupatches/wisefy/annotations/WiseFyThread.html" title="annotation in com.isupatches.wisefy.annotations">@WiseFyThread</a>
+ <a href="../../../com/isupatches/wisefy/annotations/WaitsForTimeout.html" title="annotation in com.isupatches.wisefy.annotations">@WaitsForTimeout</a>
+public&nbsp;void&nbsp;searchForSSIDs(java.lang.String&nbsp;regexForSSID,
+                                                                   <a href="../../../com/isupatches/wisefy/callbacks/SearchForSSIDsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">SearchForSSIDsCallbacks</a>&nbsp;callbacks)</pre>
+<div class="block">To search local networks and return the first one that contains a given ssid</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>regexForSSID</code> - The regex to be used to search for the ssid</dd>
+<dd><code>callbacks</code> - The listener to return results to</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../com/isupatches/wisefy/WiseFy.html#execute-java.lang.Runnable-"><code>execute(Runnable)</code></a>, 
+<a href="../../../com/isupatches/wisefy/callbacks/SearchForSSIDCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><code>SearchForSSIDCallbacks</code></a>, 
+<a href="../../../com/isupatches/wisefy/constants/WiseFyCodes.html" title="class in com.isupatches.wisefy.constants"><code>WiseFyCodes</code></a>, 
+<code>WiseFySearch.findSSIDsMatchingRegex(String)</code></dd>
+</dl>
+</li>
+</ul>
 </li>
 </ul>
 </li>
@@ -907,7 +1821,7 @@ <h4>searchForSSID</h4>
 <div class="subNav">
 <ul class="navList">
 <li>Prev&nbsp;Class</li>
-<li><a href="../../../com/isupatches/wisefy/WiseFy.withContext.html" title="class in com.isupatches.wisefy"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../com/isupatches/wisefy/WiseFy.brains.html" title="class in com.isupatches.wisefy"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../index.html?com/isupatches/wisefy/WiseFy.html" target="_top">Frames</a></li>
diff --git a/javadoc/com/isupatches/wisefy/WiseFy.withContext.html b/javadoc/com/isupatches/wisefy/WiseFy.withContext.html
index 2a3d4484..8f57a6bd 100644
--- a/javadoc/com/isupatches/wisefy/WiseFy.withContext.html
+++ b/javadoc/com/isupatches/wisefy/WiseFy.withContext.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Tue Jul 04 09:39:44 CDT 2017 -->
-<title>WiseFy.withContext (wisefy 1.0.10 API)</title>
-<meta name="date" content="2017-07-04">
+<!-- Generated by javadoc (1.8.0_102) on Tue Jul 11 08:22:40 CDT 2017 -->
+<title>WiseFy.withContext (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-11">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="WiseFy.withContext (wisefy 1.0.10 API)";
+            parent.document.title="WiseFy.withContext (wisefy 2.0.0-BETA API)";
         }
     }
     catch(err) {
@@ -201,7 +201,7 @@ <h4>withContext</h4>
 <div class="block">Mandatory - The public constructor for the builder that requires a context</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>context</code> - - The activity or application context to get a WifiConfiguration and
+<dd><code>context</code> - The activity or application context to get a WifiConfiguration and
  ConnectivityManager instance</dd>
 </dl>
 </li>
@@ -241,7 +241,7 @@ <h4>logging</h4>
 <div class="block">Optional - Builder method that enables/disables logging for a WiseWy instance</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>loggingEnabled</code> - - If logging is enabled or disabled for an instance
+<dd><code>loggingEnabled</code> - If logging is enabled or disabled for an instance
  <code>Logging</code></dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>withContext - The builder with updated logging setting</dd>
diff --git a/javadoc/com/isupatches/wisefy/WiseFyApplication.html b/javadoc/com/isupatches/wisefy/WiseFyApplication.html
new file mode 100644
index 00000000..55a42a03
--- /dev/null
+++ b/javadoc/com/isupatches/wisefy/WiseFyApplication.html
@@ -0,0 +1,350 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 18:36:46 CDT 2017 -->
+<title>WiseFyApplication (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="WiseFyApplication (wisefy 2.0.0-BETA API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-all.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../com/isupatches/wisefy/WiseFy.brains.html" title="class in com.isupatches.wisefy"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../index.html?com/isupatches/wisefy/WiseFyApplication.html" target="_top">Frames</a></li>
+<li><a href="WiseFyApplication.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested.classes.inherited.from.class.android.app.Application">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.android.content.Context">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">com.isupatches.wisefy</div>
+<h2 title="Class WiseFyApplication" class="title">Class WiseFyApplication</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>android.content.Context</li>
+<li>
+<ul class="inheritance">
+<li>android.content.ContextWrapper</li>
+<li>
+<ul class="inheritance">
+<li>android.app.Application</li>
+<li>
+<ul class="inheritance">
+<li>com.isupatches.wisefy.WiseFyApplication</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>android.content.ComponentCallbacks, android.content.ComponentCallbacks2</dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">WiseFyApplication</span>
+extends android.app.Application</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== NESTED CLASS SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="nested.class.summary">
+<!--   -->
+</a>
+<h3>Nested Class Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="nested.classes.inherited.from.class.android.app.Application">
+<!--   -->
+</a>
+<h3>Nested classes/interfaces inherited from class&nbsp;android.app.Application</h3>
+<code>android.app.Application.ActivityLifecycleCallbacks, android.app.Application.OnProvideAssistDataListener</code></li>
+</ul>
+</li>
+</ul>
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.android.content.Context">
+<!--   -->
+</a>
+<h3>Fields inherited from class&nbsp;android.content.Context</h3>
+<code>ACCESSIBILITY_SERVICE, ACCOUNT_SERVICE, ACTIVITY_SERVICE, ALARM_SERVICE, APP_OPS_SERVICE, APPWIDGET_SERVICE, AUDIO_SERVICE, BATTERY_SERVICE, BIND_ABOVE_CLIENT, BIND_ADJUST_WITH_ACTIVITY, BIND_ALLOW_OOM_MANAGEMENT, BIND_AUTO_CREATE, BIND_DEBUG_UNBIND, BIND_EXTERNAL_SERVICE, BIND_IMPORTANT, BIND_NOT_FOREGROUND, BIND_WAIVE_PRIORITY, BLUETOOTH_SERVICE, CAMERA_SERVICE, CAPTIONING_SERVICE, CARRIER_CONFIG_SERVICE, CLIPBOARD_SERVICE, COMPANION_DEVICE_SERVICE, CONNECTIVITY_SERVICE, CONSUMER_IR_SERVICE, CONTEXT_IGNORE_SECURITY, CONTEXT_INCLUDE_CODE, CONTEXT_RESTRICTED, DEVICE_POLICY_SERVICE, DISPLAY_SERVICE, DOWNLOAD_SERVICE, DROPBOX_SERVICE, FINGERPRINT_SERVICE, HARDWARE_PROPERTIES_SERVICE, INPUT_METHOD_SERVICE, INPUT_SERVICE, JOB_SCHEDULER_SERVICE, KEYGUARD_SERVICE, LAUNCHER_APPS_SERVICE, LAYOUT_INFLATER_SERVICE, LOCATION_SERVICE, MEDIA_PROJECTION_SERVICE, MEDIA_ROUTER_SERVICE, MEDIA_SESSION_SERVICE, MIDI_SERVICE, MODE_APPEND, MODE_ENABLE_WRITE_AHEAD_LOGGING, MODE_MULTI_PROCESS, MODE_NO_LOCALIZED_COLLATORS, MODE_PRIVATE, MODE_WORLD_READABLE, MODE_WORLD_WRITEABLE, NETWORK_STATS_SERVICE, NFC_SERVICE, NOTIFICATION_SERVICE, NSD_SERVICE, POWER_SERVICE, PRINT_SERVICE, RECEIVER_VISIBLE_TO_INSTANT_APPS, RESTRICTIONS_SERVICE, SEARCH_SERVICE, SENSOR_SERVICE, SHORTCUT_SERVICE, STORAGE_SERVICE, STORAGE_STATS_SERVICE, SYSTEM_HEALTH_SERVICE, TELECOM_SERVICE, TELEPHONY_SERVICE, TELEPHONY_SUBSCRIPTION_SERVICE, TEXT_CLASSIFICATION_SERVICE, TEXT_SERVICES_MANAGER_SERVICE, TV_INPUT_SERVICE, UI_MODE_SERVICE, USAGE_STATS_SERVICE, USB_SERVICE, USER_SERVICE, VIBRATOR_SERVICE, WALLPAPER_SERVICE, WIFI_AWARE_SERVICE, WIFI_P2P_SERVICE, WIFI_SERVICE, WINDOW_SERVICE</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.android.content.ComponentCallbacks2">
+<!--   -->
+</a>
+<h3>Fields inherited from interface&nbsp;android.content.ComponentCallbacks2</h3>
+<code>TRIM_MEMORY_BACKGROUND, TRIM_MEMORY_COMPLETE, TRIM_MEMORY_MODERATE, TRIM_MEMORY_RUNNING_CRITICAL, TRIM_MEMORY_RUNNING_LOW, TRIM_MEMORY_RUNNING_MODERATE, TRIM_MEMORY_UI_HIDDEN</code></li>
+</ul>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFyApplication.html#WiseFyApplication--">WiseFyApplication</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/isupatches/wisefy/WiseFyApplication.html#onCreate--">onCreate</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.android.app.Application">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;android.app.Application</h3>
+<code>onConfigurationChanged, onLowMemory, onTerminate, onTrimMemory, registerActivityLifecycleCallbacks, registerComponentCallbacks, registerOnProvideAssistDataListener, unregisterActivityLifecycleCallbacks, unregisterComponentCallbacks, unregisterOnProvideAssistDataListener</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.android.content.ContextWrapper">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;android.content.ContextWrapper</h3>
+<code>attachBaseContext, bindService, checkCallingOrSelfPermission, checkCallingOrSelfUriPermission, checkCallingPermission, checkCallingUriPermission, checkPermission, checkSelfPermission, checkUriPermission, checkUriPermission, clearWallpaper, createConfigurationContext, createContextForSplit, createDeviceProtectedStorageContext, createDisplayContext, createPackageContext, databaseList, deleteDatabase, deleteFile, deleteSharedPreferences, enforceCallingOrSelfPermission, enforceCallingOrSelfUriPermission, enforceCallingPermission, enforceCallingUriPermission, enforcePermission, enforceUriPermission, enforceUriPermission, fileList, getApplicationContext, getApplicationInfo, getAssets, getBaseContext, getCacheDir, getClassLoader, getCodeCacheDir, getContentResolver, getDatabasePath, getDataDir, getDir, getExternalCacheDir, getExternalCacheDirs, getExternalFilesDir, getExternalFilesDirs, getExternalMediaDirs, getFilesDir, getFileStreamPath, getMainLooper, getNoBackupFilesDir, getObbDir, getObbDirs, getPackageCodePath, getPackageManager, getPackageName, getPackageResourcePath, getResources, getSharedPreferences, getSystemService, getSystemServiceName, getTheme, getWallpaper, getWallpaperDesiredMinimumHeight, getWallpaperDesiredMinimumWidth, grantUriPermission, isDeviceProtectedStorage, isRestricted, moveDatabaseFrom, moveSharedPreferencesFrom, openFileInput, openFileOutput, openOrCreateDatabase, openOrCreateDatabase, peekWallpaper, registerReceiver, registerReceiver, registerReceiver, registerReceiver, removeStickyBroadcast, removeStickyBroadcastAsUser, revokeUriPermission, revokeUriPermission, sendBroadcast, sendBroadcast, sendBroadcastAsUser, sendBroadcastAsUser, sendOrderedBroadcast, sendOrderedBroadcast, sendOrderedBroadcastAsUser, sendStickyBroadcast, sendStickyBroadcastAsUser, sendStickyOrderedBroadcast, sendStickyOrderedBroadcastAsUser, setTheme, setWallpaper, setWallpaper, startActivities, startActivities, startActivity, startActivity, startForegroundService, startInstrumentation, startIntentSender, startIntentSender, startService, stopService, unbindService, unregisterReceiver</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.android.content.Context">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;android.content.Context</h3>
+<code>getColor, getColorStateList, getDrawable, getString, getString, getSystemService, getText, obtainStyledAttributes, obtainStyledAttributes, obtainStyledAttributes, obtainStyledAttributes</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="WiseFyApplication--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>WiseFyApplication</h4>
+<pre>public&nbsp;WiseFyApplication()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="onCreate--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>onCreate</h4>
+<pre>public&nbsp;void&nbsp;onCreate()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code>onCreate</code>&nbsp;in class&nbsp;<code>android.app.Application</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-all.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../com/isupatches/wisefy/WiseFy.brains.html" title="class in com.isupatches.wisefy"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../index.html?com/isupatches/wisefy/WiseFyApplication.html" target="_top">Frames</a></li>
+<li><a href="WiseFyApplication.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested.classes.inherited.from.class.android.app.Application">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.android.content.Context">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/com/isupatches/wisefy/annotations/Async.html b/javadoc/com/isupatches/wisefy/annotations/Async.html
new file mode 100644
index 00000000..8c5c59be
--- /dev/null
+++ b/javadoc/com/isupatches/wisefy/annotations/Async.html
@@ -0,0 +1,165 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>Async (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Async (wisefy 2.0.0-BETA API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/annotations/Async.html" target="_top">Frames</a></li>
+<li><a href="Async.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Required&nbsp;|&nbsp;</li>
+<li>Optional</li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Element</li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">com.isupatches.wisefy.annotations</div>
+<h2 title="Annotation Type Async" class="title">Annotation Type Async</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>@Documented
+ @Target(value=METHOD)
+ @Inherited
+ @Retention(value=RUNTIME)
+public @interface <span class="memberNameLabel">Async</span></pre>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/annotations/Async.html" target="_top">Frames</a></li>
+<li><a href="Async.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Required&nbsp;|&nbsp;</li>
+<li>Optional</li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Element</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/com/isupatches/wisefy/annotations/CallingThread.html b/javadoc/com/isupatches/wisefy/annotations/CallingThread.html
new file mode 100644
index 00000000..d04bd184
--- /dev/null
+++ b/javadoc/com/isupatches/wisefy/annotations/CallingThread.html
@@ -0,0 +1,165 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>CallingThread (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="CallingThread (wisefy 2.0.0-BETA API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/annotations/Async.html" title="annotation in com.isupatches.wisefy.annotations"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/annotations/CallingThread.html" target="_top">Frames</a></li>
+<li><a href="CallingThread.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Required&nbsp;|&nbsp;</li>
+<li>Optional</li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Element</li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">com.isupatches.wisefy.annotations</div>
+<h2 title="Annotation Type CallingThread" class="title">Annotation Type CallingThread</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>@Documented
+ @Target(value=METHOD)
+ @Inherited
+ @Retention(value=RUNTIME)
+public @interface <span class="memberNameLabel">CallingThread</span></pre>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/annotations/Async.html" title="annotation in com.isupatches.wisefy.annotations"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/annotations/CallingThread.html" target="_top">Frames</a></li>
+<li><a href="CallingThread.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Required&nbsp;|&nbsp;</li>
+<li>Optional</li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Element</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/com/isupatches/wisefy/annotations/Sync.html b/javadoc/com/isupatches/wisefy/annotations/Sync.html
new file mode 100644
index 00000000..ba2fd155
--- /dev/null
+++ b/javadoc/com/isupatches/wisefy/annotations/Sync.html
@@ -0,0 +1,165 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>Sync (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Sync (wisefy 2.0.0-BETA API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/annotations/WaitsForTimeout.html" title="annotation in com.isupatches.wisefy.annotations"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/annotations/Sync.html" target="_top">Frames</a></li>
+<li><a href="Sync.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Required&nbsp;|&nbsp;</li>
+<li>Optional</li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Element</li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">com.isupatches.wisefy.annotations</div>
+<h2 title="Annotation Type Sync" class="title">Annotation Type Sync</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>@Documented
+ @Target(value=METHOD)
+ @Inherited
+ @Retention(value=RUNTIME)
+public @interface <span class="memberNameLabel">Sync</span></pre>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/annotations/WaitsForTimeout.html" title="annotation in com.isupatches.wisefy.annotations"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/annotations/Sync.html" target="_top">Frames</a></li>
+<li><a href="Sync.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Required&nbsp;|&nbsp;</li>
+<li>Optional</li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Element</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/com/isupatches/wisefy/annotations/WaitsForTimeout.html b/javadoc/com/isupatches/wisefy/annotations/WaitsForTimeout.html
new file mode 100644
index 00000000..67893480
--- /dev/null
+++ b/javadoc/com/isupatches/wisefy/annotations/WaitsForTimeout.html
@@ -0,0 +1,165 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>WaitsForTimeout (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="WaitsForTimeout (wisefy 2.0.0-BETA API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/annotations/WiseFyThread.html" title="annotation in com.isupatches.wisefy.annotations"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/annotations/WaitsForTimeout.html" target="_top">Frames</a></li>
+<li><a href="WaitsForTimeout.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Required&nbsp;|&nbsp;</li>
+<li>Optional</li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Element</li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">com.isupatches.wisefy.annotations</div>
+<h2 title="Annotation Type WaitsForTimeout" class="title">Annotation Type WaitsForTimeout</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>@Documented
+ @Target(value=METHOD)
+ @Inherited
+ @Retention(value=RUNTIME)
+public @interface <span class="memberNameLabel">WaitsForTimeout</span></pre>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/annotations/WiseFyThread.html" title="annotation in com.isupatches.wisefy.annotations"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/annotations/WaitsForTimeout.html" target="_top">Frames</a></li>
+<li><a href="WaitsForTimeout.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Required&nbsp;|&nbsp;</li>
+<li>Optional</li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Element</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/com/isupatches/wisefy/annotations/WiseFyThread.html b/javadoc/com/isupatches/wisefy/annotations/WiseFyThread.html
new file mode 100644
index 00000000..bee5abe7
--- /dev/null
+++ b/javadoc/com/isupatches/wisefy/annotations/WiseFyThread.html
@@ -0,0 +1,165 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>WiseFyThread (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="WiseFyThread (wisefy 2.0.0-BETA API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/annotations/WaitsForTimeout.html" title="annotation in com.isupatches.wisefy.annotations"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/annotations/WiseFyThread.html" target="_top">Frames</a></li>
+<li><a href="WiseFyThread.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Required&nbsp;|&nbsp;</li>
+<li>Optional</li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Element</li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">com.isupatches.wisefy.annotations</div>
+<h2 title="Annotation Type WiseFyThread" class="title">Annotation Type WiseFyThread</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>@Documented
+ @Target(value=METHOD)
+ @Inherited
+ @Retention(value=RUNTIME)
+public @interface <span class="memberNameLabel">WiseFyThread</span></pre>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/annotations/WaitsForTimeout.html" title="annotation in com.isupatches.wisefy.annotations"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/annotations/WiseFyThread.html" target="_top">Frames</a></li>
+<li><a href="WiseFyThread.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Required&nbsp;|&nbsp;</li>
+<li>Optional</li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Element</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/com/isupatches/wisefy/annotations/package-frame.html b/javadoc/com/isupatches/wisefy/annotations/package-frame.html
new file mode 100644
index 00000000..7f20f060
--- /dev/null
+++ b/javadoc/com/isupatches/wisefy/annotations/package-frame.html
@@ -0,0 +1,24 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>com.isupatches.wisefy.annotations (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<h1 class="bar"><a href="../../../../com/isupatches/wisefy/annotations/package-summary.html" target="classFrame">com.isupatches.wisefy.annotations</a></h1>
+<div class="indexContainer">
+<h2 title="Annotation Types">Annotation Types</h2>
+<ul title="Annotation Types">
+<li><a href="Async.html" title="annotation in com.isupatches.wisefy.annotations" target="classFrame">Async</a></li>
+<li><a href="CallingThread.html" title="annotation in com.isupatches.wisefy.annotations" target="classFrame">CallingThread</a></li>
+<li><a href="Sync.html" title="annotation in com.isupatches.wisefy.annotations" target="classFrame">Sync</a></li>
+<li><a href="WaitsForTimeout.html" title="annotation in com.isupatches.wisefy.annotations" target="classFrame">WaitsForTimeout</a></li>
+<li><a href="WiseFyThread.html" title="annotation in com.isupatches.wisefy.annotations" target="classFrame">WiseFyThread</a></li>
+</ul>
+</div>
+</body>
+</html>
diff --git a/javadoc/com/isupatches/wisefy/annotations/package-summary.html b/javadoc/com/isupatches/wisefy/annotations/package-summary.html
new file mode 100644
index 00000000..db6d0aa3
--- /dev/null
+++ b/javadoc/com/isupatches/wisefy/annotations/package-summary.html
@@ -0,0 +1,156 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>com.isupatches.wisefy.annotations (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="com.isupatches.wisefy.annotations (wisefy 2.0.0-BETA API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/package-summary.html">Next&nbsp;Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/annotations/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Package" class="title">Package&nbsp;com.isupatches.wisefy.annotations</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Annotation Types Summary table, listing annotation types, and an explanation">
+<caption><span>Annotation Types Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Annotation Type</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../com/isupatches/wisefy/annotations/Async.html" title="annotation in com.isupatches.wisefy.annotations">Async</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations">CallingThread</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations">Sync</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../com/isupatches/wisefy/annotations/WaitsForTimeout.html" title="annotation in com.isupatches.wisefy.annotations">WaitsForTimeout</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../com/isupatches/wisefy/annotations/WiseFyThread.html" title="annotation in com.isupatches.wisefy.annotations">WiseFyThread</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/package-summary.html">Next&nbsp;Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/annotations/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/com/isupatches/wisefy/annotations/package-tree.html b/javadoc/com/isupatches/wisefy/annotations/package-tree.html
new file mode 100644
index 00000000..c146db60
--- /dev/null
+++ b/javadoc/com/isupatches/wisefy/annotations/package-tree.html
@@ -0,0 +1,135 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>com.isupatches.wisefy.annotations Class Hierarchy (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="com.isupatches.wisefy.annotations Class Hierarchy (wisefy 2.0.0-BETA API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/package-tree.html">Prev</a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/annotations/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 class="title">Hierarchy For Package com.isupatches.wisefy.annotations</h1>
+<span class="packageHierarchyLabel">Package Hierarchies:</span>
+<ul class="horizontal">
+<li><a href="../../../../overview-tree.html">All Packages</a></li>
+</ul>
+</div>
+<div class="contentContainer">
+<h2 title="Annotation Type Hierarchy">Annotation Type Hierarchy</h2>
+<ul>
+<li type="circle">com.isupatches.wisefy.annotations.<a href="../../../../com/isupatches/wisefy/annotations/WaitsForTimeout.html" title="annotation in com.isupatches.wisefy.annotations"><span class="typeNameLink">WaitsForTimeout</span></a> (implements java.lang.annotation.Annotation)</li>
+<li type="circle">com.isupatches.wisefy.annotations.<a href="../../../../com/isupatches/wisefy/annotations/WiseFyThread.html" title="annotation in com.isupatches.wisefy.annotations"><span class="typeNameLink">WiseFyThread</span></a> (implements java.lang.annotation.Annotation)</li>
+<li type="circle">com.isupatches.wisefy.annotations.<a href="../../../../com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations"><span class="typeNameLink">Sync</span></a> (implements java.lang.annotation.Annotation)</li>
+<li type="circle">com.isupatches.wisefy.annotations.<a href="../../../../com/isupatches/wisefy/annotations/Async.html" title="annotation in com.isupatches.wisefy.annotations"><span class="typeNameLink">Async</span></a> (implements java.lang.annotation.Annotation)</li>
+<li type="circle">com.isupatches.wisefy.annotations.<a href="../../../../com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations"><span class="typeNameLink">CallingThread</span></a> (implements java.lang.annotation.Annotation)</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/package-tree.html">Prev</a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/annotations/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/com/isupatches/wisefy/callbacks/AddOpenNetworkCallbacks.html b/javadoc/com/isupatches/wisefy/callbacks/AddOpenNetworkCallbacks.html
new file mode 100644
index 00000000..45702e88
--- /dev/null
+++ b/javadoc/com/isupatches/wisefy/callbacks/AddOpenNetworkCallbacks.html
@@ -0,0 +1,245 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>AddOpenNetworkCallbacks (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="AddOpenNetworkCallbacks (wisefy 2.0.0-BETA API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6,"i1":6,"i2":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/AddWEPNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/AddOpenNetworkCallbacks.html" target="_top">Frames</a></li>
+<li><a href="AddOpenNetworkCallbacks.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">com.isupatches.wisefy.callbacks</div>
+<h2 title="Interface AddOpenNetworkCallbacks" class="title">Interface AddOpenNetworkCallbacks</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public interface <span class="typeNameLabel">AddOpenNetworkCallbacks</span></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/AddOpenNetworkCallbacks.html#addOpenNetworkWiseFyFailure-java.lang.Integer-">addOpenNetworkWiseFyFailure</a></span>(java.lang.Integer&nbsp;wisefyReturnCode)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/AddOpenNetworkCallbacks.html#failureAddingOpenNetwork-java.lang.Integer-">failureAddingOpenNetwork</a></span>(java.lang.Integer&nbsp;wifiManagerReturnCode)</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/AddOpenNetworkCallbacks.html#openNetworkAdded-android.net.wifi.WifiConfiguration-">openNetworkAdded</a></span>(android.net.wifi.WifiConfiguration&nbsp;wifiConfiguration)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="addOpenNetworkWiseFyFailure-java.lang.Integer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>addOpenNetworkWiseFyFailure</h4>
+<pre>void&nbsp;addOpenNetworkWiseFyFailure(java.lang.Integer&nbsp;wisefyReturnCode)</pre>
+</li>
+</ul>
+<a name="failureAddingOpenNetwork-java.lang.Integer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>failureAddingOpenNetwork</h4>
+<pre>void&nbsp;failureAddingOpenNetwork(java.lang.Integer&nbsp;wifiManagerReturnCode)</pre>
+</li>
+</ul>
+<a name="openNetworkAdded-android.net.wifi.WifiConfiguration-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>openNetworkAdded</h4>
+<pre>void&nbsp;openNetworkAdded(android.net.wifi.WifiConfiguration&nbsp;wifiConfiguration)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/AddWEPNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/AddOpenNetworkCallbacks.html" target="_top">Frames</a></li>
+<li><a href="AddOpenNetworkCallbacks.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/com/isupatches/wisefy/callbacks/AddWEPNetworkCallbacks.html b/javadoc/com/isupatches/wisefy/callbacks/AddWEPNetworkCallbacks.html
new file mode 100644
index 00000000..8bf41cb5
--- /dev/null
+++ b/javadoc/com/isupatches/wisefy/callbacks/AddWEPNetworkCallbacks.html
@@ -0,0 +1,245 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>AddWEPNetworkCallbacks (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="AddWEPNetworkCallbacks (wisefy 2.0.0-BETA API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6,"i1":6,"i2":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/callbacks/AddOpenNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/AddWPA2NetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/AddWEPNetworkCallbacks.html" target="_top">Frames</a></li>
+<li><a href="AddWEPNetworkCallbacks.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">com.isupatches.wisefy.callbacks</div>
+<h2 title="Interface AddWEPNetworkCallbacks" class="title">Interface AddWEPNetworkCallbacks</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public interface <span class="typeNameLabel">AddWEPNetworkCallbacks</span></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/AddWEPNetworkCallbacks.html#addWEPNetworkWiseFyFailure-java.lang.Integer-">addWEPNetworkWiseFyFailure</a></span>(java.lang.Integer&nbsp;wisefyReturnCode)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/AddWEPNetworkCallbacks.html#failureAddingWEPNetwork-java.lang.Integer-">failureAddingWEPNetwork</a></span>(java.lang.Integer&nbsp;wifiManagerReturnCode)</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/AddWEPNetworkCallbacks.html#wepNetworkAdded-android.net.wifi.WifiConfiguration-">wepNetworkAdded</a></span>(android.net.wifi.WifiConfiguration&nbsp;wifiConfiguration)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="addWEPNetworkWiseFyFailure-java.lang.Integer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>addWEPNetworkWiseFyFailure</h4>
+<pre>void&nbsp;addWEPNetworkWiseFyFailure(java.lang.Integer&nbsp;wisefyReturnCode)</pre>
+</li>
+</ul>
+<a name="failureAddingWEPNetwork-java.lang.Integer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>failureAddingWEPNetwork</h4>
+<pre>void&nbsp;failureAddingWEPNetwork(java.lang.Integer&nbsp;wifiManagerReturnCode)</pre>
+</li>
+</ul>
+<a name="wepNetworkAdded-android.net.wifi.WifiConfiguration-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>wepNetworkAdded</h4>
+<pre>void&nbsp;wepNetworkAdded(android.net.wifi.WifiConfiguration&nbsp;wifiConfiguration)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/callbacks/AddOpenNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/AddWPA2NetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/AddWEPNetworkCallbacks.html" target="_top">Frames</a></li>
+<li><a href="AddWEPNetworkCallbacks.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/com/isupatches/wisefy/callbacks/AddWPA2NetworkCallbacks.html b/javadoc/com/isupatches/wisefy/callbacks/AddWPA2NetworkCallbacks.html
new file mode 100644
index 00000000..5391aeb0
--- /dev/null
+++ b/javadoc/com/isupatches/wisefy/callbacks/AddWPA2NetworkCallbacks.html
@@ -0,0 +1,245 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>AddWPA2NetworkCallbacks (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="AddWPA2NetworkCallbacks (wisefy 2.0.0-BETA API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6,"i1":6,"i2":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/callbacks/AddWEPNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/ConnectToNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/AddWPA2NetworkCallbacks.html" target="_top">Frames</a></li>
+<li><a href="AddWPA2NetworkCallbacks.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">com.isupatches.wisefy.callbacks</div>
+<h2 title="Interface AddWPA2NetworkCallbacks" class="title">Interface AddWPA2NetworkCallbacks</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public interface <span class="typeNameLabel">AddWPA2NetworkCallbacks</span></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/AddWPA2NetworkCallbacks.html#addWPA2NetworkWiseFyFailure-java.lang.Integer-">addWPA2NetworkWiseFyFailure</a></span>(java.lang.Integer&nbsp;wisefyReturnCode)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/AddWPA2NetworkCallbacks.html#failureAddingWPA2Network-java.lang.Integer-">failureAddingWPA2Network</a></span>(java.lang.Integer&nbsp;wifiManagerReturnCode)</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/AddWPA2NetworkCallbacks.html#wpa2NetworkAdded-android.net.wifi.WifiConfiguration-">wpa2NetworkAdded</a></span>(android.net.wifi.WifiConfiguration&nbsp;wifiConfiguration)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="addWPA2NetworkWiseFyFailure-java.lang.Integer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>addWPA2NetworkWiseFyFailure</h4>
+<pre>void&nbsp;addWPA2NetworkWiseFyFailure(java.lang.Integer&nbsp;wisefyReturnCode)</pre>
+</li>
+</ul>
+<a name="failureAddingWPA2Network-java.lang.Integer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>failureAddingWPA2Network</h4>
+<pre>void&nbsp;failureAddingWPA2Network(java.lang.Integer&nbsp;wifiManagerReturnCode)</pre>
+</li>
+</ul>
+<a name="wpa2NetworkAdded-android.net.wifi.WifiConfiguration-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>wpa2NetworkAdded</h4>
+<pre>void&nbsp;wpa2NetworkAdded(android.net.wifi.WifiConfiguration&nbsp;wifiConfiguration)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/callbacks/AddWEPNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/ConnectToNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/AddWPA2NetworkCallbacks.html" target="_top">Frames</a></li>
+<li><a href="AddWPA2NetworkCallbacks.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/com/isupatches/wisefy/callbacks/ConnectToNetworkCallbacks.html b/javadoc/com/isupatches/wisefy/callbacks/ConnectToNetworkCallbacks.html
new file mode 100644
index 00000000..8c8060c5
--- /dev/null
+++ b/javadoc/com/isupatches/wisefy/callbacks/ConnectToNetworkCallbacks.html
@@ -0,0 +1,258 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>ConnectToNetworkCallbacks (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="ConnectToNetworkCallbacks (wisefy 2.0.0-BETA API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6,"i1":6,"i2":6,"i3":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/callbacks/AddWPA2NetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/DisableWifiCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/ConnectToNetworkCallbacks.html" target="_top">Frames</a></li>
+<li><a href="ConnectToNetworkCallbacks.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">com.isupatches.wisefy.callbacks</div>
+<h2 title="Interface ConnectToNetworkCallbacks" class="title">Interface ConnectToNetworkCallbacks</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public interface <span class="typeNameLabel">ConnectToNetworkCallbacks</span></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/ConnectToNetworkCallbacks.html#connectedToNetwork--">connectedToNetwork</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/ConnectToNetworkCallbacks.html#connectToNetworkWiseFyFailure-java.lang.Integer-">connectToNetworkWiseFyFailure</a></span>(java.lang.Integer&nbsp;wisefyReturnCode)</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/ConnectToNetworkCallbacks.html#failureConnectingToNetwork--">failureConnectingToNetwork</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/ConnectToNetworkCallbacks.html#networkNotFoundToConnectTo--">networkNotFoundToConnectTo</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="connectedToNetwork--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>connectedToNetwork</h4>
+<pre>void&nbsp;connectedToNetwork()</pre>
+</li>
+</ul>
+<a name="connectToNetworkWiseFyFailure-java.lang.Integer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>connectToNetworkWiseFyFailure</h4>
+<pre>void&nbsp;connectToNetworkWiseFyFailure(java.lang.Integer&nbsp;wisefyReturnCode)</pre>
+</li>
+</ul>
+<a name="failureConnectingToNetwork--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>failureConnectingToNetwork</h4>
+<pre>void&nbsp;failureConnectingToNetwork()</pre>
+</li>
+</ul>
+<a name="networkNotFoundToConnectTo--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>networkNotFoundToConnectTo</h4>
+<pre>void&nbsp;networkNotFoundToConnectTo()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/callbacks/AddWPA2NetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/DisableWifiCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/ConnectToNetworkCallbacks.html" target="_top">Frames</a></li>
+<li><a href="ConnectToNetworkCallbacks.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/com/isupatches/wisefy/callbacks/DisableWifiCallbacks.html b/javadoc/com/isupatches/wisefy/callbacks/DisableWifiCallbacks.html
new file mode 100644
index 00000000..5776db93
--- /dev/null
+++ b/javadoc/com/isupatches/wisefy/callbacks/DisableWifiCallbacks.html
@@ -0,0 +1,245 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>DisableWifiCallbacks (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="DisableWifiCallbacks (wisefy 2.0.0-BETA API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6,"i1":6,"i2":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/callbacks/ConnectToNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/DisconnectFromCurrentNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/DisableWifiCallbacks.html" target="_top">Frames</a></li>
+<li><a href="DisableWifiCallbacks.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">com.isupatches.wisefy.callbacks</div>
+<h2 title="Interface DisableWifiCallbacks" class="title">Interface DisableWifiCallbacks</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public interface <span class="typeNameLabel">DisableWifiCallbacks</span></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/DisableWifiCallbacks.html#disableWifiWiseFyFailure-java.lang.Integer-">disableWifiWiseFyFailure</a></span>(java.lang.Integer&nbsp;wisefyReturnCode)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/DisableWifiCallbacks.html#failureDisablingWifi--">failureDisablingWifi</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/DisableWifiCallbacks.html#wifiDisabled--">wifiDisabled</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="disableWifiWiseFyFailure-java.lang.Integer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>disableWifiWiseFyFailure</h4>
+<pre>void&nbsp;disableWifiWiseFyFailure(java.lang.Integer&nbsp;wisefyReturnCode)</pre>
+</li>
+</ul>
+<a name="failureDisablingWifi--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>failureDisablingWifi</h4>
+<pre>void&nbsp;failureDisablingWifi()</pre>
+</li>
+</ul>
+<a name="wifiDisabled--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>wifiDisabled</h4>
+<pre>void&nbsp;wifiDisabled()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/callbacks/ConnectToNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/DisconnectFromCurrentNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/DisableWifiCallbacks.html" target="_top">Frames</a></li>
+<li><a href="DisableWifiCallbacks.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/com/isupatches/wisefy/callbacks/DisconnectFromCurrentNetworkCallbacks.html b/javadoc/com/isupatches/wisefy/callbacks/DisconnectFromCurrentNetworkCallbacks.html
new file mode 100644
index 00000000..90fdbd9d
--- /dev/null
+++ b/javadoc/com/isupatches/wisefy/callbacks/DisconnectFromCurrentNetworkCallbacks.html
@@ -0,0 +1,245 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>DisconnectFromCurrentNetworkCallbacks (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="DisconnectFromCurrentNetworkCallbacks (wisefy 2.0.0-BETA API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6,"i1":6,"i2":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/callbacks/DisableWifiCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/EnableWifiCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/DisconnectFromCurrentNetworkCallbacks.html" target="_top">Frames</a></li>
+<li><a href="DisconnectFromCurrentNetworkCallbacks.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">com.isupatches.wisefy.callbacks</div>
+<h2 title="Interface DisconnectFromCurrentNetworkCallbacks" class="title">Interface DisconnectFromCurrentNetworkCallbacks</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public interface <span class="typeNameLabel">DisconnectFromCurrentNetworkCallbacks</span></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/DisconnectFromCurrentNetworkCallbacks.html#disconnectedFromCurrentNetwork--">disconnectedFromCurrentNetwork</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/DisconnectFromCurrentNetworkCallbacks.html#disconnectFromCurrentNetworkWiseFyFailure-java.lang.Integer-">disconnectFromCurrentNetworkWiseFyFailure</a></span>(java.lang.Integer&nbsp;wisefyReturnCode)</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/DisconnectFromCurrentNetworkCallbacks.html#failureDisconnectingFromCurrentNetwork--">failureDisconnectingFromCurrentNetwork</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="disconnectedFromCurrentNetwork--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>disconnectedFromCurrentNetwork</h4>
+<pre>void&nbsp;disconnectedFromCurrentNetwork()</pre>
+</li>
+</ul>
+<a name="disconnectFromCurrentNetworkWiseFyFailure-java.lang.Integer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>disconnectFromCurrentNetworkWiseFyFailure</h4>
+<pre>void&nbsp;disconnectFromCurrentNetworkWiseFyFailure(java.lang.Integer&nbsp;wisefyReturnCode)</pre>
+</li>
+</ul>
+<a name="failureDisconnectingFromCurrentNetwork--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>failureDisconnectingFromCurrentNetwork</h4>
+<pre>void&nbsp;failureDisconnectingFromCurrentNetwork()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/callbacks/DisableWifiCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/EnableWifiCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/DisconnectFromCurrentNetworkCallbacks.html" target="_top">Frames</a></li>
+<li><a href="DisconnectFromCurrentNetworkCallbacks.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/com/isupatches/wisefy/callbacks/EnableWifiCallbacks.html b/javadoc/com/isupatches/wisefy/callbacks/EnableWifiCallbacks.html
new file mode 100644
index 00000000..1793c1aa
--- /dev/null
+++ b/javadoc/com/isupatches/wisefy/callbacks/EnableWifiCallbacks.html
@@ -0,0 +1,245 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>EnableWifiCallbacks (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="EnableWifiCallbacks (wisefy 2.0.0-BETA API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6,"i1":6,"i2":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/callbacks/DisconnectFromCurrentNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/GetCurrentNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/EnableWifiCallbacks.html" target="_top">Frames</a></li>
+<li><a href="EnableWifiCallbacks.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">com.isupatches.wisefy.callbacks</div>
+<h2 title="Interface EnableWifiCallbacks" class="title">Interface EnableWifiCallbacks</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public interface <span class="typeNameLabel">EnableWifiCallbacks</span></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/EnableWifiCallbacks.html#enableWifiWiseFyFailure-java.lang.Integer-">enableWifiWiseFyFailure</a></span>(java.lang.Integer&nbsp;wisefyReturnCode)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/EnableWifiCallbacks.html#failureEnablingWifi--">failureEnablingWifi</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/EnableWifiCallbacks.html#wifiEnabled--">wifiEnabled</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="enableWifiWiseFyFailure-java.lang.Integer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>enableWifiWiseFyFailure</h4>
+<pre>void&nbsp;enableWifiWiseFyFailure(java.lang.Integer&nbsp;wisefyReturnCode)</pre>
+</li>
+</ul>
+<a name="failureEnablingWifi--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>failureEnablingWifi</h4>
+<pre>void&nbsp;failureEnablingWifi()</pre>
+</li>
+</ul>
+<a name="wifiEnabled--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>wifiEnabled</h4>
+<pre>void&nbsp;wifiEnabled()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/callbacks/DisconnectFromCurrentNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/GetCurrentNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/EnableWifiCallbacks.html" target="_top">Frames</a></li>
+<li><a href="EnableWifiCallbacks.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/com/isupatches/wisefy/callbacks/GetCurrentNetworkCallbacks.html b/javadoc/com/isupatches/wisefy/callbacks/GetCurrentNetworkCallbacks.html
new file mode 100644
index 00000000..3c4c9db2
--- /dev/null
+++ b/javadoc/com/isupatches/wisefy/callbacks/GetCurrentNetworkCallbacks.html
@@ -0,0 +1,232 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>GetCurrentNetworkCallbacks (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="GetCurrentNetworkCallbacks (wisefy 2.0.0-BETA API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6,"i1":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/callbacks/EnableWifiCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/GetFrequencyCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/GetCurrentNetworkCallbacks.html" target="_top">Frames</a></li>
+<li><a href="GetCurrentNetworkCallbacks.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">com.isupatches.wisefy.callbacks</div>
+<h2 title="Interface GetCurrentNetworkCallbacks" class="title">Interface GetCurrentNetworkCallbacks</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public interface <span class="typeNameLabel">GetCurrentNetworkCallbacks</span></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/GetCurrentNetworkCallbacks.html#getCurrentNetworkWiseFyFailure-java.lang.Integer-">getCurrentNetworkWiseFyFailure</a></span>(java.lang.Integer&nbsp;wisefyReturnCode)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/GetCurrentNetworkCallbacks.html#retrievedCurrentNetwork-android.net.wifi.WifiInfo-">retrievedCurrentNetwork</a></span>(android.net.wifi.WifiInfo&nbsp;currentNetwork)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getCurrentNetworkWiseFyFailure-java.lang.Integer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getCurrentNetworkWiseFyFailure</h4>
+<pre>void&nbsp;getCurrentNetworkWiseFyFailure(java.lang.Integer&nbsp;wisefyReturnCode)</pre>
+</li>
+</ul>
+<a name="retrievedCurrentNetwork-android.net.wifi.WifiInfo-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>retrievedCurrentNetwork</h4>
+<pre>void&nbsp;retrievedCurrentNetwork(android.net.wifi.WifiInfo&nbsp;currentNetwork)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/callbacks/EnableWifiCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/GetFrequencyCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/GetCurrentNetworkCallbacks.html" target="_top">Frames</a></li>
+<li><a href="GetCurrentNetworkCallbacks.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/com/isupatches/wisefy/callbacks/GetFrequencyCallbacks.html b/javadoc/com/isupatches/wisefy/callbacks/GetFrequencyCallbacks.html
new file mode 100644
index 00000000..5adef753
--- /dev/null
+++ b/javadoc/com/isupatches/wisefy/callbacks/GetFrequencyCallbacks.html
@@ -0,0 +1,245 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>GetFrequencyCallbacks (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="GetFrequencyCallbacks (wisefy 2.0.0-BETA API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6,"i1":6,"i2":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/callbacks/GetCurrentNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/GetNearbyAccessPointsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/GetFrequencyCallbacks.html" target="_top">Frames</a></li>
+<li><a href="GetFrequencyCallbacks.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">com.isupatches.wisefy.callbacks</div>
+<h2 title="Interface GetFrequencyCallbacks" class="title">Interface GetFrequencyCallbacks</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public interface <span class="typeNameLabel">GetFrequencyCallbacks</span></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/GetFrequencyCallbacks.html#failureGettingFrequency--">failureGettingFrequency</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/GetFrequencyCallbacks.html#getFrequencyWiseFyFailure-java.lang.Integer-">getFrequencyWiseFyFailure</a></span>(java.lang.Integer&nbsp;wisefyReturnCode)</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/GetFrequencyCallbacks.html#retrievedFrequency-int-">retrievedFrequency</a></span>(int&nbsp;frequency)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="failureGettingFrequency--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>failureGettingFrequency</h4>
+<pre>void&nbsp;failureGettingFrequency()</pre>
+</li>
+</ul>
+<a name="getFrequencyWiseFyFailure-java.lang.Integer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getFrequencyWiseFyFailure</h4>
+<pre>void&nbsp;getFrequencyWiseFyFailure(java.lang.Integer&nbsp;wisefyReturnCode)</pre>
+</li>
+</ul>
+<a name="retrievedFrequency-int-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>retrievedFrequency</h4>
+<pre>void&nbsp;retrievedFrequency(int&nbsp;frequency)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/callbacks/GetCurrentNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/GetNearbyAccessPointsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/GetFrequencyCallbacks.html" target="_top">Frames</a></li>
+<li><a href="GetFrequencyCallbacks.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/com/isupatches/wisefy/callbacks/GetNearbyAccessPointsCallbacks.html b/javadoc/com/isupatches/wisefy/callbacks/GetNearbyAccessPointsCallbacks.html
new file mode 100644
index 00000000..d925fc24
--- /dev/null
+++ b/javadoc/com/isupatches/wisefy/callbacks/GetNearbyAccessPointsCallbacks.html
@@ -0,0 +1,232 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>GetNearbyAccessPointsCallbacks (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="GetNearbyAccessPointsCallbacks (wisefy 2.0.0-BETA API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6,"i1":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/callbacks/GetFrequencyCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/GetRSSICallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/GetNearbyAccessPointsCallbacks.html" target="_top">Frames</a></li>
+<li><a href="GetNearbyAccessPointsCallbacks.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">com.isupatches.wisefy.callbacks</div>
+<h2 title="Interface GetNearbyAccessPointsCallbacks" class="title">Interface GetNearbyAccessPointsCallbacks</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public interface <span class="typeNameLabel">GetNearbyAccessPointsCallbacks</span></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/GetNearbyAccessPointsCallbacks.html#getNearbyAccessPointsWiseFyFailure-java.lang.Integer-">getNearbyAccessPointsWiseFyFailure</a></span>(java.lang.Integer&nbsp;wisefyReturnCode)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/GetNearbyAccessPointsCallbacks.html#retrievedNearbyAccessPoints-java.util.List-">retrievedNearbyAccessPoints</a></span>(java.util.List&lt;android.net.wifi.ScanResult&gt;&nbsp;nearbyAccessPoints)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getNearbyAccessPointsWiseFyFailure-java.lang.Integer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getNearbyAccessPointsWiseFyFailure</h4>
+<pre>void&nbsp;getNearbyAccessPointsWiseFyFailure(java.lang.Integer&nbsp;wisefyReturnCode)</pre>
+</li>
+</ul>
+<a name="retrievedNearbyAccessPoints-java.util.List-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>retrievedNearbyAccessPoints</h4>
+<pre>void&nbsp;retrievedNearbyAccessPoints(java.util.List&lt;android.net.wifi.ScanResult&gt;&nbsp;nearbyAccessPoints)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/callbacks/GetFrequencyCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/GetRSSICallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/GetNearbyAccessPointsCallbacks.html" target="_top">Frames</a></li>
+<li><a href="GetNearbyAccessPointsCallbacks.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/com/isupatches/wisefy/callbacks/GetRSSICallbacks.html b/javadoc/com/isupatches/wisefy/callbacks/GetRSSICallbacks.html
new file mode 100644
index 00000000..1141feea
--- /dev/null
+++ b/javadoc/com/isupatches/wisefy/callbacks/GetRSSICallbacks.html
@@ -0,0 +1,245 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>GetRSSICallbacks (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="GetRSSICallbacks (wisefy 2.0.0-BETA API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6,"i1":6,"i2":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/callbacks/GetNearbyAccessPointsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/GetSavedNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/GetRSSICallbacks.html" target="_top">Frames</a></li>
+<li><a href="GetRSSICallbacks.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">com.isupatches.wisefy.callbacks</div>
+<h2 title="Interface GetRSSICallbacks" class="title">Interface GetRSSICallbacks</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public interface <span class="typeNameLabel">GetRSSICallbacks</span></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/GetRSSICallbacks.html#getRSSIWiseFyFailure-java.lang.Integer-">getRSSIWiseFyFailure</a></span>(java.lang.Integer&nbsp;wisefyReturnCode)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/GetRSSICallbacks.html#networkNotFoundToRetrieveRSSI--">networkNotFoundToRetrieveRSSI</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/GetRSSICallbacks.html#retrievedRSSI-java.lang.Integer-">retrievedRSSI</a></span>(java.lang.Integer&nbsp;rssi)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="retrievedRSSI-java.lang.Integer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>retrievedRSSI</h4>
+<pre>void&nbsp;retrievedRSSI(java.lang.Integer&nbsp;rssi)</pre>
+</li>
+</ul>
+<a name="networkNotFoundToRetrieveRSSI--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>networkNotFoundToRetrieveRSSI</h4>
+<pre>void&nbsp;networkNotFoundToRetrieveRSSI()</pre>
+</li>
+</ul>
+<a name="getRSSIWiseFyFailure-java.lang.Integer-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getRSSIWiseFyFailure</h4>
+<pre>void&nbsp;getRSSIWiseFyFailure(java.lang.Integer&nbsp;wisefyReturnCode)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/callbacks/GetNearbyAccessPointsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/GetSavedNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/GetRSSICallbacks.html" target="_top">Frames</a></li>
+<li><a href="GetRSSICallbacks.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/com/isupatches/wisefy/callbacks/GetSavedNetworkCallbacks.html b/javadoc/com/isupatches/wisefy/callbacks/GetSavedNetworkCallbacks.html
new file mode 100644
index 00000000..e53ddfae
--- /dev/null
+++ b/javadoc/com/isupatches/wisefy/callbacks/GetSavedNetworkCallbacks.html
@@ -0,0 +1,245 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>GetSavedNetworkCallbacks (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="GetSavedNetworkCallbacks (wisefy 2.0.0-BETA API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6,"i1":6,"i2":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/callbacks/GetRSSICallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/GetSavedNetworksCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/GetSavedNetworkCallbacks.html" target="_top">Frames</a></li>
+<li><a href="GetSavedNetworkCallbacks.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">com.isupatches.wisefy.callbacks</div>
+<h2 title="Interface GetSavedNetworkCallbacks" class="title">Interface GetSavedNetworkCallbacks</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public interface <span class="typeNameLabel">GetSavedNetworkCallbacks</span></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/GetSavedNetworkCallbacks.html#getSavedNetworkWiseFyFailure-java.lang.Integer-">getSavedNetworkWiseFyFailure</a></span>(java.lang.Integer&nbsp;wisefyReturnCode)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/GetSavedNetworkCallbacks.html#retrievedSavedNetwork-android.net.wifi.WifiConfiguration-">retrievedSavedNetwork</a></span>(android.net.wifi.WifiConfiguration&nbsp;savedNetwork)</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/GetSavedNetworkCallbacks.html#savedNetworkNotFound--">savedNetworkNotFound</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getSavedNetworkWiseFyFailure-java.lang.Integer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getSavedNetworkWiseFyFailure</h4>
+<pre>void&nbsp;getSavedNetworkWiseFyFailure(java.lang.Integer&nbsp;wisefyReturnCode)</pre>
+</li>
+</ul>
+<a name="savedNetworkNotFound--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>savedNetworkNotFound</h4>
+<pre>void&nbsp;savedNetworkNotFound()</pre>
+</li>
+</ul>
+<a name="retrievedSavedNetwork-android.net.wifi.WifiConfiguration-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>retrievedSavedNetwork</h4>
+<pre>void&nbsp;retrievedSavedNetwork(android.net.wifi.WifiConfiguration&nbsp;savedNetwork)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/callbacks/GetRSSICallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/GetSavedNetworksCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/GetSavedNetworkCallbacks.html" target="_top">Frames</a></li>
+<li><a href="GetSavedNetworkCallbacks.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/com/isupatches/wisefy/callbacks/GetSavedNetworksCallbacks.html b/javadoc/com/isupatches/wisefy/callbacks/GetSavedNetworksCallbacks.html
new file mode 100644
index 00000000..2bab65fc
--- /dev/null
+++ b/javadoc/com/isupatches/wisefy/callbacks/GetSavedNetworksCallbacks.html
@@ -0,0 +1,232 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>GetSavedNetworksCallbacks (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="GetSavedNetworksCallbacks (wisefy 2.0.0-BETA API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6,"i1":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/callbacks/GetSavedNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/RemoveNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/GetSavedNetworksCallbacks.html" target="_top">Frames</a></li>
+<li><a href="GetSavedNetworksCallbacks.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">com.isupatches.wisefy.callbacks</div>
+<h2 title="Interface GetSavedNetworksCallbacks" class="title">Interface GetSavedNetworksCallbacks</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public interface <span class="typeNameLabel">GetSavedNetworksCallbacks</span></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/GetSavedNetworksCallbacks.html#getSavedNetworksWiseFyFailure-java.lang.Integer-">getSavedNetworksWiseFyFailure</a></span>(java.lang.Integer&nbsp;wisefyReturnCode)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/GetSavedNetworksCallbacks.html#retrievedSavedNetworks-java.util.List-">retrievedSavedNetworks</a></span>(java.util.List&lt;android.net.wifi.WifiConfiguration&gt;&nbsp;savedNetworks)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getSavedNetworksWiseFyFailure-java.lang.Integer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getSavedNetworksWiseFyFailure</h4>
+<pre>void&nbsp;getSavedNetworksWiseFyFailure(java.lang.Integer&nbsp;wisefyReturnCode)</pre>
+</li>
+</ul>
+<a name="retrievedSavedNetworks-java.util.List-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>retrievedSavedNetworks</h4>
+<pre>void&nbsp;retrievedSavedNetworks(java.util.List&lt;android.net.wifi.WifiConfiguration&gt;&nbsp;savedNetworks)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/callbacks/GetSavedNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/RemoveNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/GetSavedNetworksCallbacks.html" target="_top">Frames</a></li>
+<li><a href="GetSavedNetworksCallbacks.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/com/isupatches/wisefy/callbacks/RemoveNetworkCallbacks.html b/javadoc/com/isupatches/wisefy/callbacks/RemoveNetworkCallbacks.html
new file mode 100644
index 00000000..628a6030
--- /dev/null
+++ b/javadoc/com/isupatches/wisefy/callbacks/RemoveNetworkCallbacks.html
@@ -0,0 +1,258 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>RemoveNetworkCallbacks (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="RemoveNetworkCallbacks (wisefy 2.0.0-BETA API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6,"i1":6,"i2":6,"i3":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/callbacks/GetSavedNetworksCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/SearchForAccessPointCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/RemoveNetworkCallbacks.html" target="_top">Frames</a></li>
+<li><a href="RemoveNetworkCallbacks.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">com.isupatches.wisefy.callbacks</div>
+<h2 title="Interface RemoveNetworkCallbacks" class="title">Interface RemoveNetworkCallbacks</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public interface <span class="typeNameLabel">RemoveNetworkCallbacks</span></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/RemoveNetworkCallbacks.html#failureRemovingNetwork--">failureRemovingNetwork</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/RemoveNetworkCallbacks.html#networkNotFoundToRemove--">networkNotFoundToRemove</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/RemoveNetworkCallbacks.html#networkRemoved--">networkRemoved</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/RemoveNetworkCallbacks.html#removeNetworkWiseFyFailure-java.lang.Integer-">removeNetworkWiseFyFailure</a></span>(java.lang.Integer&nbsp;wisefyReturnCode)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="failureRemovingNetwork--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>failureRemovingNetwork</h4>
+<pre>void&nbsp;failureRemovingNetwork()</pre>
+</li>
+</ul>
+<a name="networkNotFoundToRemove--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>networkNotFoundToRemove</h4>
+<pre>void&nbsp;networkNotFoundToRemove()</pre>
+</li>
+</ul>
+<a name="networkRemoved--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>networkRemoved</h4>
+<pre>void&nbsp;networkRemoved()</pre>
+</li>
+</ul>
+<a name="removeNetworkWiseFyFailure-java.lang.Integer-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>removeNetworkWiseFyFailure</h4>
+<pre>void&nbsp;removeNetworkWiseFyFailure(java.lang.Integer&nbsp;wisefyReturnCode)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/callbacks/GetSavedNetworksCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/SearchForAccessPointCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/RemoveNetworkCallbacks.html" target="_top">Frames</a></li>
+<li><a href="RemoveNetworkCallbacks.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/com/isupatches/wisefy/callbacks/SearchForAccessPointCallbacks.html b/javadoc/com/isupatches/wisefy/callbacks/SearchForAccessPointCallbacks.html
new file mode 100644
index 00000000..39842ccd
--- /dev/null
+++ b/javadoc/com/isupatches/wisefy/callbacks/SearchForAccessPointCallbacks.html
@@ -0,0 +1,245 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>SearchForAccessPointCallbacks (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="SearchForAccessPointCallbacks (wisefy 2.0.0-BETA API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6,"i1":6,"i2":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/callbacks/RemoveNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/SearchForAccessPointsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/SearchForAccessPointCallbacks.html" target="_top">Frames</a></li>
+<li><a href="SearchForAccessPointCallbacks.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">com.isupatches.wisefy.callbacks</div>
+<h2 title="Interface SearchForAccessPointCallbacks" class="title">Interface SearchForAccessPointCallbacks</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public interface <span class="typeNameLabel">SearchForAccessPointCallbacks</span></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/SearchForAccessPointCallbacks.html#accessPointFound-android.net.wifi.ScanResult-">accessPointFound</a></span>(android.net.wifi.ScanResult&nbsp;network)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/SearchForAccessPointCallbacks.html#accessPointNotFound--">accessPointNotFound</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/SearchForAccessPointCallbacks.html#searchForAccessPointWiseFyFailure-java.lang.Integer-">searchForAccessPointWiseFyFailure</a></span>(java.lang.Integer&nbsp;wisefyReturnCode)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="searchForAccessPointWiseFyFailure-java.lang.Integer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>searchForAccessPointWiseFyFailure</h4>
+<pre>void&nbsp;searchForAccessPointWiseFyFailure(java.lang.Integer&nbsp;wisefyReturnCode)</pre>
+</li>
+</ul>
+<a name="accessPointFound-android.net.wifi.ScanResult-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>accessPointFound</h4>
+<pre>void&nbsp;accessPointFound(android.net.wifi.ScanResult&nbsp;network)</pre>
+</li>
+</ul>
+<a name="accessPointNotFound--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>accessPointNotFound</h4>
+<pre>void&nbsp;accessPointNotFound()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/callbacks/RemoveNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/SearchForAccessPointsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/SearchForAccessPointCallbacks.html" target="_top">Frames</a></li>
+<li><a href="SearchForAccessPointCallbacks.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/com/isupatches/wisefy/callbacks/SearchForAccessPointsCallbacks.html b/javadoc/com/isupatches/wisefy/callbacks/SearchForAccessPointsCallbacks.html
new file mode 100644
index 00000000..b15e70bc
--- /dev/null
+++ b/javadoc/com/isupatches/wisefy/callbacks/SearchForAccessPointsCallbacks.html
@@ -0,0 +1,245 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>SearchForAccessPointsCallbacks (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="SearchForAccessPointsCallbacks (wisefy 2.0.0-BETA API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6,"i1":6,"i2":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/callbacks/SearchForAccessPointCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/SearchForSSIDCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/SearchForAccessPointsCallbacks.html" target="_top">Frames</a></li>
+<li><a href="SearchForAccessPointsCallbacks.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">com.isupatches.wisefy.callbacks</div>
+<h2 title="Interface SearchForAccessPointsCallbacks" class="title">Interface SearchForAccessPointsCallbacks</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public interface <span class="typeNameLabel">SearchForAccessPointsCallbacks</span></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/SearchForAccessPointsCallbacks.html#foundNetworks-java.util.List-">foundNetworks</a></span>(java.util.List&lt;android.net.wifi.ScanResult&gt;&nbsp;networks)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/SearchForAccessPointsCallbacks.html#noNetworksFound--">noNetworksFound</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/SearchForAccessPointsCallbacks.html#searchForAccessPointsWiseFyFailure-java.lang.Integer-">searchForAccessPointsWiseFyFailure</a></span>(java.lang.Integer&nbsp;wisefyReturnCode)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="searchForAccessPointsWiseFyFailure-java.lang.Integer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>searchForAccessPointsWiseFyFailure</h4>
+<pre>void&nbsp;searchForAccessPointsWiseFyFailure(java.lang.Integer&nbsp;wisefyReturnCode)</pre>
+</li>
+</ul>
+<a name="foundNetworks-java.util.List-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>foundNetworks</h4>
+<pre>void&nbsp;foundNetworks(java.util.List&lt;android.net.wifi.ScanResult&gt;&nbsp;networks)</pre>
+</li>
+</ul>
+<a name="noNetworksFound--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>noNetworksFound</h4>
+<pre>void&nbsp;noNetworksFound()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/callbacks/SearchForAccessPointCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/SearchForSSIDCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/SearchForAccessPointsCallbacks.html" target="_top">Frames</a></li>
+<li><a href="SearchForAccessPointsCallbacks.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/com/isupatches/wisefy/callbacks/SearchForSSIDCallbacks.html b/javadoc/com/isupatches/wisefy/callbacks/SearchForSSIDCallbacks.html
new file mode 100644
index 00000000..144b7d8a
--- /dev/null
+++ b/javadoc/com/isupatches/wisefy/callbacks/SearchForSSIDCallbacks.html
@@ -0,0 +1,245 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>SearchForSSIDCallbacks (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="SearchForSSIDCallbacks (wisefy 2.0.0-BETA API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6,"i1":6,"i2":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/callbacks/SearchForAccessPointsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/SearchForSSIDsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/SearchForSSIDCallbacks.html" target="_top">Frames</a></li>
+<li><a href="SearchForSSIDCallbacks.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">com.isupatches.wisefy.callbacks</div>
+<h2 title="Interface SearchForSSIDCallbacks" class="title">Interface SearchForSSIDCallbacks</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public interface <span class="typeNameLabel">SearchForSSIDCallbacks</span></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/SearchForSSIDCallbacks.html#searchForSSIDWiseFyFailure-java.lang.Integer-">searchForSSIDWiseFyFailure</a></span>(java.lang.Integer&nbsp;wisefyReturnCode)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/SearchForSSIDCallbacks.html#ssidFound-java.lang.String-">ssidFound</a></span>(java.lang.String&nbsp;ssid)</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/SearchForSSIDCallbacks.html#ssidNotFound--">ssidNotFound</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="searchForSSIDWiseFyFailure-java.lang.Integer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>searchForSSIDWiseFyFailure</h4>
+<pre>void&nbsp;searchForSSIDWiseFyFailure(java.lang.Integer&nbsp;wisefyReturnCode)</pre>
+</li>
+</ul>
+<a name="ssidFound-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>ssidFound</h4>
+<pre>void&nbsp;ssidFound(java.lang.String&nbsp;ssid)</pre>
+</li>
+</ul>
+<a name="ssidNotFound--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>ssidNotFound</h4>
+<pre>void&nbsp;ssidNotFound()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/callbacks/SearchForAccessPointsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/SearchForSSIDsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/SearchForSSIDCallbacks.html" target="_top">Frames</a></li>
+<li><a href="SearchForSSIDCallbacks.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/com/isupatches/wisefy/callbacks/SearchForSSIDsCallbacks.html b/javadoc/com/isupatches/wisefy/callbacks/SearchForSSIDsCallbacks.html
new file mode 100644
index 00000000..fc433f0d
--- /dev/null
+++ b/javadoc/com/isupatches/wisefy/callbacks/SearchForSSIDsCallbacks.html
@@ -0,0 +1,245 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>SearchForSSIDsCallbacks (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="SearchForSSIDsCallbacks (wisefy 2.0.0-BETA API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6,"i1":6,"i2":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/callbacks/SearchForSSIDCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/SearchForSSIDsCallbacks.html" target="_top">Frames</a></li>
+<li><a href="SearchForSSIDsCallbacks.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">com.isupatches.wisefy.callbacks</div>
+<h2 title="Interface SearchForSSIDsCallbacks" class="title">Interface SearchForSSIDsCallbacks</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public interface <span class="typeNameLabel">SearchForSSIDsCallbacks</span></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/SearchForSSIDsCallbacks.html#noSSIDsFound--">noSSIDsFound</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/SearchForSSIDsCallbacks.html#retrievedSSIDs-java.util.List-">retrievedSSIDs</a></span>(java.util.List&lt;java.lang.String&gt;&nbsp;ssids)</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/callbacks/SearchForSSIDsCallbacks.html#searchForSSIDsWiseFyFailure-java.lang.Integer-">searchForSSIDsWiseFyFailure</a></span>(java.lang.Integer&nbsp;wisefyReturnCode)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="searchForSSIDsWiseFyFailure-java.lang.Integer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>searchForSSIDsWiseFyFailure</h4>
+<pre>void&nbsp;searchForSSIDsWiseFyFailure(java.lang.Integer&nbsp;wisefyReturnCode)</pre>
+</li>
+</ul>
+<a name="retrievedSSIDs-java.util.List-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>retrievedSSIDs</h4>
+<pre>void&nbsp;retrievedSSIDs(java.util.List&lt;java.lang.String&gt;&nbsp;ssids)</pre>
+</li>
+</ul>
+<a name="noSSIDsFound--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>noSSIDsFound</h4>
+<pre>void&nbsp;noSSIDsFound()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/callbacks/SearchForSSIDCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/SearchForSSIDsCallbacks.html" target="_top">Frames</a></li>
+<li><a href="SearchForSSIDsCallbacks.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/com/isupatches/wisefy/callbacks/package-frame.html b/javadoc/com/isupatches/wisefy/callbacks/package-frame.html
new file mode 100644
index 00000000..1cb19204
--- /dev/null
+++ b/javadoc/com/isupatches/wisefy/callbacks/package-frame.html
@@ -0,0 +1,37 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>com.isupatches.wisefy.callbacks (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<h1 class="bar"><a href="../../../../com/isupatches/wisefy/callbacks/package-summary.html" target="classFrame">com.isupatches.wisefy.callbacks</a></h1>
+<div class="indexContainer">
+<h2 title="Interfaces">Interfaces</h2>
+<ul title="Interfaces">
+<li><a href="AddOpenNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks" target="classFrame"><span class="interfaceName">AddOpenNetworkCallbacks</span></a></li>
+<li><a href="AddWEPNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks" target="classFrame"><span class="interfaceName">AddWEPNetworkCallbacks</span></a></li>
+<li><a href="AddWPA2NetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks" target="classFrame"><span class="interfaceName">AddWPA2NetworkCallbacks</span></a></li>
+<li><a href="ConnectToNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks" target="classFrame"><span class="interfaceName">ConnectToNetworkCallbacks</span></a></li>
+<li><a href="DisableWifiCallbacks.html" title="interface in com.isupatches.wisefy.callbacks" target="classFrame"><span class="interfaceName">DisableWifiCallbacks</span></a></li>
+<li><a href="DisconnectFromCurrentNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks" target="classFrame"><span class="interfaceName">DisconnectFromCurrentNetworkCallbacks</span></a></li>
+<li><a href="EnableWifiCallbacks.html" title="interface in com.isupatches.wisefy.callbacks" target="classFrame"><span class="interfaceName">EnableWifiCallbacks</span></a></li>
+<li><a href="GetCurrentNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks" target="classFrame"><span class="interfaceName">GetCurrentNetworkCallbacks</span></a></li>
+<li><a href="GetFrequencyCallbacks.html" title="interface in com.isupatches.wisefy.callbacks" target="classFrame"><span class="interfaceName">GetFrequencyCallbacks</span></a></li>
+<li><a href="GetNearbyAccessPointsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks" target="classFrame"><span class="interfaceName">GetNearbyAccessPointsCallbacks</span></a></li>
+<li><a href="GetRSSICallbacks.html" title="interface in com.isupatches.wisefy.callbacks" target="classFrame"><span class="interfaceName">GetRSSICallbacks</span></a></li>
+<li><a href="GetSavedNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks" target="classFrame"><span class="interfaceName">GetSavedNetworkCallbacks</span></a></li>
+<li><a href="GetSavedNetworksCallbacks.html" title="interface in com.isupatches.wisefy.callbacks" target="classFrame"><span class="interfaceName">GetSavedNetworksCallbacks</span></a></li>
+<li><a href="RemoveNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks" target="classFrame"><span class="interfaceName">RemoveNetworkCallbacks</span></a></li>
+<li><a href="SearchForAccessPointCallbacks.html" title="interface in com.isupatches.wisefy.callbacks" target="classFrame"><span class="interfaceName">SearchForAccessPointCallbacks</span></a></li>
+<li><a href="SearchForAccessPointsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks" target="classFrame"><span class="interfaceName">SearchForAccessPointsCallbacks</span></a></li>
+<li><a href="SearchForSSIDCallbacks.html" title="interface in com.isupatches.wisefy.callbacks" target="classFrame"><span class="interfaceName">SearchForSSIDCallbacks</span></a></li>
+<li><a href="SearchForSSIDsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks" target="classFrame"><span class="interfaceName">SearchForSSIDsCallbacks</span></a></li>
+</ul>
+</div>
+</body>
+</html>
diff --git a/javadoc/com/isupatches/wisefy/callbacks/package-summary.html b/javadoc/com/isupatches/wisefy/callbacks/package-summary.html
new file mode 100644
index 00000000..384eb766
--- /dev/null
+++ b/javadoc/com/isupatches/wisefy/callbacks/package-summary.html
@@ -0,0 +1,208 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>com.isupatches.wisefy.callbacks (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="com.isupatches.wisefy.callbacks (wisefy 2.0.0-BETA API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/annotations/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../../../../com/isupatches/wisefy/constants/package-summary.html">Next&nbsp;Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Package" class="title">Package&nbsp;com.isupatches.wisefy.callbacks</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Interface Summary table, listing interfaces, and an explanation">
+<caption><span>Interface Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Interface</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../com/isupatches/wisefy/callbacks/AddOpenNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">AddOpenNetworkCallbacks</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../com/isupatches/wisefy/callbacks/AddWEPNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">AddWEPNetworkCallbacks</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../com/isupatches/wisefy/callbacks/AddWPA2NetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">AddWPA2NetworkCallbacks</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../com/isupatches/wisefy/callbacks/ConnectToNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">ConnectToNetworkCallbacks</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../com/isupatches/wisefy/callbacks/DisableWifiCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">DisableWifiCallbacks</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../com/isupatches/wisefy/callbacks/DisconnectFromCurrentNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">DisconnectFromCurrentNetworkCallbacks</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../com/isupatches/wisefy/callbacks/EnableWifiCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">EnableWifiCallbacks</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../com/isupatches/wisefy/callbacks/GetCurrentNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">GetCurrentNetworkCallbacks</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../com/isupatches/wisefy/callbacks/GetFrequencyCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">GetFrequencyCallbacks</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../com/isupatches/wisefy/callbacks/GetNearbyAccessPointsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">GetNearbyAccessPointsCallbacks</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../com/isupatches/wisefy/callbacks/GetRSSICallbacks.html" title="interface in com.isupatches.wisefy.callbacks">GetRSSICallbacks</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../com/isupatches/wisefy/callbacks/GetSavedNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">GetSavedNetworkCallbacks</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../com/isupatches/wisefy/callbacks/GetSavedNetworksCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">GetSavedNetworksCallbacks</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../com/isupatches/wisefy/callbacks/RemoveNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">RemoveNetworkCallbacks</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../com/isupatches/wisefy/callbacks/SearchForAccessPointCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">SearchForAccessPointCallbacks</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../com/isupatches/wisefy/callbacks/SearchForAccessPointsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">SearchForAccessPointsCallbacks</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../com/isupatches/wisefy/callbacks/SearchForSSIDCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">SearchForSSIDCallbacks</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../com/isupatches/wisefy/callbacks/SearchForSSIDsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">SearchForSSIDsCallbacks</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/annotations/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../../../../com/isupatches/wisefy/constants/package-summary.html">Next&nbsp;Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/com/isupatches/wisefy/callbacks/package-tree.html b/javadoc/com/isupatches/wisefy/callbacks/package-tree.html
new file mode 100644
index 00000000..766cdd5c
--- /dev/null
+++ b/javadoc/com/isupatches/wisefy/callbacks/package-tree.html
@@ -0,0 +1,148 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>com.isupatches.wisefy.callbacks Class Hierarchy (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="com.isupatches.wisefy.callbacks Class Hierarchy (wisefy 2.0.0-BETA API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/annotations/package-tree.html">Prev</a></li>
+<li><a href="../../../../com/isupatches/wisefy/constants/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 class="title">Hierarchy For Package com.isupatches.wisefy.callbacks</h1>
+<span class="packageHierarchyLabel">Package Hierarchies:</span>
+<ul class="horizontal">
+<li><a href="../../../../overview-tree.html">All Packages</a></li>
+</ul>
+</div>
+<div class="contentContainer">
+<h2 title="Interface Hierarchy">Interface Hierarchy</h2>
+<ul>
+<li type="circle">com.isupatches.wisefy.callbacks.<a href="../../../../com/isupatches/wisefy/callbacks/AddOpenNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">AddOpenNetworkCallbacks</span></a></li>
+<li type="circle">com.isupatches.wisefy.callbacks.<a href="../../../../com/isupatches/wisefy/callbacks/AddWEPNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">AddWEPNetworkCallbacks</span></a></li>
+<li type="circle">com.isupatches.wisefy.callbacks.<a href="../../../../com/isupatches/wisefy/callbacks/AddWPA2NetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">AddWPA2NetworkCallbacks</span></a></li>
+<li type="circle">com.isupatches.wisefy.callbacks.<a href="../../../../com/isupatches/wisefy/callbacks/ConnectToNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">ConnectToNetworkCallbacks</span></a></li>
+<li type="circle">com.isupatches.wisefy.callbacks.<a href="../../../../com/isupatches/wisefy/callbacks/DisableWifiCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">DisableWifiCallbacks</span></a></li>
+<li type="circle">com.isupatches.wisefy.callbacks.<a href="../../../../com/isupatches/wisefy/callbacks/DisconnectFromCurrentNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">DisconnectFromCurrentNetworkCallbacks</span></a></li>
+<li type="circle">com.isupatches.wisefy.callbacks.<a href="../../../../com/isupatches/wisefy/callbacks/EnableWifiCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">EnableWifiCallbacks</span></a></li>
+<li type="circle">com.isupatches.wisefy.callbacks.<a href="../../../../com/isupatches/wisefy/callbacks/GetCurrentNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">GetCurrentNetworkCallbacks</span></a></li>
+<li type="circle">com.isupatches.wisefy.callbacks.<a href="../../../../com/isupatches/wisefy/callbacks/GetFrequencyCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">GetFrequencyCallbacks</span></a></li>
+<li type="circle">com.isupatches.wisefy.callbacks.<a href="../../../../com/isupatches/wisefy/callbacks/GetNearbyAccessPointsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">GetNearbyAccessPointsCallbacks</span></a></li>
+<li type="circle">com.isupatches.wisefy.callbacks.<a href="../../../../com/isupatches/wisefy/callbacks/GetRSSICallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">GetRSSICallbacks</span></a></li>
+<li type="circle">com.isupatches.wisefy.callbacks.<a href="../../../../com/isupatches/wisefy/callbacks/GetSavedNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">GetSavedNetworkCallbacks</span></a></li>
+<li type="circle">com.isupatches.wisefy.callbacks.<a href="../../../../com/isupatches/wisefy/callbacks/GetSavedNetworksCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">GetSavedNetworksCallbacks</span></a></li>
+<li type="circle">com.isupatches.wisefy.callbacks.<a href="../../../../com/isupatches/wisefy/callbacks/RemoveNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">RemoveNetworkCallbacks</span></a></li>
+<li type="circle">com.isupatches.wisefy.callbacks.<a href="../../../../com/isupatches/wisefy/callbacks/SearchForAccessPointCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">SearchForAccessPointCallbacks</span></a></li>
+<li type="circle">com.isupatches.wisefy.callbacks.<a href="../../../../com/isupatches/wisefy/callbacks/SearchForAccessPointsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">SearchForAccessPointsCallbacks</span></a></li>
+<li type="circle">com.isupatches.wisefy.callbacks.<a href="../../../../com/isupatches/wisefy/callbacks/SearchForSSIDCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">SearchForSSIDCallbacks</span></a></li>
+<li type="circle">com.isupatches.wisefy.callbacks.<a href="../../../../com/isupatches/wisefy/callbacks/SearchForSSIDsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">SearchForSSIDsCallbacks</span></a></li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/annotations/package-tree.html">Prev</a></li>
+<li><a href="../../../../com/isupatches/wisefy/constants/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/callbacks/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/com/isupatches/wisefy/constants/Capabilities.html b/javadoc/com/isupatches/wisefy/constants/Capabilities.html
index d24d4abd..c0f4b273 100644
--- a/javadoc/com/isupatches/wisefy/constants/Capabilities.html
+++ b/javadoc/com/isupatches/wisefy/constants/Capabilities.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Tue Jul 04 09:39:44 CDT 2017 -->
-<title>Capabilities (wisefy 1.0.10 API)</title>
-<meta name="date" content="2017-07-04">
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>Capabilities (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Capabilities (wisefy 1.0.10 API)";
+            parent.document.title="Capabilities (wisefy 2.0.0-BETA API)";
         }
     }
     catch(err) {
@@ -134,6 +134,14 @@ <h3>Field Summary</h3>
 <td class="colFirst"><code>static java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/constants/Capabilities.html#WEP">WEP</a></span></code>&nbsp;</td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/constants/Capabilities.html#WPA">WPA</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/constants/Capabilities.html#WPA2">WPA2</a></span></code>&nbsp;</td>
+</tr>
 </table>
 </li>
 </ul>
@@ -210,7 +218,7 @@ <h4>PSK</h4>
 <a name="WEP">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>WEP</h4>
 <pre>public static final&nbsp;java.lang.String WEP</pre>
@@ -220,6 +228,32 @@ <h4>WEP</h4>
 </dl>
 </li>
 </ul>
+<a name="WPA">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>WPA</h4>
+<pre>public static final&nbsp;java.lang.String WPA</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../constant-values.html#com.isupatches.wisefy.constants.Capabilities.WPA">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="WPA2">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>WPA2</h4>
+<pre>public static final&nbsp;java.lang.String WPA2</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../constant-values.html#com.isupatches.wisefy.constants.Capabilities.WPA2">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
 </li>
 </ul>
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
diff --git a/javadoc/com/isupatches/wisefy/constants/NetworkTypes.html b/javadoc/com/isupatches/wisefy/constants/NetworkTypes.html
index 74821637..04cf1a3d 100644
--- a/javadoc/com/isupatches/wisefy/constants/NetworkTypes.html
+++ b/javadoc/com/isupatches/wisefy/constants/NetworkTypes.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Tue Jul 04 09:39:44 CDT 2017 -->
-<title>NetworkTypes (wisefy 1.0.10 API)</title>
-<meta name="date" content="2017-07-04">
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>NetworkTypes (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NetworkTypes (wisefy 1.0.10 API)";
+            parent.document.title="NetworkTypes (wisefy 2.0.0-BETA API)";
         }
     }
     catch(err) {
diff --git a/javadoc/com/isupatches/wisefy/constants/WiseFyCodes.html b/javadoc/com/isupatches/wisefy/constants/WiseFyCodes.html
index 37d3b061..dda535c7 100644
--- a/javadoc/com/isupatches/wisefy/constants/WiseFyCodes.html
+++ b/javadoc/com/isupatches/wisefy/constants/WiseFyCodes.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Tue Jul 04 09:39:44 CDT 2017 -->
-<title>WiseFyCodes (wisefy 1.0.10 API)</title>
-<meta name="date" content="2017-07-04">
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>WiseFyCodes (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="WiseFyCodes (wisefy 1.0.10 API)";
+            parent.document.title="WiseFyCodes (wisefy 2.0.0-BETA API)";
         }
     }
     catch(err) {
@@ -124,10 +124,14 @@ <h3>Field Summary</h3>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/constants/WiseFyCodes.html#FAILURE">FAILURE</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/constants/WiseFyCodes.html#MISSING_PARAMETER">MISSING_PARAMETER</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/constants/WiseFyCodes.html#MISSING_PREREQUISITE">MISSING_PREREQUISITE</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/constants/WiseFyCodes.html#NETWORK_ALREADY_CONFIGURED">NETWORK_ALREADY_CONFIGURED</a></span></code>&nbsp;</td>
 </tr>
 </table>
@@ -177,16 +181,29 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <!--   -->
 </a>
 <h3>Field Detail</h3>
-<a name="FAILURE">
+<a name="MISSING_PARAMETER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>MISSING_PARAMETER</h4>
+<pre>public static final&nbsp;int MISSING_PARAMETER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../constant-values.html#com.isupatches.wisefy.constants.WiseFyCodes.MISSING_PARAMETER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="MISSING_PREREQUISITE">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>FAILURE</h4>
-<pre>public static final&nbsp;int FAILURE</pre>
+<h4>MISSING_PREREQUISITE</h4>
+<pre>public static final&nbsp;int MISSING_PREREQUISITE</pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../constant-values.html#com.isupatches.wisefy.constants.WiseFyCodes.FAILURE">Constant Field Values</a></dd>
+<dd><a href="../../../../constant-values.html#com.isupatches.wisefy.constants.WiseFyCodes.MISSING_PREREQUISITE">Constant Field Values</a></dd>
 </dl>
 </li>
 </ul>
diff --git a/javadoc/com/isupatches/wisefy/constants/package-frame.html b/javadoc/com/isupatches/wisefy/constants/package-frame.html
index 8c655b02..8c34c826 100644
--- a/javadoc/com/isupatches/wisefy/constants/package-frame.html
+++ b/javadoc/com/isupatches/wisefy/constants/package-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Tue Jul 04 09:39:45 CDT 2017 -->
-<title>com.isupatches.wisefy.constants (wisefy 1.0.10 API)</title>
-<meta name="date" content="2017-07-04">
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>com.isupatches.wisefy.constants (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
diff --git a/javadoc/com/isupatches/wisefy/constants/package-summary.html b/javadoc/com/isupatches/wisefy/constants/package-summary.html
index b47a13cf..480a3e98 100644
--- a/javadoc/com/isupatches/wisefy/constants/package-summary.html
+++ b/javadoc/com/isupatches/wisefy/constants/package-summary.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Tue Jul 04 09:39:45 CDT 2017 -->
-<title>com.isupatches.wisefy.constants (wisefy 1.0.10 API)</title>
-<meta name="date" content="2017-07-04">
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>com.isupatches.wisefy.constants (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="com.isupatches.wisefy.constants (wisefy 1.0.10 API)";
+            parent.document.title="com.isupatches.wisefy.constants (wisefy 2.0.0-BETA API)";
         }
     }
     catch(err) {
@@ -42,8 +42,8 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../com/isupatches/wisefy/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../../../../com/isupatches/wisefy/util/package-summary.html">Next&nbsp;Package</a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../../../../com/isupatches/wisefy/threads/package-summary.html">Next&nbsp;Package</a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?com/isupatches/wisefy/constants/package-summary.html" target="_top">Frames</a></li>
@@ -118,8 +118,8 @@ <h1 title="Package" class="title">Package&nbsp;com.isupatches.wisefy.constants</
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../com/isupatches/wisefy/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../../../../com/isupatches/wisefy/util/package-summary.html">Next&nbsp;Package</a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../../../../com/isupatches/wisefy/threads/package-summary.html">Next&nbsp;Package</a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?com/isupatches/wisefy/constants/package-summary.html" target="_top">Frames</a></li>
diff --git a/javadoc/com/isupatches/wisefy/constants/package-tree.html b/javadoc/com/isupatches/wisefy/constants/package-tree.html
index 53931fa6..f279da03 100644
--- a/javadoc/com/isupatches/wisefy/constants/package-tree.html
+++ b/javadoc/com/isupatches/wisefy/constants/package-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Tue Jul 04 09:39:45 CDT 2017 -->
-<title>com.isupatches.wisefy.constants Class Hierarchy (wisefy 1.0.10 API)</title>
-<meta name="date" content="2017-07-04">
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>com.isupatches.wisefy.constants Class Hierarchy (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="com.isupatches.wisefy.constants Class Hierarchy (wisefy 1.0.10 API)";
+            parent.document.title="com.isupatches.wisefy.constants Class Hierarchy (wisefy 2.0.0-BETA API)";
         }
     }
     catch(err) {
@@ -42,8 +42,8 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../com/isupatches/wisefy/package-tree.html">Prev</a></li>
-<li><a href="../../../../com/isupatches/wisefy/util/package-tree.html">Next</a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/package-tree.html">Prev</a></li>
+<li><a href="../../../../com/isupatches/wisefy/threads/package-tree.html">Next</a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?com/isupatches/wisefy/constants/package-tree.html" target="_top">Frames</a></li>
@@ -107,8 +107,8 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../com/isupatches/wisefy/package-tree.html">Prev</a></li>
-<li><a href="../../../../com/isupatches/wisefy/util/package-tree.html">Next</a></li>
+<li><a href="../../../../com/isupatches/wisefy/callbacks/package-tree.html">Prev</a></li>
+<li><a href="../../../../com/isupatches/wisefy/threads/package-tree.html">Next</a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?com/isupatches/wisefy/constants/package-tree.html" target="_top">Frames</a></li>
diff --git a/javadoc/com/isupatches/wisefy/package-frame.html b/javadoc/com/isupatches/wisefy/package-frame.html
index 1cc8d27c..6fd31c5e 100644
--- a/javadoc/com/isupatches/wisefy/package-frame.html
+++ b/javadoc/com/isupatches/wisefy/package-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Tue Jul 04 09:39:45 CDT 2017 -->
-<title>com.isupatches.wisefy (wisefy 1.0.10 API)</title>
-<meta name="date" content="2017-07-04">
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>com.isupatches.wisefy (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -14,7 +14,7 @@ <h1 class="bar"><a href="../../../com/isupatches/wisefy/package-summary.html" ta
 <h2 title="Classes">Classes</h2>
 <ul title="Classes">
 <li><a href="WiseFy.html" title="class in com.isupatches.wisefy" target="classFrame">WiseFy</a></li>
-<li><a href="WiseFy.withContext.html" title="class in com.isupatches.wisefy" target="classFrame">WiseFy.withContext</a></li>
+<li><a href="WiseFy.brains.html" title="class in com.isupatches.wisefy" target="classFrame">WiseFy.brains</a></li>
 </ul>
 </div>
 </body>
diff --git a/javadoc/com/isupatches/wisefy/package-summary.html b/javadoc/com/isupatches/wisefy/package-summary.html
index 527b5c17..8c77fbe4 100644
--- a/javadoc/com/isupatches/wisefy/package-summary.html
+++ b/javadoc/com/isupatches/wisefy/package-summary.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Tue Jul 04 09:39:45 CDT 2017 -->
-<title>com.isupatches.wisefy (wisefy 1.0.10 API)</title>
-<meta name="date" content="2017-07-04">
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>com.isupatches.wisefy (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="com.isupatches.wisefy (wisefy 1.0.10 API)";
+            parent.document.title="com.isupatches.wisefy (wisefy 2.0.0-BETA API)";
         }
     }
     catch(err) {
@@ -43,7 +43,7 @@
 <div class="subNav">
 <ul class="navList">
 <li>Prev&nbsp;Package</li>
-<li><a href="../../../com/isupatches/wisefy/constants/package-summary.html">Next&nbsp;Package</a></li>
+<li><a href="../../../com/isupatches/wisefy/annotations/package-summary.html">Next&nbsp;Package</a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../index.html?com/isupatches/wisefy/package-summary.html" target="_top">Frames</a></li>
@@ -84,13 +84,12 @@ <h1 title="Package" class="title">Package&nbsp;com.isupatches.wisefy</h1>
 <tr class="altColor">
 <td class="colFirst"><a href="../../../com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></td>
 <td class="colLast">
-<div class="block">Main class to manipulate and query network settings on an Android device
-
- Uses the builder pattern for creation - <a href="../../../com/isupatches/wisefy/WiseFy.withContext.html" title="class in com.isupatches.wisefy"><code>WiseFy.withContext</code></a></div>
+<div class="block">Main class for WiseFy that provides a synchronous and asynchronous API to manipulate and query
+ for different parts of a device's wifi configuration and status.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="../../../com/isupatches/wisefy/WiseFy.withContext.html" title="class in com.isupatches.wisefy">WiseFy.withContext</a></td>
+<td class="colFirst"><a href="../../../com/isupatches/wisefy/WiseFy.brains.html" title="class in com.isupatches.wisefy">WiseFy.brains</a></td>
 <td class="colLast">
 <div class="block">Static class for builder pattern
 
@@ -123,7 +122,7 @@ <h1 title="Package" class="title">Package&nbsp;com.isupatches.wisefy</h1>
 <div class="subNav">
 <ul class="navList">
 <li>Prev&nbsp;Package</li>
-<li><a href="../../../com/isupatches/wisefy/constants/package-summary.html">Next&nbsp;Package</a></li>
+<li><a href="../../../com/isupatches/wisefy/annotations/package-summary.html">Next&nbsp;Package</a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../index.html?com/isupatches/wisefy/package-summary.html" target="_top">Frames</a></li>
diff --git a/javadoc/com/isupatches/wisefy/package-tree.html b/javadoc/com/isupatches/wisefy/package-tree.html
index 7f6a953c..503fc91f 100644
--- a/javadoc/com/isupatches/wisefy/package-tree.html
+++ b/javadoc/com/isupatches/wisefy/package-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Tue Jul 04 09:39:45 CDT 2017 -->
-<title>com.isupatches.wisefy Class Hierarchy (wisefy 1.0.10 API)</title>
-<meta name="date" content="2017-07-04">
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>com.isupatches.wisefy Class Hierarchy (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="com.isupatches.wisefy Class Hierarchy (wisefy 1.0.10 API)";
+            parent.document.title="com.isupatches.wisefy Class Hierarchy (wisefy 2.0.0-BETA API)";
         }
     }
     catch(err) {
@@ -43,7 +43,7 @@
 <div class="subNav">
 <ul class="navList">
 <li>Prev</li>
-<li><a href="../../../com/isupatches/wisefy/constants/package-tree.html">Next</a></li>
+<li><a href="../../../com/isupatches/wisefy/annotations/package-tree.html">Next</a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../index.html?com/isupatches/wisefy/package-tree.html" target="_top">Frames</a></li>
@@ -81,7 +81,7 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <li type="circle">java.lang.Object
 <ul>
 <li type="circle">com.isupatches.wisefy.<a href="../../../com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy"><span class="typeNameLink">WiseFy</span></a></li>
-<li type="circle">com.isupatches.wisefy.<a href="../../../com/isupatches/wisefy/WiseFy.withContext.html" title="class in com.isupatches.wisefy"><span class="typeNameLink">WiseFy.withContext</span></a></li>
+<li type="circle">com.isupatches.wisefy.<a href="../../../com/isupatches/wisefy/WiseFy.brains.html" title="class in com.isupatches.wisefy"><span class="typeNameLink">WiseFy.brains</span></a></li>
 </ul>
 </li>
 </ul>
@@ -107,7 +107,7 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <div class="subNav">
 <ul class="navList">
 <li>Prev</li>
-<li><a href="../../../com/isupatches/wisefy/constants/package-tree.html">Next</a></li>
+<li><a href="../../../com/isupatches/wisefy/annotations/package-tree.html">Next</a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../index.html?com/isupatches/wisefy/package-tree.html" target="_top">Frames</a></li>
diff --git a/javadoc/com/isupatches/wisefy/threads/WiseFyHandlerThread.html b/javadoc/com/isupatches/wisefy/threads/WiseFyHandlerThread.html
new file mode 100644
index 00000000..7a0d3988
--- /dev/null
+++ b/javadoc/com/isupatches/wisefy/threads/WiseFyHandlerThread.html
@@ -0,0 +1,381 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>WiseFyHandlerThread (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="WiseFyHandlerThread (wisefy 2.0.0-BETA API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/threads/WiseFyHandlerThread.html" target="_top">Frames</a></li>
+<li><a href="WiseFyHandlerThread.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested.classes.inherited.from.class.java.lang.Thread">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">com.isupatches.wisefy.threads</div>
+<h2 title="Class WiseFyHandlerThread" class="title">Class WiseFyHandlerThread</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>java.lang.Thread</li>
+<li>
+<ul class="inheritance">
+<li>android.os.HandlerThread</li>
+<li>
+<ul class="inheritance">
+<li>com.isupatches.wisefy.threads.WiseFyHandlerThread</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.lang.Runnable</dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">WiseFyHandlerThread</span>
+extends android.os.HandlerThread</pre>
+<div class="block">A Thread to use for all WiseFy background processing
+
+ *NOTE* Must be cleaned!! <a href="../../../../com/isupatches/wisefy/WiseFy.html#dump--"><code>WiseFy.dump()</code></a></div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== NESTED CLASS SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="nested.class.summary">
+<!--   -->
+</a>
+<h3>Nested Class Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="nested.classes.inherited.from.class.java.lang.Thread">
+<!--   -->
+</a>
+<h3>Nested classes/interfaces inherited from class&nbsp;java.lang.Thread</h3>
+<code>java.lang.Thread.State, java.lang.Thread.UncaughtExceptionHandler</code></li>
+</ul>
+</li>
+</ul>
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/threads/WiseFyHandlerThread.html#TAG">TAG</a></span></code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.java.lang.Thread">
+<!--   -->
+</a>
+<h3>Fields inherited from class&nbsp;java.lang.Thread</h3>
+<code>MAX_PRIORITY, MIN_PRIORITY, NORM_PRIORITY</code></li>
+</ul>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/threads/WiseFyHandlerThread.html#WiseFyHandlerThread-java.lang.String-boolean-">WiseFyHandlerThread</a></span>(java.lang.String&nbsp;name,
+                   boolean&nbsp;loggingEnabled)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/threads/WiseFyHandlerThread.html#quit--">quit</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/threads/WiseFyHandlerThread.html#start--">start</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.android.os.HandlerThread">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;android.os.HandlerThread</h3>
+<code>getLooper, getThreadId, onLooperPrepared, quitSafely, run</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Thread">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Thread</h3>
+<code>activeCount, checkAccess, clone, countStackFrames, currentThread, destroy, dumpStack, enumerate, getAllStackTraces, getContextClassLoader, getDefaultUncaughtExceptionHandler, getId, getName, getPriority, getStackTrace, getState, getThreadGroup, getUncaughtExceptionHandler, holdsLock, interrupt, interrupted, isAlive, isDaemon, isInterrupted, join, join, join, resume, setContextClassLoader, setDaemon, setDefaultUncaughtExceptionHandler, setName, setPriority, setUncaughtExceptionHandler, sleep, sleep, stop, stop, suspend, toString, yield</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="TAG">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>TAG</h4>
+<pre>public static final&nbsp;java.lang.String TAG</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="WiseFyHandlerThread-java.lang.String-boolean-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>WiseFyHandlerThread</h4>
+<pre>public&nbsp;WiseFyHandlerThread(java.lang.String&nbsp;name,
+                           boolean&nbsp;loggingEnabled)</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="start--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>start</h4>
+<pre>public&nbsp;void&nbsp;start()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code>start</code>&nbsp;in class&nbsp;<code>java.lang.Thread</code></dd>
+</dl>
+</li>
+</ul>
+<a name="quit--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>quit</h4>
+<pre>public&nbsp;boolean&nbsp;quit()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code>quit</code>&nbsp;in class&nbsp;<code>android.os.HandlerThread</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/threads/WiseFyHandlerThread.html" target="_top">Frames</a></li>
+<li><a href="WiseFyHandlerThread.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested.classes.inherited.from.class.java.lang.Thread">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/com/isupatches/wisefy/threads/package-frame.html b/javadoc/com/isupatches/wisefy/threads/package-frame.html
new file mode 100644
index 00000000..8c6fac4c
--- /dev/null
+++ b/javadoc/com/isupatches/wisefy/threads/package-frame.html
@@ -0,0 +1,20 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>com.isupatches.wisefy.threads (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<h1 class="bar"><a href="../../../../com/isupatches/wisefy/threads/package-summary.html" target="classFrame">com.isupatches.wisefy.threads</a></h1>
+<div class="indexContainer">
+<h2 title="Classes">Classes</h2>
+<ul title="Classes">
+<li><a href="WiseFyHandlerThread.html" title="class in com.isupatches.wisefy.threads" target="classFrame">WiseFyHandlerThread</a></li>
+</ul>
+</div>
+</body>
+</html>
diff --git a/javadoc/com/isupatches/wisefy/threads/package-summary.html b/javadoc/com/isupatches/wisefy/threads/package-summary.html
new file mode 100644
index 00000000..492633eb
--- /dev/null
+++ b/javadoc/com/isupatches/wisefy/threads/package-summary.html
@@ -0,0 +1,144 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>com.isupatches.wisefy.threads (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="com.isupatches.wisefy.threads (wisefy 2.0.0-BETA API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/constants/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../../../../com/isupatches/wisefy/util/package-summary.html">Next&nbsp;Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/threads/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Package" class="title">Package&nbsp;com.isupatches.wisefy.threads</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
+<caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Class</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../com/isupatches/wisefy/threads/WiseFyHandlerThread.html" title="class in com.isupatches.wisefy.threads">WiseFyHandlerThread</a></td>
+<td class="colLast">
+<div class="block">A Thread to use for all WiseFy background processing
+
+ *NOTE* Must be cleaned!! <a href="../../../../com/isupatches/wisefy/WiseFy.html#dump--"><code>WiseFy.dump()</code></a></div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/constants/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../../../../com/isupatches/wisefy/util/package-summary.html">Next&nbsp;Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/threads/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/com/isupatches/wisefy/threads/package-tree.html b/javadoc/com/isupatches/wisefy/threads/package-tree.html
new file mode 100644
index 00000000..fb56a515
--- /dev/null
+++ b/javadoc/com/isupatches/wisefy/threads/package-tree.html
@@ -0,0 +1,143 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>com.isupatches.wisefy.threads Class Hierarchy (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="com.isupatches.wisefy.threads Class Hierarchy (wisefy 2.0.0-BETA API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/constants/package-tree.html">Prev</a></li>
+<li><a href="../../../../com/isupatches/wisefy/util/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/threads/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 class="title">Hierarchy For Package com.isupatches.wisefy.threads</h1>
+<span class="packageHierarchyLabel">Package Hierarchies:</span>
+<ul class="horizontal">
+<li><a href="../../../../overview-tree.html">All Packages</a></li>
+</ul>
+</div>
+<div class="contentContainer">
+<h2 title="Class Hierarchy">Class Hierarchy</h2>
+<ul>
+<li type="circle">java.lang.Object
+<ul>
+<li type="circle">java.lang.Thread (implements java.lang.Runnable)
+<ul>
+<li type="circle">android.os.HandlerThread
+<ul>
+<li type="circle">com.isupatches.wisefy.threads.<a href="../../../../com/isupatches/wisefy/threads/WiseFyHandlerThread.html" title="class in com.isupatches.wisefy.threads"><span class="typeNameLink">WiseFyHandlerThread</span></a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/constants/package-tree.html">Prev</a></li>
+<li><a href="../../../../com/isupatches/wisefy/util/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/threads/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/com/isupatches/wisefy/util/LogUtil.html b/javadoc/com/isupatches/wisefy/util/LogUtil.html
index 74358849..7b069369 100644
--- a/javadoc/com/isupatches/wisefy/util/LogUtil.html
+++ b/javadoc/com/isupatches/wisefy/util/LogUtil.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Tue Jul 04 09:39:44 CDT 2017 -->
-<title>LogUtil (wisefy 1.0.10 API)</title>
-<meta name="date" content="2017-07-04">
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>LogUtil (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="LogUtil (wisefy 1.0.10 API)";
+            parent.document.title="LogUtil (wisefy 2.0.0-BETA API)";
         }
     }
     catch(err) {
@@ -205,11 +205,13 @@ <h4>isLoggable</h4>
 <div class="block">Checks to see given a TAG, log level, and if logging is enabled if logging should occur</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>tag</code> - - The tag to be used for the log</dd>
-<dd><code>level</code> - - The level of logging (i.e Log.DEBUG, Log.WARN, Log.ERROR, etc) <code>Log</code></dd>
-<dd><code>loggingEnabled</code> - - If the instances of WiseFy has logging set to always be enabled</dd>
+<dd><code>tag</code> - The tag to be used for the log</dd>
+<dd><code>level</code> - The level of logging (i.e Log.DEBUG, Log.WARN, Log.ERROR, etc)</dd>
+<dd><code>loggingEnabled</code> - If the instances of WiseFy has logging set to always be enabled</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
-<dd>boolean - if logging is enabled</dd>
+<dd>boolean - True if logging should occur based off level and other factors</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><code>Log</code></dd>
 </dl>
 </li>
 </ul>
diff --git a/javadoc/com/isupatches/wisefy/util/ManagerUtil.html b/javadoc/com/isupatches/wisefy/util/ManagerUtil.html
index 36267013..f1e32d49 100644
--- a/javadoc/com/isupatches/wisefy/util/ManagerUtil.html
+++ b/javadoc/com/isupatches/wisefy/util/ManagerUtil.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Tue Jul 04 09:39:44 CDT 2017 -->
-<title>ManagerUtil (wisefy 1.0.10 API)</title>
-<meta name="date" content="2017-07-04">
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>ManagerUtil (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ManagerUtil (wisefy 1.0.10 API)";
+            parent.document.title="ManagerUtil (wisefy 2.0.0-BETA API)";
         }
     }
     catch(err) {
@@ -49,7 +49,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../com/isupatches/wisefy/util/LogUtil.html" title="class in com.isupatches.wisefy.util"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../com/isupatches/wisefy/util/SSIDUtil.html" title="class in com.isupatches.wisefy.util"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/util/SleepUtil.html" title="class in com.isupatches.wisefy.util"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?com/isupatches/wisefy/util/ManagerUtil.html" target="_top">Frames</a></li>
@@ -110,6 +110,7 @@ <h2 title="Class ManagerUtil" class="title">Class ManagerUtil</h2>
 <br>
 <pre>public class <span class="typeNameLabel">ManagerUtil</span>
 extends java.lang.Object</pre>
+<div class="block">Manager helper class</div>
 </li>
 </ul>
 </div>
@@ -189,12 +190,11 @@ <h4>getConnectivityManager</h4>
 <div class="block">To get a Connectivity manger instance from an activity's context.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>context</code> - - The context to use to retrieve a connectivity manager via getSystemService</dd>
+<dd><code>context</code> - The context to use to retrieve a connectivity manager via getSystemService</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>ConnectivityManager|null</dd>
 <dt><span class="seeLabel">See Also:</span></dt>
-<dd><code>ConnectivityManager</code>, 
-<a href="../../../../com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy"><code>WiseFy</code></a></dd>
+<dd><code>ConnectivityManager</code></dd>
 </dl>
 </li>
 </ul>
@@ -208,12 +208,11 @@ <h4>getWiFiManager</h4>
 <div class="block">To get a WiFi manger instance from an activity's context.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>context</code> - - The context to use to retrieve a wifi manager via getSystemService</dd>
+<dd><code>context</code> - The context to use to retrieve a wifi manager via getSystemService</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>WifiManager|null</dd>
 <dt><span class="seeLabel">See Also:</span></dt>
-<dd><code>WifiManager</code>, 
-<a href="../../../../com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy"><code>WiseFy</code></a></dd>
+<dd><code>WifiManager</code></dd>
 </dl>
 </li>
 </ul>
@@ -245,7 +244,7 @@ <h4>getWiFiManager</h4>
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../com/isupatches/wisefy/util/LogUtil.html" title="class in com.isupatches.wisefy.util"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../com/isupatches/wisefy/util/SSIDUtil.html" title="class in com.isupatches.wisefy.util"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/util/SleepUtil.html" title="class in com.isupatches.wisefy.util"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?com/isupatches/wisefy/util/ManagerUtil.html" target="_top">Frames</a></li>
diff --git a/javadoc/com/isupatches/wisefy/util/SSIDUtil.html b/javadoc/com/isupatches/wisefy/util/SSIDUtil.html
index 1c88f167..b9c08e04 100644
--- a/javadoc/com/isupatches/wisefy/util/SSIDUtil.html
+++ b/javadoc/com/isupatches/wisefy/util/SSIDUtil.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Tue Jul 04 09:39:44 CDT 2017 -->
-<title>SSIDUtil (wisefy 1.0.10 API)</title>
-<meta name="date" content="2017-07-04">
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>SSIDUtil (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,18 +12,12 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="SSIDUtil (wisefy 1.0.10 API)";
+            parent.document.title="SSIDUtil (wisefy 2.0.0-BETA API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":9};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -48,8 +42,8 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../com/isupatches/wisefy/util/ManagerUtil.html" title="class in com.isupatches.wisefy.util"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
+<li><a href="../../../../com/isupatches/wisefy/util/SleepUtil.html" title="class in com.isupatches.wisefy.util"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/util/WifiConfigurationUtil.html" title="class in com.isupatches.wisefy.util"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?com/isupatches/wisefy/util/SSIDUtil.html" target="_top">Frames</a></li>
@@ -76,13 +70,13 @@
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li>Method</li>
 </ul>
 </div>
 <a name="skip.navbar.top">
@@ -110,6 +104,7 @@ <h2 title="Class SSIDUtil" class="title">Class SSIDUtil</h2>
 <br>
 <pre>public class <span class="typeNameLabel">SSIDUtil</span>
 extends java.lang.Object</pre>
+<div class="block">A helper class to manipulate the string value for SSIDs</div>
 </li>
 </ul>
 </div>
@@ -122,21 +117,6 @@ <h2 title="Class SSIDUtil" class="title">Class SSIDUtil</h2>
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/util/SSIDUtil.html#convertSSIDForConfig-java.lang.String-">convertSSIDForConfig</a></span>(java.lang.String&nbsp;ssid)</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>static <a href="../../../../com/isupatches/wisefy/util/SSIDUtil.html" title="class in com.isupatches.wisefy.util">SSIDUtil</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/util/SSIDUtil.html#getInstance--">getInstance</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
@@ -149,42 +129,6 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 </li>
 </ul>
 </div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="getInstance--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getInstance</h4>
-<pre>public static&nbsp;<a href="../../../../com/isupatches/wisefy/util/SSIDUtil.html" title="class in com.isupatches.wisefy.util">SSIDUtil</a>&nbsp;getInstance()</pre>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>instance of SSIDUtil</dd>
-</dl>
-</li>
-</ul>
-<a name="convertSSIDForConfig-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>convertSSIDForConfig</h4>
-<pre>public&nbsp;java.lang.String&nbsp;convertSSIDForConfig(java.lang.String&nbsp;ssid)</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
 </div>
 <!-- ========= END OF CLASS DATA ========= -->
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
@@ -207,8 +151,8 @@ <h4>convertSSIDForConfig</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../com/isupatches/wisefy/util/ManagerUtil.html" title="class in com.isupatches.wisefy.util"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
+<li><a href="../../../../com/isupatches/wisefy/util/SleepUtil.html" title="class in com.isupatches.wisefy.util"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/util/WifiConfigurationUtil.html" title="class in com.isupatches.wisefy.util"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?com/isupatches/wisefy/util/SSIDUtil.html" target="_top">Frames</a></li>
@@ -235,13 +179,13 @@ <h4>convertSSIDForConfig</h4>
 <li>Nested&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
+<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
+<li>Method</li>
 </ul>
 </div>
 <a name="skip.navbar.bottom">
diff --git a/javadoc/com/isupatches/wisefy/util/SleepUtil.html b/javadoc/com/isupatches/wisefy/util/SleepUtil.html
new file mode 100644
index 00000000..7d751b4d
--- /dev/null
+++ b/javadoc/com/isupatches/wisefy/util/SleepUtil.html
@@ -0,0 +1,277 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>SleepUtil (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="SleepUtil (wisefy 2.0.0-BETA API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/util/ManagerUtil.html" title="class in com.isupatches.wisefy.util"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/util/SSIDUtil.html" title="class in com.isupatches.wisefy.util"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/util/SleepUtil.html" target="_top">Frames</a></li>
+<li><a href="SleepUtil.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">com.isupatches.wisefy.util</div>
+<h2 title="Class SleepUtil" class="title">Class SleepUtil</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>com.isupatches.wisefy.util.SleepUtil</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">SleepUtil</span>
+extends java.lang.Object</pre>
+<div class="block">A helper class for shared wait logic</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/util/SleepUtil.html#SleepUtil--">SleepUtil</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/util/SleepUtil.html#sleep-long-">sleep</a></span>(long&nbsp;timeToSleepInMillis)</code>
+<div class="block">Used to wait for a given amount of time (in milliseconds)</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="SleepUtil--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>SleepUtil</h4>
+<pre>public&nbsp;SleepUtil()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="sleep-long-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>sleep</h4>
+<pre>public static&nbsp;void&nbsp;sleep(long&nbsp;timeToSleepInMillis)</pre>
+<div class="block">Used to wait for a given amount of time (in milliseconds)</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>timeToSleepInMillis</code> - The number of milliseconds to sleep</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/util/ManagerUtil.html" title="class in com.isupatches.wisefy.util"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../com/isupatches/wisefy/util/SSIDUtil.html" title="class in com.isupatches.wisefy.util"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/util/SleepUtil.html" target="_top">Frames</a></li>
+<li><a href="SleepUtil.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/com/isupatches/wisefy/util/WifiConfigurationUtil.html b/javadoc/com/isupatches/wisefy/util/WifiConfigurationUtil.html
new file mode 100644
index 00000000..5a61db85
--- /dev/null
+++ b/javadoc/com/isupatches/wisefy/util/WifiConfigurationUtil.html
@@ -0,0 +1,312 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>WifiConfigurationUtil (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="WifiConfigurationUtil (wisefy 2.0.0-BETA API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/util/SSIDUtil.html" title="class in com.isupatches.wisefy.util"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/util/WifiConfigurationUtil.html" target="_top">Frames</a></li>
+<li><a href="WifiConfigurationUtil.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">com.isupatches.wisefy.util</div>
+<h2 title="Class WifiConfigurationUtil" class="title">Class WifiConfigurationUtil</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>com.isupatches.wisefy.util.WifiConfigurationUtil</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">WifiConfigurationUtil</span>
+extends java.lang.Object</pre>
+<div class="block">A helper class to generate WifiConfigurations</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>android.net.wifi.WifiConfiguration</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/util/WifiConfigurationUtil.html#generateOpenNetworkConfiguration-java.lang.String-">generateOpenNetworkConfiguration</a></span>(java.lang.String&nbsp;ssid)</code>
+<div class="block">To generate a configuration for an open network</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>android.net.wifi.WifiConfiguration</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/util/WifiConfigurationUtil.html#generateWEPNetworkConfiguration-java.lang.String-java.lang.String-">generateWEPNetworkConfiguration</a></span>(java.lang.String&nbsp;ssid,
+                               java.lang.String&nbsp;password)</code>
+<div class="block">To generate a configuration for a WEP network</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>android.net.wifi.WifiConfiguration</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/util/WifiConfigurationUtil.html#generateWPA2NetworkConfiguration-java.lang.String-java.lang.String-">generateWPA2NetworkConfiguration</a></span>(java.lang.String&nbsp;ssid,
+                                java.lang.String&nbsp;password)</code>
+<div class="block">To generate a configuration for a WPA2 network</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>static <a href="../../../../com/isupatches/wisefy/util/WifiConfigurationUtil.html" title="class in com.isupatches.wisefy.util">WifiConfigurationUtil</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/isupatches/wisefy/util/WifiConfigurationUtil.html#getInstance--">getInstance</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getInstance--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getInstance</h4>
+<pre>public static&nbsp;<a href="../../../../com/isupatches/wisefy/util/WifiConfigurationUtil.html" title="class in com.isupatches.wisefy.util">WifiConfigurationUtil</a>&nbsp;getInstance()</pre>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>instance of WifiConfigurationUtil</dd>
+</dl>
+</li>
+</ul>
+<a name="generateOpenNetworkConfiguration-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>generateOpenNetworkConfiguration</h4>
+<pre>public&nbsp;android.net.wifi.WifiConfiguration&nbsp;generateOpenNetworkConfiguration(java.lang.String&nbsp;ssid)</pre>
+<div class="block">To generate a configuration for an open network</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>ssid</code> - The ssid for the open network's configuration</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>WifiConfiguration - The open network configuration</dd>
+</dl>
+</li>
+</ul>
+<a name="generateWEPNetworkConfiguration-java.lang.String-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>generateWEPNetworkConfiguration</h4>
+<pre>public&nbsp;android.net.wifi.WifiConfiguration&nbsp;generateWEPNetworkConfiguration(java.lang.String&nbsp;ssid,
+                                                                          java.lang.String&nbsp;password)</pre>
+<div class="block">To generate a configuration for a WEP network</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>ssid</code> - The ssid for the WEP network's configuration</dd>
+<dd><code>password</code> - The password for the WEP networks configuration</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>WifiConfiguration - The WEP network configuration</dd>
+</dl>
+</li>
+</ul>
+<a name="generateWPA2NetworkConfiguration-java.lang.String-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>generateWPA2NetworkConfiguration</h4>
+<pre>public&nbsp;android.net.wifi.WifiConfiguration&nbsp;generateWPA2NetworkConfiguration(java.lang.String&nbsp;ssid,
+                                                                           java.lang.String&nbsp;password)</pre>
+<div class="block">To generate a configuration for a WPA2 network</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>ssid</code> - The ssid for the WPA2 network's configuration</dd>
+<dd><code>password</code> - The password for the WPA2 networks configuration</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>WifiConfiguration - The WPA2 network configuration</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../com/isupatches/wisefy/util/SSIDUtil.html" title="class in com.isupatches.wisefy.util"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?com/isupatches/wisefy/util/WifiConfigurationUtil.html" target="_top">Frames</a></li>
+<li><a href="WifiConfigurationUtil.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/com/isupatches/wisefy/util/package-frame.html b/javadoc/com/isupatches/wisefy/util/package-frame.html
index b1e1f0ed..cdcfa40c 100644
--- a/javadoc/com/isupatches/wisefy/util/package-frame.html
+++ b/javadoc/com/isupatches/wisefy/util/package-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Tue Jul 04 09:39:45 CDT 2017 -->
-<title>com.isupatches.wisefy.util (wisefy 1.0.10 API)</title>
-<meta name="date" content="2017-07-04">
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>com.isupatches.wisefy.util (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -15,7 +15,9 @@ <h2 title="Classes">Classes</h2>
 <ul title="Classes">
 <li><a href="LogUtil.html" title="class in com.isupatches.wisefy.util" target="classFrame">LogUtil</a></li>
 <li><a href="ManagerUtil.html" title="class in com.isupatches.wisefy.util" target="classFrame">ManagerUtil</a></li>
+<li><a href="SleepUtil.html" title="class in com.isupatches.wisefy.util" target="classFrame">SleepUtil</a></li>
 <li><a href="SSIDUtil.html" title="class in com.isupatches.wisefy.util" target="classFrame">SSIDUtil</a></li>
+<li><a href="WifiConfigurationUtil.html" title="class in com.isupatches.wisefy.util" target="classFrame">WifiConfigurationUtil</a></li>
 </ul>
 </div>
 </body>
diff --git a/javadoc/com/isupatches/wisefy/util/package-summary.html b/javadoc/com/isupatches/wisefy/util/package-summary.html
index 431a2a31..281f753d 100644
--- a/javadoc/com/isupatches/wisefy/util/package-summary.html
+++ b/javadoc/com/isupatches/wisefy/util/package-summary.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Tue Jul 04 09:39:45 CDT 2017 -->
-<title>com.isupatches.wisefy.util (wisefy 1.0.10 API)</title>
-<meta name="date" content="2017-07-04">
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>com.isupatches.wisefy.util (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="com.isupatches.wisefy.util (wisefy 1.0.10 API)";
+            parent.document.title="com.isupatches.wisefy.util (wisefy 2.0.0-BETA API)";
         }
     }
     catch(err) {
@@ -42,7 +42,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../com/isupatches/wisefy/constants/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../../../../com/isupatches/wisefy/threads/package-summary.html">Prev&nbsp;Package</a></li>
 <li>Next&nbsp;Package</li>
 </ul>
 <ul class="navList">
@@ -89,11 +89,27 @@ <h1 title="Package" class="title">Package&nbsp;com.isupatches.wisefy.util</h1>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a href="../../../../com/isupatches/wisefy/util/ManagerUtil.html" title="class in com.isupatches.wisefy.util">ManagerUtil</a></td>
-<td class="colLast">&nbsp;</td>
+<td class="colLast">
+<div class="block">Manager helper class</div>
+</td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><a href="../../../../com/isupatches/wisefy/util/SleepUtil.html" title="class in com.isupatches.wisefy.util">SleepUtil</a></td>
+<td class="colLast">
+<div class="block">A helper class for shared wait logic</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../com/isupatches/wisefy/util/SSIDUtil.html" title="class in com.isupatches.wisefy.util">SSIDUtil</a></td>
-<td class="colLast">&nbsp;</td>
+<td class="colLast">
+<div class="block">A helper class to manipulate the string value for SSIDs</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../com/isupatches/wisefy/util/WifiConfigurationUtil.html" title="class in com.isupatches.wisefy.util">WifiConfigurationUtil</a></td>
+<td class="colLast">
+<div class="block">A helper class to generate WifiConfigurations</div>
+</td>
 </tr>
 </tbody>
 </table>
@@ -120,7 +136,7 @@ <h1 title="Package" class="title">Package&nbsp;com.isupatches.wisefy.util</h1>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../com/isupatches/wisefy/constants/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../../../../com/isupatches/wisefy/threads/package-summary.html">Prev&nbsp;Package</a></li>
 <li>Next&nbsp;Package</li>
 </ul>
 <ul class="navList">
diff --git a/javadoc/com/isupatches/wisefy/util/package-tree.html b/javadoc/com/isupatches/wisefy/util/package-tree.html
index fdd873b7..6ecf251c 100644
--- a/javadoc/com/isupatches/wisefy/util/package-tree.html
+++ b/javadoc/com/isupatches/wisefy/util/package-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Tue Jul 04 09:39:45 CDT 2017 -->
-<title>com.isupatches.wisefy.util Class Hierarchy (wisefy 1.0.10 API)</title>
-<meta name="date" content="2017-07-04">
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>com.isupatches.wisefy.util Class Hierarchy (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="com.isupatches.wisefy.util Class Hierarchy (wisefy 1.0.10 API)";
+            parent.document.title="com.isupatches.wisefy.util Class Hierarchy (wisefy 2.0.0-BETA API)";
         }
     }
     catch(err) {
@@ -42,7 +42,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../com/isupatches/wisefy/constants/package-tree.html">Prev</a></li>
+<li><a href="../../../../com/isupatches/wisefy/threads/package-tree.html">Prev</a></li>
 <li>Next</li>
 </ul>
 <ul class="navList">
@@ -82,7 +82,9 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
 <li type="circle">com.isupatches.wisefy.util.<a href="../../../../com/isupatches/wisefy/util/LogUtil.html" title="class in com.isupatches.wisefy.util"><span class="typeNameLink">LogUtil</span></a></li>
 <li type="circle">com.isupatches.wisefy.util.<a href="../../../../com/isupatches/wisefy/util/ManagerUtil.html" title="class in com.isupatches.wisefy.util"><span class="typeNameLink">ManagerUtil</span></a></li>
+<li type="circle">com.isupatches.wisefy.util.<a href="../../../../com/isupatches/wisefy/util/SleepUtil.html" title="class in com.isupatches.wisefy.util"><span class="typeNameLink">SleepUtil</span></a></li>
 <li type="circle">com.isupatches.wisefy.util.<a href="../../../../com/isupatches/wisefy/util/SSIDUtil.html" title="class in com.isupatches.wisefy.util"><span class="typeNameLink">SSIDUtil</span></a></li>
+<li type="circle">com.isupatches.wisefy.util.<a href="../../../../com/isupatches/wisefy/util/WifiConfigurationUtil.html" title="class in com.isupatches.wisefy.util"><span class="typeNameLink">WifiConfigurationUtil</span></a></li>
 </ul>
 </li>
 </ul>
@@ -107,7 +109,7 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../com/isupatches/wisefy/constants/package-tree.html">Prev</a></li>
+<li><a href="../../../../com/isupatches/wisefy/threads/package-tree.html">Prev</a></li>
 <li>Next</li>
 </ul>
 <ul class="navList">
diff --git a/javadoc/constant-values.html b/javadoc/constant-values.html
index e4c034da..612e31ff 100644
--- a/javadoc/constant-values.html
+++ b/javadoc/constant-values.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Tue Jul 04 09:39:45 CDT 2017 -->
-<title>Constant Field Values (wisefy 1.0.10 API)</title>
-<meta name="date" content="2017-07-04">
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>Constant Field Values (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Constant Field Values (wisefy 1.0.10 API)";
+            parent.document.title="Constant Field Values (wisefy 2.0.0-BETA API)";
         }
     }
     catch(err) {
@@ -145,6 +145,20 @@ <h2 title="com.isupatches">com.isupatches.*</h2>
 <td><code><a href="com/isupatches/wisefy/constants/Capabilities.html#WEP">WEP</a></code></td>
 <td class="colLast"><code>"WEP"</code></td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="com.isupatches.wisefy.constants.Capabilities.WPA">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;java.lang.String</code></td>
+<td><code><a href="com/isupatches/wisefy/constants/Capabilities.html#WPA">WPA</a></code></td>
+<td class="colLast"><code>"WPA"</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="com.isupatches.wisefy.constants.Capabilities.WPA2">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;java.lang.String</code></td>
+<td><code><a href="com/isupatches/wisefy/constants/Capabilities.html#WPA2">WPA2</a></code></td>
+<td class="colLast"><code>"WPA2"</code></td>
+</tr>
 </tbody>
 </table>
 </li>
@@ -184,18 +198,25 @@ <h2 title="com.isupatches">com.isupatches.*</h2>
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><a name="com.isupatches.wisefy.constants.WiseFyCodes.FAILURE">
+<td class="colFirst"><a name="com.isupatches.wisefy.constants.WiseFyCodes.MISSING_PARAMETER">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="com/isupatches/wisefy/constants/WiseFyCodes.html#FAILURE">FAILURE</a></code></td>
+<td><code><a href="com/isupatches/wisefy/constants/WiseFyCodes.html#MISSING_PARAMETER">MISSING_PARAMETER</a></code></td>
 <td class="colLast"><code>-1000</code></td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a name="com.isupatches.wisefy.constants.WiseFyCodes.MISSING_PREREQUISITE">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="com/isupatches/wisefy/constants/WiseFyCodes.html#MISSING_PREREQUISITE">MISSING_PREREQUISITE</a></code></td>
+<td class="colLast"><code>-1001</code></td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a name="com.isupatches.wisefy.constants.WiseFyCodes.NETWORK_ALREADY_CONFIGURED">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code><a href="com/isupatches/wisefy/constants/WiseFyCodes.html#NETWORK_ALREADY_CONFIGURED">NETWORK_ALREADY_CONFIGURED</a></code></td>
-<td class="colLast"><code>-1001</code></td>
+<td class="colLast"><code>-1002</code></td>
 </tr>
 </tbody>
 </table>
diff --git a/javadoc/deprecated-list.html b/javadoc/deprecated-list.html
index 3e2604b0..e0c203b0 100644
--- a/javadoc/deprecated-list.html
+++ b/javadoc/deprecated-list.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Tue Jul 04 09:39:45 CDT 2017 -->
-<title>Deprecated List (wisefy 1.0.10 API)</title>
-<meta name="date" content="2017-07-04">
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>Deprecated List (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Deprecated List (wisefy 1.0.10 API)";
+            parent.document.title="Deprecated List (wisefy 2.0.0-BETA API)";
         }
     }
     catch(err) {
diff --git a/javadoc/help-doc.html b/javadoc/help-doc.html
index 2d9fe050..f08c0b7a 100644
--- a/javadoc/help-doc.html
+++ b/javadoc/help-doc.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Tue Jul 04 09:39:45 CDT 2017 -->
-<title>API Help (wisefy 1.0.10 API)</title>
-<meta name="date" content="2017-07-04">
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>API Help (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="API Help (wisefy 1.0.10 API)";
+            parent.document.title="API Help (wisefy 2.0.0-BETA API)";
         }
     }
     catch(err) {
diff --git a/javadoc/index-all.html b/javadoc/index-all.html
index d0f89600..e3918089 100644
--- a/javadoc/index-all.html
+++ b/javadoc/index-all.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Tue Jul 04 09:39:45 CDT 2017 -->
-<title>Index (wisefy 1.0.10 API)</title>
-<meta name="date" content="2017-07-04">
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>Index (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Index (wisefy 1.0.10 API)";
+            parent.document.title="Index (wisefy 2.0.0-BETA API)";
         }
     }
     catch(err) {
@@ -68,22 +68,62 @@
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
-<div class="contentContainer"><a href="#I:A">A</a>&nbsp;<a href="#I:C">C</a>&nbsp;<a href="#I:D">D</a>&nbsp;<a href="#I:E">E</a>&nbsp;<a href="#I:F">F</a>&nbsp;<a href="#I:G">G</a>&nbsp;<a href="#I:I">I</a>&nbsp;<a href="#I:L">L</a>&nbsp;<a href="#I:M">M</a>&nbsp;<a href="#I:N">N</a>&nbsp;<a href="#I:P">P</a>&nbsp;<a href="#I:R">R</a>&nbsp;<a href="#I:S">S</a>&nbsp;<a href="#I:W">W</a>&nbsp;<a name="I:A">
+<div class="contentContainer"><a href="#I:A">A</a>&nbsp;<a href="#I:B">B</a>&nbsp;<a href="#I:C">C</a>&nbsp;<a href="#I:D">D</a>&nbsp;<a href="#I:E">E</a>&nbsp;<a href="#I:F">F</a>&nbsp;<a href="#I:G">G</a>&nbsp;<a href="#I:I">I</a>&nbsp;<a href="#I:L">L</a>&nbsp;<a href="#I:M">M</a>&nbsp;<a href="#I:N">N</a>&nbsp;<a href="#I:O">O</a>&nbsp;<a href="#I:P">P</a>&nbsp;<a href="#I:Q">Q</a>&nbsp;<a href="#I:R">R</a>&nbsp;<a href="#I:S">S</a>&nbsp;<a href="#I:T">T</a>&nbsp;<a href="#I:W">W</a>&nbsp;<a name="I:A">
 <!--   -->
 </a>
 <h2 class="title">A</h2>
 <dl>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/SearchForAccessPointCallbacks.html#accessPointFound-android.net.wifi.ScanResult-">accessPointFound(ScanResult)</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/SearchForAccessPointCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">SearchForAccessPointCallbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/SearchForAccessPointCallbacks.html#accessPointNotFound--">accessPointNotFound()</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/SearchForAccessPointCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">SearchForAccessPointCallbacks</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#addOpenNetwork-java.lang.String-">addOpenNetwork(String)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
 <dd>
-<div class="block">To add an open network to the user's configured network list</div>
+<div class="block">To add an open network to the user's configured network list (synchronously)</div>
+</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#addOpenNetwork-java.lang.String-com.isupatches.wisefy.callbacks.AddOpenNetworkCallbacks-">addOpenNetwork(String, AddOpenNetworkCallbacks)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
+<dd>
+<div class="block">To add an open network to the user's configured network list (asynchronously)</div>
 </dd>
+<dt><a href="com/isupatches/wisefy/callbacks/AddOpenNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">AddOpenNetworkCallbacks</span></a> - Interface in <a href="com/isupatches/wisefy/callbacks/package-summary.html">com.isupatches.wisefy.callbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/AddOpenNetworkCallbacks.html#addOpenNetworkWiseFyFailure-java.lang.Integer-">addOpenNetworkWiseFyFailure(Integer)</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/AddOpenNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">AddOpenNetworkCallbacks</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#addWEPNetwork-java.lang.String-java.lang.String-">addWEPNetwork(String, String)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
 <dd>
-<div class="block">To add a WEP network to the user's configured network list</div>
+<div class="block">To add a WEP network to the user's configured network list (synchronously)</div>
 </dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#addWEPNetwork-java.lang.String-java.lang.String-com.isupatches.wisefy.callbacks.AddWEPNetworkCallbacks-">addWEPNetwork(String, String, AddWEPNetworkCallbacks)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
+<dd>
+<div class="block">To add a WEP network to the user's configured network list (asynchronously)</div>
+</dd>
+<dt><a href="com/isupatches/wisefy/callbacks/AddWEPNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">AddWEPNetworkCallbacks</span></a> - Interface in <a href="com/isupatches/wisefy/callbacks/package-summary.html">com.isupatches.wisefy.callbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/AddWEPNetworkCallbacks.html#addWEPNetworkWiseFyFailure-java.lang.Integer-">addWEPNetworkWiseFyFailure(Integer)</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/AddWEPNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">AddWEPNetworkCallbacks</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#addWPA2Network-java.lang.String-java.lang.String-">addWPA2Network(String, String)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
 <dd>
-<div class="block">To add a WPA2 network to the user's configured network list</div>
+<div class="block">To add a WPA2 network to the user's configured network list (synchronously)</div>
+</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#addWPA2Network-java.lang.String-java.lang.String-com.isupatches.wisefy.callbacks.AddWPA2NetworkCallbacks-">addWPA2Network(String, String, AddWPA2NetworkCallbacks)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
+<dd>
+<div class="block">To add a WPA2 network to the user's configured network list (asynchronously)</div>
+</dd>
+<dt><a href="com/isupatches/wisefy/callbacks/AddWPA2NetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">AddWPA2NetworkCallbacks</span></a> - Interface in <a href="com/isupatches/wisefy/callbacks/package-summary.html">com.isupatches.wisefy.callbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/AddWPA2NetworkCallbacks.html#addWPA2NetworkWiseFyFailure-java.lang.Integer-">addWPA2NetworkWiseFyFailure(Integer)</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/AddWPA2NetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">AddWPA2NetworkCallbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="com/isupatches/wisefy/annotations/Async.html" title="annotation in com.isupatches.wisefy.annotations"><span class="typeNameLink">Async</span></a> - Annotation Type in <a href="com/isupatches/wisefy/annotations/package-summary.html">com.isupatches.wisefy.annotations</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:B">
+<!--   -->
+</a>
+<h2 class="title">B</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.brains.html#brains-android.content.Context-">brains(Context)</a></span> - Constructor for class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.brains.html" title="class in com.isupatches.wisefy">WiseFy.brains</a></dt>
+<dd>
+<div class="block">Mandatory - The public constructor for the builder that requires a context</div>
 </dd>
 </dl>
 <a name="I:C">
@@ -95,27 +135,45 @@ <h2 class="title">C</h2>
 <dd>
 <div class="block">To convert an RSSI level for a network to a number of bars</div>
 </dd>
+<dt><a href="com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations"><span class="typeNameLink">CallingThread</span></a> - Annotation Type in <a href="com/isupatches/wisefy/annotations/package-summary.html">com.isupatches.wisefy.annotations</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="com/isupatches/wisefy/constants/Capabilities.html" title="class in com.isupatches.wisefy.constants"><span class="typeNameLink">Capabilities</span></a> - Class in <a href="com/isupatches/wisefy/constants/package-summary.html">com.isupatches.wisefy.constants</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/isupatches/wisefy/constants/Capabilities.html#Capabilities--">Capabilities()</a></span> - Constructor for class com.isupatches.wisefy.constants.<a href="com/isupatches/wisefy/constants/Capabilities.html" title="class in com.isupatches.wisefy.constants">Capabilities</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="com/isupatches/wisefy/package-summary.html">com.isupatches.wisefy</a> - package com.isupatches.wisefy</dt>
 <dd>&nbsp;</dd>
+<dt><a href="com/isupatches/wisefy/annotations/package-summary.html">com.isupatches.wisefy.annotations</a> - package com.isupatches.wisefy.annotations</dt>
+<dd>&nbsp;</dd>
+<dt><a href="com/isupatches/wisefy/callbacks/package-summary.html">com.isupatches.wisefy.callbacks</a> - package com.isupatches.wisefy.callbacks</dt>
+<dd>&nbsp;</dd>
 <dt><a href="com/isupatches/wisefy/constants/package-summary.html">com.isupatches.wisefy.constants</a> - package com.isupatches.wisefy.constants</dt>
 <dd>&nbsp;</dd>
+<dt><a href="com/isupatches/wisefy/threads/package-summary.html">com.isupatches.wisefy.threads</a> - package com.isupatches.wisefy.threads</dt>
+<dd>&nbsp;</dd>
 <dt><a href="com/isupatches/wisefy/util/package-summary.html">com.isupatches.wisefy.util</a> - package com.isupatches.wisefy.util</dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#compareSignalLevel-int-int-">compareSignalLevel(int, int)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
 <dd>
 <div class="block">To compare the signal strength of two networks</div>
 </dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/ConnectToNetworkCallbacks.html#connectedToNetwork--">connectedToNetwork()</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/ConnectToNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">ConnectToNetworkCallbacks</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#connectToNetwork-java.lang.String-int-">connectToNetwork(String, int)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
 <dd>
-<div class="block">Used to connect to a network
+<div class="block">Used to connect to a network (synchronously)
+
+ Gets a list of saved networks, connects to the given ssid if found, and verifies connectivity</div>
+</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#connectToNetwork-java.lang.String-int-com.isupatches.wisefy.callbacks.ConnectToNetworkCallbacks-">connectToNetwork(String, int, ConnectToNetworkCallbacks)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
+<dd>
+<div class="block">Used to connect to a network (asynchronously)
 
- Gets a list of saved networks, connects/reconnects to the given ssid, and then calls waitToConnectToSSID to verify connectivity</div>
+ Gets a list of saved networks, connects to the given ssid if found, and verifies connectivity</div>
 </dd>
-<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/util/SSIDUtil.html#convertSSIDForConfig-java.lang.String-">convertSSIDForConfig(String)</a></span> - Method in class com.isupatches.wisefy.util.<a href="com/isupatches/wisefy/util/SSIDUtil.html" title="class in com.isupatches.wisefy.util">SSIDUtil</a></dt>
+<dt><a href="com/isupatches/wisefy/callbacks/ConnectToNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">ConnectToNetworkCallbacks</span></a> - Interface in <a href="com/isupatches/wisefy/callbacks/package-summary.html">com.isupatches.wisefy.callbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/ConnectToNetworkCallbacks.html#connectToNetworkWiseFyFailure-java.lang.Integer-">connectToNetworkWiseFyFailure(Integer)</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/ConnectToNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">ConnectToNetworkCallbacks</a></dt>
 <dd>&nbsp;</dd>
 </dl>
 <a name="I:D">
@@ -125,11 +183,33 @@ <h2 class="title">D</h2>
 <dl>
 <dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#disableWifi--">disableWifi()</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
 <dd>
-<div class="block">To disable Wifi on a user's device</div>
+<div class="block">To disable Wifi on a user's device (synchronously)</div>
 </dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#disableWifi-com.isupatches.wisefy.callbacks.DisableWifiCallbacks-">disableWifi(DisableWifiCallbacks)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
+<dd>
+<div class="block">To disable Wifi on a user's device (asynchronously)</div>
+</dd>
+<dt><a href="com/isupatches/wisefy/callbacks/DisableWifiCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">DisableWifiCallbacks</span></a> - Interface in <a href="com/isupatches/wisefy/callbacks/package-summary.html">com.isupatches.wisefy.callbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/DisableWifiCallbacks.html#disableWifiWiseFyFailure-java.lang.Integer-">disableWifiWiseFyFailure(Integer)</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/DisableWifiCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">DisableWifiCallbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/DisconnectFromCurrentNetworkCallbacks.html#disconnectedFromCurrentNetwork--">disconnectedFromCurrentNetwork()</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/DisconnectFromCurrentNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">DisconnectFromCurrentNetworkCallbacks</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#disconnectFromCurrentNetwork--">disconnectFromCurrentNetwork()</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
 <dd>
-<div class="block">To disconnect the user from their current network</div>
+<div class="block">To disconnect the user from their current network (synchronously)</div>
+</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#disconnectFromCurrentNetwork-com.isupatches.wisefy.callbacks.DisconnectFromCurrentNetworkCallbacks-">disconnectFromCurrentNetwork(DisconnectFromCurrentNetworkCallbacks)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
+<dd>
+<div class="block">To disconnect the user from their current network (asynchronously)</div>
+</dd>
+<dt><a href="com/isupatches/wisefy/callbacks/DisconnectFromCurrentNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">DisconnectFromCurrentNetworkCallbacks</span></a> - Interface in <a href="com/isupatches/wisefy/callbacks/package-summary.html">com.isupatches.wisefy.callbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/DisconnectFromCurrentNetworkCallbacks.html#disconnectFromCurrentNetworkWiseFyFailure-java.lang.Integer-">disconnectFromCurrentNetworkWiseFyFailure(Integer)</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/DisconnectFromCurrentNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">DisconnectFromCurrentNetworkCallbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#dump--">dump()</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
+<dd>
+<div class="block">Used to cleanup the thread started by WiseFy</div>
 </dd>
 </dl>
 <a name="I:E">
@@ -143,13 +223,39 @@ <h2 class="title">E</h2>
 <dd>
 <div class="block">To enable Wifi on a user's device</div>
 </dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#enableWifi-com.isupatches.wisefy.callbacks.EnableWifiCallbacks-">enableWifi(EnableWifiCallbacks)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
+<dd>
+<div class="block">To enable Wifi on a user's device</div>
+</dd>
+<dt><a href="com/isupatches/wisefy/callbacks/EnableWifiCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">EnableWifiCallbacks</span></a> - Interface in <a href="com/isupatches/wisefy/callbacks/package-summary.html">com.isupatches.wisefy.callbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/EnableWifiCallbacks.html#enableWifiWiseFyFailure-java.lang.Integer-">enableWifiWiseFyFailure(Integer)</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/EnableWifiCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">EnableWifiCallbacks</a></dt>
+<dd>&nbsp;</dd>
 </dl>
 <a name="I:F">
 <!--   -->
 </a>
 <h2 class="title">F</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/constants/WiseFyCodes.html#FAILURE">FAILURE</a></span> - Static variable in class com.isupatches.wisefy.constants.<a href="com/isupatches/wisefy/constants/WiseFyCodes.html" title="class in com.isupatches.wisefy.constants">WiseFyCodes</a></dt>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/AddOpenNetworkCallbacks.html#failureAddingOpenNetwork-java.lang.Integer-">failureAddingOpenNetwork(Integer)</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/AddOpenNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">AddOpenNetworkCallbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/AddWEPNetworkCallbacks.html#failureAddingWEPNetwork-java.lang.Integer-">failureAddingWEPNetwork(Integer)</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/AddWEPNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">AddWEPNetworkCallbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/AddWPA2NetworkCallbacks.html#failureAddingWPA2Network-java.lang.Integer-">failureAddingWPA2Network(Integer)</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/AddWPA2NetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">AddWPA2NetworkCallbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/ConnectToNetworkCallbacks.html#failureConnectingToNetwork--">failureConnectingToNetwork()</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/ConnectToNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">ConnectToNetworkCallbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/DisableWifiCallbacks.html#failureDisablingWifi--">failureDisablingWifi()</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/DisableWifiCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">DisableWifiCallbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/DisconnectFromCurrentNetworkCallbacks.html#failureDisconnectingFromCurrentNetwork--">failureDisconnectingFromCurrentNetwork()</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/DisconnectFromCurrentNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">DisconnectFromCurrentNetworkCallbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/EnableWifiCallbacks.html#failureEnablingWifi--">failureEnablingWifi()</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/EnableWifiCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">EnableWifiCallbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/GetFrequencyCallbacks.html#failureGettingFrequency--">failureGettingFrequency()</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/GetFrequencyCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">GetFrequencyCallbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/RemoveNetworkCallbacks.html#failureRemovingNetwork--">failureRemovingNetwork()</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/RemoveNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">RemoveNetworkCallbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/SearchForAccessPointsCallbacks.html#foundNetworks-java.util.List-">foundNetworks(List&lt;ScanResult&gt;)</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/SearchForAccessPointsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">SearchForAccessPointsCallbacks</a></dt>
 <dd>&nbsp;</dd>
 </dl>
 <a name="I:G">
@@ -157,6 +263,18 @@ <h2 class="title">F</h2>
 </a>
 <h2 class="title">G</h2>
 <dl>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/util/WifiConfigurationUtil.html#generateOpenNetworkConfiguration-java.lang.String-">generateOpenNetworkConfiguration(String)</a></span> - Method in class com.isupatches.wisefy.util.<a href="com/isupatches/wisefy/util/WifiConfigurationUtil.html" title="class in com.isupatches.wisefy.util">WifiConfigurationUtil</a></dt>
+<dd>
+<div class="block">To generate a configuration for an open network</div>
+</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/util/WifiConfigurationUtil.html#generateWEPNetworkConfiguration-java.lang.String-java.lang.String-">generateWEPNetworkConfiguration(String, String)</a></span> - Method in class com.isupatches.wisefy.util.<a href="com/isupatches/wisefy/util/WifiConfigurationUtil.html" title="class in com.isupatches.wisefy.util">WifiConfigurationUtil</a></dt>
+<dd>
+<div class="block">To generate a configuration for a WEP network</div>
+</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/util/WifiConfigurationUtil.html#generateWPA2NetworkConfiguration-java.lang.String-java.lang.String-">generateWPA2NetworkConfiguration(String, String)</a></span> - Method in class com.isupatches.wisefy.util.<a href="com/isupatches/wisefy/util/WifiConfigurationUtil.html" title="class in com.isupatches.wisefy.util">WifiConfigurationUtil</a></dt>
+<dd>
+<div class="block">To generate a configuration for a WPA2 network</div>
+</dd>
 <dt><span class="memberNameLink"><a href="com/isupatches/wisefy/util/ManagerUtil.html#getConnectivityManager-android.content.Context-">getConnectivityManager(Context)</a></span> - Method in class com.isupatches.wisefy.util.<a href="com/isupatches/wisefy/util/ManagerUtil.html" title="class in com.isupatches.wisefy.util">ManagerUtil</a></dt>
 <dd>
 <div class="block">To get a Connectivity manger instance from an activity's context.</div>
@@ -165,20 +283,37 @@ <h2 class="title">G</h2>
 <dd>
 <div class="block">To retrieve the user's current network</div>
 </dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#getCurrentNetwork-com.isupatches.wisefy.callbacks.GetCurrentNetworkCallbacks-">getCurrentNetwork(GetCurrentNetworkCallbacks)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
+<dd>
+<div class="block">To retrieve the user's current network</div>
+</dd>
+<dt><a href="com/isupatches/wisefy/callbacks/GetCurrentNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">GetCurrentNetworkCallbacks</span></a> - Interface in <a href="com/isupatches/wisefy/callbacks/package-summary.html">com.isupatches.wisefy.callbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/GetCurrentNetworkCallbacks.html#getCurrentNetworkWiseFyFailure-java.lang.Integer-">getCurrentNetworkWiseFyFailure(Integer)</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/GetCurrentNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">GetCurrentNetworkCallbacks</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#getFrequency--">getFrequency()</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
 <dd>
-<div class="block">To retrieve the frequency of the device's current network
-
- Used by isNetwork5gHz
- <a href="com/isupatches/wisefy/WiseFy.html#isNetwork5gHz--"><code>WiseFy.isNetwork5gHz()</code></a></div>
+<div class="block">To retrieve the frequency of the device's current network</div>
+</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#getFrequency-com.isupatches.wisefy.callbacks.GetFrequencyCallbacks-">getFrequency(GetFrequencyCallbacks)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
+<dd>
+<div class="block">To retrieve the frequency of the device's current network</div>
 </dd>
 <dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#getFrequency-android.net.wifi.WifiInfo-">getFrequency(WifiInfo)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
 <dd>
 <div class="block">To retrieve the frequency of a network</div>
 </dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#getFrequency-android.net.wifi.WifiInfo-com.isupatches.wisefy.callbacks.GetFrequencyCallbacks-">getFrequency(WifiInfo, GetFrequencyCallbacks)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
+<dd>
+<div class="block">To retrieve the frequency of a network</div>
+</dd>
+<dt><a href="com/isupatches/wisefy/callbacks/GetFrequencyCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">GetFrequencyCallbacks</span></a> - Interface in <a href="com/isupatches/wisefy/callbacks/package-summary.html">com.isupatches.wisefy.callbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/GetFrequencyCallbacks.html#getFrequencyWiseFyFailure-java.lang.Integer-">getFrequencyWiseFyFailure(Integer)</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/GetFrequencyCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">GetFrequencyCallbacks</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/isupatches/wisefy/util/ManagerUtil.html#getInstance--">getInstance()</a></span> - Static method in class com.isupatches.wisefy.util.<a href="com/isupatches/wisefy/util/ManagerUtil.html" title="class in com.isupatches.wisefy.util">ManagerUtil</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/util/SSIDUtil.html#getInstance--">getInstance()</a></span> - Static method in class com.isupatches.wisefy.util.<a href="com/isupatches/wisefy/util/SSIDUtil.html" title="class in com.isupatches.wisefy.util">SSIDUtil</a></dt>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/util/WifiConfigurationUtil.html#getInstance--">getInstance()</a></span> - Static method in class com.isupatches.wisefy.util.<a href="com/isupatches/wisefy/util/WifiConfigurationUtil.html" title="class in com.isupatches.wisefy.util">WifiConfigurationUtil</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#getNearbyAccessPoints-boolean-">getNearbyAccessPoints(boolean)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
 <dd>
@@ -186,16 +321,58 @@ <h2 class="title">G</h2>
 
  *NOTE* Setting filterDuplicates to true will not return SSIDs with a weaker signal strength (will always take the highest)</div>
 </dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#getNearbyAccessPoints-boolean-com.isupatches.wisefy.callbacks.GetNearbyAccessPointsCallbacks-">getNearbyAccessPoints(boolean, GetNearbyAccessPointsCallbacks)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
+<dd>
+<div class="block">To retrieve a list of nearby access points
+
+ *NOTE* Setting filterDuplicates to true will not return SSIDs with a weaker signal strength (will always take the highest)</div>
+</dd>
+<dt><a href="com/isupatches/wisefy/callbacks/GetNearbyAccessPointsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">GetNearbyAccessPointsCallbacks</span></a> - Interface in <a href="com/isupatches/wisefy/callbacks/package-summary.html">com.isupatches.wisefy.callbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/GetNearbyAccessPointsCallbacks.html#getNearbyAccessPointsWiseFyFailure-java.lang.Integer-">getNearbyAccessPointsWiseFyFailure(Integer)</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/GetNearbyAccessPointsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">GetNearbyAccessPointsCallbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#getRSSI-java.lang.String-boolean-int-">getRSSI(String, boolean, int)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#getRSSI-java.lang.String-boolean-int-com.isupatches.wisefy.callbacks.GetRSSICallbacks-">getRSSI(String, boolean, int, GetRSSICallbacks)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="com/isupatches/wisefy/callbacks/GetRSSICallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">GetRSSICallbacks</span></a> - Interface in <a href="com/isupatches/wisefy/callbacks/package-summary.html">com.isupatches.wisefy.callbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/GetRSSICallbacks.html#getRSSIWiseFyFailure-java.lang.Integer-">getRSSIWiseFyFailure(Integer)</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/GetRSSICallbacks.html" title="interface in com.isupatches.wisefy.callbacks">GetRSSICallbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#getSavedNetwork-java.lang.String-">getSavedNetwork(String)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
+<dd>
+<div class="block">To search for and return a saved WiFiConfiguration given an SSID</div>
+</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#getSavedNetwork-java.lang.String-com.isupatches.wisefy.callbacks.GetSavedNetworkCallbacks-">getSavedNetwork(String, GetSavedNetworkCallbacks)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
+<dd>
+<div class="block">To search for and return a saved WiFiConfiguration given an SSID</div>
+</dd>
+<dt><a href="com/isupatches/wisefy/callbacks/GetSavedNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">GetSavedNetworkCallbacks</span></a> - Interface in <a href="com/isupatches/wisefy/callbacks/package-summary.html">com.isupatches.wisefy.callbacks</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#getSavedNetworks--">getSavedNetworks()</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
 <dd>
 <div class="block">To retrieve a list of saved networks on a user's device</div>
 </dd>
-<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.withContext.html#getSmarts--">getSmarts()</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.withContext.html" title="class in com.isupatches.wisefy">WiseFy.withContext</a></dt>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#getSavedNetworks-com.isupatches.wisefy.callbacks.GetSavedNetworksCallbacks-">getSavedNetworks(GetSavedNetworksCallbacks)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
+<dd>
+<div class="block">To retrieve a list of saved networks on a user's device</div>
+</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#getSavedNetworks-java.lang.String-">getSavedNetworks(String)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#getSavedNetworks-java.lang.String-com.isupatches.wisefy.callbacks.GetSavedNetworksCallbacks-">getSavedNetworks(String, GetSavedNetworksCallbacks)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="com/isupatches/wisefy/callbacks/GetSavedNetworksCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">GetSavedNetworksCallbacks</span></a> - Interface in <a href="com/isupatches/wisefy/callbacks/package-summary.html">com.isupatches.wisefy.callbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/GetSavedNetworksCallbacks.html#getSavedNetworksWiseFyFailure-java.lang.Integer-">getSavedNetworksWiseFyFailure(Integer)</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/GetSavedNetworksCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">GetSavedNetworksCallbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/GetSavedNetworkCallbacks.html#getSavedNetworkWiseFyFailure-java.lang.Integer-">getSavedNetworkWiseFyFailure(Integer)</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/GetSavedNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">GetSavedNetworkCallbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.brains.html#getSmarts--">getSmarts()</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.brains.html" title="class in com.isupatches.wisefy">WiseFy.brains</a></dt>
 <dd>
 <div class="block">Mandatory - To build and return a WiseFy instance
 
- Must be called after withContext
- <a href="com/isupatches/wisefy/WiseFy.withContext.html" title="class in com.isupatches.wisefy"><code>WiseFy.withContext</code></a></div>
+ Must be called after brains
+ <a href="com/isupatches/wisefy/WiseFy.brains.html" title="class in com.isupatches.wisefy"><code>WiseFy.brains</code></a></div>
 </dd>
 <dt><span class="memberNameLink"><a href="com/isupatches/wisefy/util/ManagerUtil.html#getWiFiManager-android.content.Context-">getWiFiManager(Context)</a></span> - Method in class com.isupatches.wisefy.util.<a href="com/isupatches/wisefy/util/ManagerUtil.html" title="class in com.isupatches.wisefy.util">ManagerUtil</a></dt>
 <dd>
@@ -235,21 +412,39 @@ <h2 class="title">I</h2>
 </dd>
 <dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#isNetwork5gHz--">isNetwork5gHz()</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
 <dd>
-<div class="block">To check if the device's current network is 5gHz
-
- <a href="com/isupatches/wisefy/WiseFy.html#getFrequency--"><code>WiseFy.getFrequency()</code></a></div>
+<div class="block">To check if the device's current network is 5gHz</div>
 </dd>
 <dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#isNetwork5gHz-android.net.wifi.WifiInfo-">isNetwork5gHz(WifiInfo)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
 <dd>
 <div class="block">To check if a given network is 5gHz</div>
 </dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#isNetworkEAP-android.net.wifi.ScanResult-">isNetworkEAP(ScanResult)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
+<dd>
+<div class="block">To check and return if a network is a EAP network</div>
+</dd>
 <dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#isNetworkInConfigurationList-java.lang.String-">isNetworkInConfigurationList(String)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
 <dd>
 <div class="block">To check if an SSID is in the list of configured networks</div>
 </dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#isNetworkPSK-android.net.wifi.ScanResult-">isNetworkPSK(ScanResult)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
+<dd>
+<div class="block">To check and return if a network is a PSK network</div>
+</dd>
 <dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#isNetworkSecure-android.net.wifi.ScanResult-">isNetworkSecure(ScanResult)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
 <dd>
-<div class="block">To check and return if a network is secure (WEP/PSK/EAP capabilities)</div>
+<div class="block">To check and return if a network is secure (WEP/WPA/WPA2 capabilities)</div>
+</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#isNetworkWEP-android.net.wifi.ScanResult-">isNetworkWEP(ScanResult)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
+<dd>
+<div class="block">To check and return if a network is a WEP network</div>
+</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#isNetworkWPA-android.net.wifi.ScanResult-">isNetworkWPA(ScanResult)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
+<dd>
+<div class="block">To check and return if a network is a WPA network</div>
+</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#isNetworkWPA2-android.net.wifi.ScanResult-">isNetworkWPA2(ScanResult)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
+<dd>
+<div class="block">To check and return if a network is a WPA2 network</div>
 </dd>
 <dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#isWifiEnabled--">isWifiEnabled()</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
 <dd>
@@ -261,7 +456,7 @@ <h2 class="title">I</h2>
 </a>
 <h2 class="title">L</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.withContext.html#logging-boolean-">logging(boolean)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.withContext.html" title="class in com.isupatches.wisefy">WiseFy.withContext</a></dt>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.brains.html#logging-boolean-">logging(boolean)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.brains.html" title="class in com.isupatches.wisefy">WiseFy.brains</a></dt>
 <dd>
 <div class="block">Optional - Builder method that enables/disables logging for a WiseWy instance</div>
 </dd>
@@ -278,16 +473,18 @@ <h2 class="title">L</h2>
 <h2 class="title">M</h2>
 <dl>
 <dt><a href="com/isupatches/wisefy/util/ManagerUtil.html" title="class in com.isupatches.wisefy.util"><span class="typeNameLink">ManagerUtil</span></a> - Class in <a href="com/isupatches/wisefy/util/package-summary.html">com.isupatches.wisefy.util</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Manager helper class</div>
+</dd>
 <dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#MAX_FREQUENCY_5GHZ">MAX_FREQUENCY_5GHZ</a></span> - Static variable in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#mConnectivityManager">mConnectivityManager</a></span> - Variable in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#MIN_FREQUENCY_5GHZ">MIN_FREQUENCY_5GHZ</a></span> - Static variable in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/constants/NetworkTypes.html#MOBILE">MOBILE</a></span> - Static variable in class com.isupatches.wisefy.constants.<a href="com/isupatches/wisefy/constants/NetworkTypes.html" title="class in com.isupatches.wisefy.constants">NetworkTypes</a></dt>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/constants/WiseFyCodes.html#MISSING_PARAMETER">MISSING_PARAMETER</a></span> - Static variable in class com.isupatches.wisefy.constants.<a href="com/isupatches/wisefy/constants/WiseFyCodes.html" title="class in com.isupatches.wisefy.constants">WiseFyCodes</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#mWifiManager">mWifiManager</a></span> - Variable in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/constants/WiseFyCodes.html#MISSING_PREREQUISITE">MISSING_PREREQUISITE</a></span> - Static variable in class com.isupatches.wisefy.constants.<a href="com/isupatches/wisefy/constants/WiseFyCodes.html" title="class in com.isupatches.wisefy.constants">WiseFyCodes</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/constants/NetworkTypes.html#MOBILE">MOBILE</a></span> - Static variable in class com.isupatches.wisefy.constants.<a href="com/isupatches/wisefy/constants/NetworkTypes.html" title="class in com.isupatches.wisefy.constants">NetworkTypes</a></dt>
 <dd>&nbsp;</dd>
 </dl>
 <a name="I:N">
@@ -297,10 +494,30 @@ <h2 class="title">N</h2>
 <dl>
 <dt><span class="memberNameLink"><a href="com/isupatches/wisefy/constants/WiseFyCodes.html#NETWORK_ALREADY_CONFIGURED">NETWORK_ALREADY_CONFIGURED</a></span> - Static variable in class com.isupatches.wisefy.constants.<a href="com/isupatches/wisefy/constants/WiseFyCodes.html" title="class in com.isupatches.wisefy.constants">WiseFyCodes</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/ConnectToNetworkCallbacks.html#networkNotFoundToConnectTo--">networkNotFoundToConnectTo()</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/ConnectToNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">ConnectToNetworkCallbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/RemoveNetworkCallbacks.html#networkNotFoundToRemove--">networkNotFoundToRemove()</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/RemoveNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">RemoveNetworkCallbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/GetRSSICallbacks.html#networkNotFoundToRetrieveRSSI--">networkNotFoundToRetrieveRSSI()</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/GetRSSICallbacks.html" title="interface in com.isupatches.wisefy.callbacks">GetRSSICallbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/RemoveNetworkCallbacks.html#networkRemoved--">networkRemoved()</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/RemoveNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">RemoveNetworkCallbacks</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="com/isupatches/wisefy/constants/NetworkTypes.html" title="class in com.isupatches.wisefy.constants"><span class="typeNameLink">NetworkTypes</span></a> - Class in <a href="com/isupatches/wisefy/constants/package-summary.html">com.isupatches.wisefy.constants</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/isupatches/wisefy/constants/NetworkTypes.html#NetworkTypes--">NetworkTypes()</a></span> - Constructor for class com.isupatches.wisefy.constants.<a href="com/isupatches/wisefy/constants/NetworkTypes.html" title="class in com.isupatches.wisefy.constants">NetworkTypes</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/SearchForAccessPointsCallbacks.html#noNetworksFound--">noNetworksFound()</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/SearchForAccessPointsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">SearchForAccessPointsCallbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/SearchForSSIDsCallbacks.html#noSSIDsFound--">noSSIDsFound()</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/SearchForSSIDsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">SearchForSSIDsCallbacks</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:O">
+<!--   -->
+</a>
+<h2 class="title">O</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/AddOpenNetworkCallbacks.html#openNetworkAdded-android.net.wifi.WifiConfiguration-">openNetworkAdded(WifiConfiguration)</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/AddOpenNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">AddOpenNetworkCallbacks</a></dt>
+<dd>&nbsp;</dd>
 </dl>
 <a name="I:P">
 <!--   -->
@@ -310,6 +527,14 @@ <h2 class="title">P</h2>
 <dt><span class="memberNameLink"><a href="com/isupatches/wisefy/constants/Capabilities.html#PSK">PSK</a></span> - Static variable in class com.isupatches.wisefy.constants.<a href="com/isupatches/wisefy/constants/Capabilities.html" title="class in com.isupatches.wisefy.constants">Capabilities</a></dt>
 <dd>&nbsp;</dd>
 </dl>
+<a name="I:Q">
+<!--   -->
+</a>
+<h2 class="title">Q</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/threads/WiseFyHandlerThread.html#quit--">quit()</a></span> - Method in class com.isupatches.wisefy.threads.<a href="com/isupatches/wisefy/threads/WiseFyHandlerThread.html" title="class in com.isupatches.wisefy.threads">WiseFyHandlerThread</a></dt>
+<dd>&nbsp;</dd>
+</dl>
 <a name="I:R">
 <!--   -->
 </a>
@@ -319,17 +544,105 @@ <h2 class="title">R</h2>
 <dd>
 <div class="block">To remove a configured network</div>
 </dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#removeNetwork-java.lang.String-com.isupatches.wisefy.callbacks.RemoveNetworkCallbacks-">removeNetwork(String, RemoveNetworkCallbacks)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
+<dd>
+<div class="block">To remove a configured network</div>
+</dd>
+<dt><a href="com/isupatches/wisefy/callbacks/RemoveNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">RemoveNetworkCallbacks</span></a> - Interface in <a href="com/isupatches/wisefy/callbacks/package-summary.html">com.isupatches.wisefy.callbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/RemoveNetworkCallbacks.html#removeNetworkWiseFyFailure-java.lang.Integer-">removeNetworkWiseFyFailure(Integer)</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/RemoveNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">RemoveNetworkCallbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/GetCurrentNetworkCallbacks.html#retrievedCurrentNetwork-android.net.wifi.WifiInfo-">retrievedCurrentNetwork(WifiInfo)</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/GetCurrentNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">GetCurrentNetworkCallbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/GetFrequencyCallbacks.html#retrievedFrequency-int-">retrievedFrequency(int)</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/GetFrequencyCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">GetFrequencyCallbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/GetNearbyAccessPointsCallbacks.html#retrievedNearbyAccessPoints-java.util.List-">retrievedNearbyAccessPoints(List&lt;ScanResult&gt;)</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/GetNearbyAccessPointsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">GetNearbyAccessPointsCallbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/GetRSSICallbacks.html#retrievedRSSI-java.lang.Integer-">retrievedRSSI(Integer)</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/GetRSSICallbacks.html" title="interface in com.isupatches.wisefy.callbacks">GetRSSICallbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/GetSavedNetworkCallbacks.html#retrievedSavedNetwork-android.net.wifi.WifiConfiguration-">retrievedSavedNetwork(WifiConfiguration)</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/GetSavedNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">GetSavedNetworkCallbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/GetSavedNetworksCallbacks.html#retrievedSavedNetworks-java.util.List-">retrievedSavedNetworks(List&lt;WifiConfiguration&gt;)</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/GetSavedNetworksCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">GetSavedNetworksCallbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/SearchForSSIDsCallbacks.html#retrievedSSIDs-java.util.List-">retrievedSSIDs(List&lt;String&gt;)</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/SearchForSSIDsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">SearchForSSIDsCallbacks</a></dt>
+<dd>&nbsp;</dd>
 </dl>
 <a name="I:S">
 <!--   -->
 </a>
 <h2 class="title">S</h2>
 <dl>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/GetSavedNetworkCallbacks.html#savedNetworkNotFound--">savedNetworkNotFound()</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/GetSavedNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">GetSavedNetworkCallbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#searchForAccessPoint-java.lang.String-int-boolean-">searchForAccessPoint(String, int, boolean)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#searchForAccessPoint-java.lang.String-int-boolean-com.isupatches.wisefy.callbacks.SearchForAccessPointCallbacks-">searchForAccessPoint(String, int, boolean, SearchForAccessPointCallbacks)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="com/isupatches/wisefy/callbacks/SearchForAccessPointCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">SearchForAccessPointCallbacks</span></a> - Interface in <a href="com/isupatches/wisefy/callbacks/package-summary.html">com.isupatches.wisefy.callbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#searchForAccessPoints-java.lang.String-boolean-">searchForAccessPoints(String, boolean)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#searchForAccessPoints-java.lang.String-boolean-com.isupatches.wisefy.callbacks.SearchForAccessPointsCallbacks-">searchForAccessPoints(String, boolean, SearchForAccessPointsCallbacks)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="com/isupatches/wisefy/callbacks/SearchForAccessPointsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">SearchForAccessPointsCallbacks</span></a> - Interface in <a href="com/isupatches/wisefy/callbacks/package-summary.html">com.isupatches.wisefy.callbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/SearchForAccessPointsCallbacks.html#searchForAccessPointsWiseFyFailure-java.lang.Integer-">searchForAccessPointsWiseFyFailure(Integer)</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/SearchForAccessPointsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">SearchForAccessPointsCallbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/SearchForAccessPointCallbacks.html#searchForAccessPointWiseFyFailure-java.lang.Integer-">searchForAccessPointWiseFyFailure(Integer)</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/SearchForAccessPointCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">SearchForAccessPointCallbacks</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#searchForSSID-java.lang.String-int-">searchForSSID(String, int)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
 <dd>
-<div class="block">To search local networks and return the first one that contains a given ssid (non-case sensitive)</div>
+<div class="block">To search local networks and return the first one that contains a given ssid</div>
+</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#searchForSSID-java.lang.String-int-com.isupatches.wisefy.callbacks.SearchForSSIDCallbacks-">searchForSSID(String, int, SearchForSSIDCallbacks)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
+<dd>
+<div class="block">To search local networks and return the first one that contains a given ssid</div>
+</dd>
+<dt><a href="com/isupatches/wisefy/callbacks/SearchForSSIDCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">SearchForSSIDCallbacks</span></a> - Interface in <a href="com/isupatches/wisefy/callbacks/package-summary.html">com.isupatches.wisefy.callbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#searchForSSIDs-java.lang.String-">searchForSSIDs(String)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
+<dd>
+<div class="block">To search local networks and return the first one that contains a given ssid</div>
+</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#searchForSSIDs-java.lang.String-com.isupatches.wisefy.callbacks.SearchForSSIDsCallbacks-">searchForSSIDs(String, SearchForSSIDsCallbacks)</a></span> - Method in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
+<dd>
+<div class="block">To search local networks and return the first one that contains a given ssid</div>
+</dd>
+<dt><a href="com/isupatches/wisefy/callbacks/SearchForSSIDsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">SearchForSSIDsCallbacks</span></a> - Interface in <a href="com/isupatches/wisefy/callbacks/package-summary.html">com.isupatches.wisefy.callbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/SearchForSSIDsCallbacks.html#searchForSSIDsWiseFyFailure-java.lang.Integer-">searchForSSIDsWiseFyFailure(Integer)</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/SearchForSSIDsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">SearchForSSIDsCallbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/SearchForSSIDCallbacks.html#searchForSSIDWiseFyFailure-java.lang.Integer-">searchForSSIDWiseFyFailure(Integer)</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/SearchForSSIDCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">SearchForSSIDCallbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/util/SleepUtil.html#sleep-long-">sleep(long)</a></span> - Static method in class com.isupatches.wisefy.util.<a href="com/isupatches/wisefy/util/SleepUtil.html" title="class in com.isupatches.wisefy.util">SleepUtil</a></dt>
+<dd>
+<div class="block">Used to wait for a given amount of time (in milliseconds)</div>
 </dd>
+<dt><a href="com/isupatches/wisefy/util/SleepUtil.html" title="class in com.isupatches.wisefy.util"><span class="typeNameLink">SleepUtil</span></a> - Class in <a href="com/isupatches/wisefy/util/package-summary.html">com.isupatches.wisefy.util</a></dt>
+<dd>
+<div class="block">A helper class for shared wait logic</div>
+</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/util/SleepUtil.html#SleepUtil--">SleepUtil()</a></span> - Constructor for class com.isupatches.wisefy.util.<a href="com/isupatches/wisefy/util/SleepUtil.html" title="class in com.isupatches.wisefy.util">SleepUtil</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/SearchForSSIDCallbacks.html#ssidFound-java.lang.String-">ssidFound(String)</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/SearchForSSIDCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">SearchForSSIDCallbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/SearchForSSIDCallbacks.html#ssidNotFound--">ssidNotFound()</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/SearchForSSIDCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">SearchForSSIDCallbacks</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="com/isupatches/wisefy/util/SSIDUtil.html" title="class in com.isupatches.wisefy.util"><span class="typeNameLink">SSIDUtil</span></a> - Class in <a href="com/isupatches/wisefy/util/package-summary.html">com.isupatches.wisefy.util</a></dt>
+<dd>
+<div class="block">A helper class to manipulate the string value for SSIDs</div>
+</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/threads/WiseFyHandlerThread.html#start--">start()</a></span> - Method in class com.isupatches.wisefy.threads.<a href="com/isupatches/wisefy/threads/WiseFyHandlerThread.html" title="class in com.isupatches.wisefy.threads">WiseFyHandlerThread</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations"><span class="typeNameLink">Sync</span></a> - Annotation Type in <a href="com/isupatches/wisefy/annotations/package-summary.html">com.isupatches.wisefy.annotations</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="I:T">
+<!--   -->
+</a>
+<h2 class="title">T</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/threads/WiseFyHandlerThread.html#TAG">TAG</a></span> - Static variable in class com.isupatches.wisefy.threads.<a href="com/isupatches/wisefy/threads/WiseFyHandlerThread.html" title="class in com.isupatches.wisefy.threads">WiseFyHandlerThread</a></dt>
 <dd>&nbsp;</dd>
 </dl>
 <a name="I:W">
@@ -337,19 +650,30 @@ <h2 class="title">S</h2>
 </a>
 <h2 class="title">W</h2>
 <dl>
+<dt><a href="com/isupatches/wisefy/annotations/WaitsForTimeout.html" title="annotation in com.isupatches.wisefy.annotations"><span class="typeNameLink">WaitsForTimeout</span></a> - Annotation Type in <a href="com/isupatches/wisefy/annotations/package-summary.html">com.isupatches.wisefy.annotations</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/isupatches/wisefy/constants/Capabilities.html#WEP">WEP</a></span> - Static variable in class com.isupatches.wisefy.constants.<a href="com/isupatches/wisefy/constants/Capabilities.html" title="class in com.isupatches.wisefy.constants">Capabilities</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/AddWEPNetworkCallbacks.html#wepNetworkAdded-android.net.wifi.WifiConfiguration-">wepNetworkAdded(WifiConfiguration)</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/AddWEPNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">AddWEPNetworkCallbacks</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/isupatches/wisefy/constants/NetworkTypes.html#WIFI">WIFI</a></span> - Static variable in class com.isupatches.wisefy.constants.<a href="com/isupatches/wisefy/constants/NetworkTypes.html" title="class in com.isupatches.wisefy.constants">NetworkTypes</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.html#WIFI_MANAGER_FAILURE">WIFI_MANAGER_FAILURE</a></span> - Static variable in class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy">WiseFy</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="com/isupatches/wisefy/util/WifiConfigurationUtil.html" title="class in com.isupatches.wisefy.util"><span class="typeNameLink">WifiConfigurationUtil</span></a> - Class in <a href="com/isupatches/wisefy/util/package-summary.html">com.isupatches.wisefy.util</a></dt>
+<dd>
+<div class="block">A helper class to generate WifiConfigurations</div>
+</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/DisableWifiCallbacks.html#wifiDisabled--">wifiDisabled()</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/DisableWifiCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">DisableWifiCallbacks</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/EnableWifiCallbacks.html#wifiEnabled--">wifiEnabled()</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/EnableWifiCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">EnableWifiCallbacks</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy"><span class="typeNameLink">WiseFy</span></a> - Class in <a href="com/isupatches/wisefy/package-summary.html">com.isupatches.wisefy</a></dt>
 <dd>
-<div class="block">Main class to manipulate and query network settings on an Android device
-
- Uses the builder pattern for creation - <a href="com/isupatches/wisefy/WiseFy.withContext.html" title="class in com.isupatches.wisefy"><code>WiseFy.withContext</code></a></div>
+<div class="block">Main class for WiseFy that provides a synchronous and asynchronous API to manipulate and query
+ for different parts of a device's wifi configuration and status.</div>
 </dd>
-<dt><a href="com/isupatches/wisefy/WiseFy.withContext.html" title="class in com.isupatches.wisefy"><span class="typeNameLink">WiseFy.withContext</span></a> - Class in <a href="com/isupatches/wisefy/package-summary.html">com.isupatches.wisefy</a></dt>
+<dt><a href="com/isupatches/wisefy/WiseFy.brains.html" title="class in com.isupatches.wisefy"><span class="typeNameLink">WiseFy.brains</span></a> - Class in <a href="com/isupatches/wisefy/package-summary.html">com.isupatches.wisefy</a></dt>
 <dd>
 <div class="block">Static class for builder pattern
 
@@ -359,12 +683,24 @@ <h2 class="title">W</h2>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="com/isupatches/wisefy/constants/WiseFyCodes.html#WiseFyCodes--">WiseFyCodes()</a></span> - Constructor for class com.isupatches.wisefy.constants.<a href="com/isupatches/wisefy/constants/WiseFyCodes.html" title="class in com.isupatches.wisefy.constants">WiseFyCodes</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/WiseFy.withContext.html#withContext-android.content.Context-">withContext(Context)</a></span> - Constructor for class com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.withContext.html" title="class in com.isupatches.wisefy">WiseFy.withContext</a></dt>
+<dt><a href="com/isupatches/wisefy/threads/WiseFyHandlerThread.html" title="class in com.isupatches.wisefy.threads"><span class="typeNameLink">WiseFyHandlerThread</span></a> - Class in <a href="com/isupatches/wisefy/threads/package-summary.html">com.isupatches.wisefy.threads</a></dt>
 <dd>
-<div class="block">Mandatory - The public constructor for the builder that requires a context</div>
+<div class="block">A Thread to use for all WiseFy background processing
+
+ *NOTE* Must be cleaned!! <a href="com/isupatches/wisefy/WiseFy.html#dump--"><code>WiseFy.dump()</code></a></div>
 </dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/threads/WiseFyHandlerThread.html#WiseFyHandlerThread-java.lang.String-boolean-">WiseFyHandlerThread(String, boolean)</a></span> - Constructor for class com.isupatches.wisefy.threads.<a href="com/isupatches/wisefy/threads/WiseFyHandlerThread.html" title="class in com.isupatches.wisefy.threads">WiseFyHandlerThread</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="com/isupatches/wisefy/annotations/WiseFyThread.html" title="annotation in com.isupatches.wisefy.annotations"><span class="typeNameLink">WiseFyThread</span></a> - Annotation Type in <a href="com/isupatches/wisefy/annotations/package-summary.html">com.isupatches.wisefy.annotations</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/constants/Capabilities.html#WPA">WPA</a></span> - Static variable in class com.isupatches.wisefy.constants.<a href="com/isupatches/wisefy/constants/Capabilities.html" title="class in com.isupatches.wisefy.constants">Capabilities</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/constants/Capabilities.html#WPA2">WPA2</a></span> - Static variable in class com.isupatches.wisefy.constants.<a href="com/isupatches/wisefy/constants/Capabilities.html" title="class in com.isupatches.wisefy.constants">Capabilities</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="com/isupatches/wisefy/callbacks/AddWPA2NetworkCallbacks.html#wpa2NetworkAdded-android.net.wifi.WifiConfiguration-">wpa2NetworkAdded(WifiConfiguration)</a></span> - Method in interface com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/AddWPA2NetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks">AddWPA2NetworkCallbacks</a></dt>
+<dd>&nbsp;</dd>
 </dl>
-<a href="#I:A">A</a>&nbsp;<a href="#I:C">C</a>&nbsp;<a href="#I:D">D</a>&nbsp;<a href="#I:E">E</a>&nbsp;<a href="#I:F">F</a>&nbsp;<a href="#I:G">G</a>&nbsp;<a href="#I:I">I</a>&nbsp;<a href="#I:L">L</a>&nbsp;<a href="#I:M">M</a>&nbsp;<a href="#I:N">N</a>&nbsp;<a href="#I:P">P</a>&nbsp;<a href="#I:R">R</a>&nbsp;<a href="#I:S">S</a>&nbsp;<a href="#I:W">W</a>&nbsp;</div>
+<a href="#I:A">A</a>&nbsp;<a href="#I:B">B</a>&nbsp;<a href="#I:C">C</a>&nbsp;<a href="#I:D">D</a>&nbsp;<a href="#I:E">E</a>&nbsp;<a href="#I:F">F</a>&nbsp;<a href="#I:G">G</a>&nbsp;<a href="#I:I">I</a>&nbsp;<a href="#I:L">L</a>&nbsp;<a href="#I:M">M</a>&nbsp;<a href="#I:N">N</a>&nbsp;<a href="#I:O">O</a>&nbsp;<a href="#I:P">P</a>&nbsp;<a href="#I:Q">Q</a>&nbsp;<a href="#I:R">R</a>&nbsp;<a href="#I:S">S</a>&nbsp;<a href="#I:T">T</a>&nbsp;<a href="#I:W">W</a>&nbsp;</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
diff --git a/javadoc/index.html b/javadoc/index.html
index 872761b6..5478c4a2 100644
--- a/javadoc/index.html
+++ b/javadoc/index.html
@@ -2,8 +2,8 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Tue Jul 04 09:39:45 CDT 2017 -->
-<title>wisefy 1.0.10 API</title>
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>wisefy 2.0.0-BETA API</title>
 <script type="text/javascript">
     targetPage = "" + window.location.search;
     if (targetPage != "" && targetPage != "undefined")
diff --git a/javadoc/overview-frame.html b/javadoc/overview-frame.html
index 7ce9ea9e..943d1776 100644
--- a/javadoc/overview-frame.html
+++ b/javadoc/overview-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Tue Jul 04 09:39:45 CDT 2017 -->
-<title>Overview List (wisefy 1.0.10 API)</title>
-<meta name="date" content="2017-07-04">
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>Overview List (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -14,7 +14,10 @@
 <h2 title="Packages">Packages</h2>
 <ul title="Packages">
 <li><a href="com/isupatches/wisefy/package-frame.html" target="packageFrame">com.isupatches.wisefy</a></li>
+<li><a href="com/isupatches/wisefy/annotations/package-frame.html" target="packageFrame">com.isupatches.wisefy.annotations</a></li>
+<li><a href="com/isupatches/wisefy/callbacks/package-frame.html" target="packageFrame">com.isupatches.wisefy.callbacks</a></li>
 <li><a href="com/isupatches/wisefy/constants/package-frame.html" target="packageFrame">com.isupatches.wisefy.constants</a></li>
+<li><a href="com/isupatches/wisefy/threads/package-frame.html" target="packageFrame">com.isupatches.wisefy.threads</a></li>
 <li><a href="com/isupatches/wisefy/util/package-frame.html" target="packageFrame">com.isupatches.wisefy.util</a></li>
 </ul>
 </div>
diff --git a/javadoc/overview-summary.html b/javadoc/overview-summary.html
index 34e3d264..1fb11068 100644
--- a/javadoc/overview-summary.html
+++ b/javadoc/overview-summary.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Tue Jul 04 09:39:45 CDT 2017 -->
-<title>Overview (wisefy 1.0.10 API)</title>
-<meta name="date" content="2017-07-04">
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>Overview (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Overview (wisefy 1.0.10 API)";
+            parent.document.title="Overview (wisefy 2.0.0-BETA API)";
         }
     }
     catch(err) {
@@ -69,7 +69,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h1 class="title">wisefy 1.0.10 API</h1>
+<h1 class="title">wisefy 2.0.0-BETA API</h1>
 </div>
 <div class="contentContainer">
 <table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Packages table, listing packages, and an explanation">
@@ -84,10 +84,22 @@ <h1 class="title">wisefy 1.0.10 API</h1>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a href="com/isupatches/wisefy/annotations/package-summary.html">com.isupatches.wisefy.annotations</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="com/isupatches/wisefy/callbacks/package-summary.html">com.isupatches.wisefy.callbacks</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><a href="com/isupatches/wisefy/constants/package-summary.html">com.isupatches.wisefy.constants</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><a href="com/isupatches/wisefy/threads/package-summary.html">com.isupatches.wisefy.threads</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><a href="com/isupatches/wisefy/util/package-summary.html">com.isupatches.wisefy.util</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
diff --git a/javadoc/overview-tree.html b/javadoc/overview-tree.html
index d5a31a0a..78c49fdd 100644
--- a/javadoc/overview-tree.html
+++ b/javadoc/overview-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Tue Jul 04 09:39:45 CDT 2017 -->
-<title>Class Hierarchy (wisefy 1.0.10 API)</title>
-<meta name="date" content="2017-07-04">
+<!-- Generated by javadoc (1.8.0_102) on Sun Jul 16 20:08:41 CDT 2017 -->
+<title>Class Hierarchy (wisefy 2.0.0-BETA API)</title>
+<meta name="date" content="2017-07-16">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Class Hierarchy (wisefy 1.0.10 API)";
+            parent.document.title="Class Hierarchy (wisefy 2.0.0-BETA API)";
         }
     }
     catch(err) {
@@ -73,7 +73,10 @@ <h1 class="title">Hierarchy For All Packages</h1>
 <span class="packageHierarchyLabel">Package Hierarchies:</span>
 <ul class="horizontal">
 <li><a href="com/isupatches/wisefy/package-tree.html">com.isupatches.wisefy</a>, </li>
+<li><a href="com/isupatches/wisefy/annotations/package-tree.html">com.isupatches.wisefy.annotations</a>, </li>
+<li><a href="com/isupatches/wisefy/callbacks/package-tree.html">com.isupatches.wisefy.callbacks</a>, </li>
 <li><a href="com/isupatches/wisefy/constants/package-tree.html">com.isupatches.wisefy.constants</a>, </li>
+<li><a href="com/isupatches/wisefy/threads/package-tree.html">com.isupatches.wisefy.threads</a>, </li>
 <li><a href="com/isupatches/wisefy/util/package-tree.html">com.isupatches.wisefy.util</a></li>
 </ul>
 </div>
@@ -86,13 +89,53 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <li type="circle">com.isupatches.wisefy.util.<a href="com/isupatches/wisefy/util/LogUtil.html" title="class in com.isupatches.wisefy.util"><span class="typeNameLink">LogUtil</span></a></li>
 <li type="circle">com.isupatches.wisefy.util.<a href="com/isupatches/wisefy/util/ManagerUtil.html" title="class in com.isupatches.wisefy.util"><span class="typeNameLink">ManagerUtil</span></a></li>
 <li type="circle">com.isupatches.wisefy.constants.<a href="com/isupatches/wisefy/constants/NetworkTypes.html" title="class in com.isupatches.wisefy.constants"><span class="typeNameLink">NetworkTypes</span></a></li>
+<li type="circle">com.isupatches.wisefy.util.<a href="com/isupatches/wisefy/util/SleepUtil.html" title="class in com.isupatches.wisefy.util"><span class="typeNameLink">SleepUtil</span></a></li>
 <li type="circle">com.isupatches.wisefy.util.<a href="com/isupatches/wisefy/util/SSIDUtil.html" title="class in com.isupatches.wisefy.util"><span class="typeNameLink">SSIDUtil</span></a></li>
+<li type="circle">java.lang.Thread (implements java.lang.Runnable)
+<ul>
+<li type="circle">android.os.HandlerThread
+<ul>
+<li type="circle">com.isupatches.wisefy.threads.<a href="com/isupatches/wisefy/threads/WiseFyHandlerThread.html" title="class in com.isupatches.wisefy.threads"><span class="typeNameLink">WiseFyHandlerThread</span></a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li type="circle">com.isupatches.wisefy.util.<a href="com/isupatches/wisefy/util/WifiConfigurationUtil.html" title="class in com.isupatches.wisefy.util"><span class="typeNameLink">WifiConfigurationUtil</span></a></li>
 <li type="circle">com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.html" title="class in com.isupatches.wisefy"><span class="typeNameLink">WiseFy</span></a></li>
-<li type="circle">com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.withContext.html" title="class in com.isupatches.wisefy"><span class="typeNameLink">WiseFy.withContext</span></a></li>
+<li type="circle">com.isupatches.wisefy.<a href="com/isupatches/wisefy/WiseFy.brains.html" title="class in com.isupatches.wisefy"><span class="typeNameLink">WiseFy.brains</span></a></li>
 <li type="circle">com.isupatches.wisefy.constants.<a href="com/isupatches/wisefy/constants/WiseFyCodes.html" title="class in com.isupatches.wisefy.constants"><span class="typeNameLink">WiseFyCodes</span></a></li>
 </ul>
 </li>
 </ul>
+<h2 title="Interface Hierarchy">Interface Hierarchy</h2>
+<ul>
+<li type="circle">com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/AddOpenNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">AddOpenNetworkCallbacks</span></a></li>
+<li type="circle">com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/AddWEPNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">AddWEPNetworkCallbacks</span></a></li>
+<li type="circle">com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/AddWPA2NetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">AddWPA2NetworkCallbacks</span></a></li>
+<li type="circle">com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/ConnectToNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">ConnectToNetworkCallbacks</span></a></li>
+<li type="circle">com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/DisableWifiCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">DisableWifiCallbacks</span></a></li>
+<li type="circle">com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/DisconnectFromCurrentNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">DisconnectFromCurrentNetworkCallbacks</span></a></li>
+<li type="circle">com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/EnableWifiCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">EnableWifiCallbacks</span></a></li>
+<li type="circle">com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/GetCurrentNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">GetCurrentNetworkCallbacks</span></a></li>
+<li type="circle">com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/GetFrequencyCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">GetFrequencyCallbacks</span></a></li>
+<li type="circle">com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/GetNearbyAccessPointsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">GetNearbyAccessPointsCallbacks</span></a></li>
+<li type="circle">com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/GetRSSICallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">GetRSSICallbacks</span></a></li>
+<li type="circle">com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/GetSavedNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">GetSavedNetworkCallbacks</span></a></li>
+<li type="circle">com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/GetSavedNetworksCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">GetSavedNetworksCallbacks</span></a></li>
+<li type="circle">com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/RemoveNetworkCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">RemoveNetworkCallbacks</span></a></li>
+<li type="circle">com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/SearchForAccessPointCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">SearchForAccessPointCallbacks</span></a></li>
+<li type="circle">com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/SearchForAccessPointsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">SearchForAccessPointsCallbacks</span></a></li>
+<li type="circle">com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/SearchForSSIDCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">SearchForSSIDCallbacks</span></a></li>
+<li type="circle">com.isupatches.wisefy.callbacks.<a href="com/isupatches/wisefy/callbacks/SearchForSSIDsCallbacks.html" title="interface in com.isupatches.wisefy.callbacks"><span class="typeNameLink">SearchForSSIDsCallbacks</span></a></li>
+</ul>
+<h2 title="Annotation Type Hierarchy">Annotation Type Hierarchy</h2>
+<ul>
+<li type="circle">com.isupatches.wisefy.annotations.<a href="com/isupatches/wisefy/annotations/Async.html" title="annotation in com.isupatches.wisefy.annotations"><span class="typeNameLink">Async</span></a> (implements java.lang.annotation.Annotation)</li>
+<li type="circle">com.isupatches.wisefy.annotations.<a href="com/isupatches/wisefy/annotations/CallingThread.html" title="annotation in com.isupatches.wisefy.annotations"><span class="typeNameLink">CallingThread</span></a> (implements java.lang.annotation.Annotation)</li>
+<li type="circle">com.isupatches.wisefy.annotations.<a href="com/isupatches/wisefy/annotations/Sync.html" title="annotation in com.isupatches.wisefy.annotations"><span class="typeNameLink">Sync</span></a> (implements java.lang.annotation.Annotation)</li>
+<li type="circle">com.isupatches.wisefy.annotations.<a href="com/isupatches/wisefy/annotations/WaitsForTimeout.html" title="annotation in com.isupatches.wisefy.annotations"><span class="typeNameLink">WaitsForTimeout</span></a> (implements java.lang.annotation.Annotation)</li>
+<li type="circle">com.isupatches.wisefy.annotations.<a href="com/isupatches/wisefy/annotations/WiseFyThread.html" title="annotation in com.isupatches.wisefy.annotations"><span class="typeNameLink">WiseFyThread</span></a> (implements java.lang.annotation.Annotation)</li>
+</ul>
 </div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
diff --git a/javadoc/package-list b/javadoc/package-list
index 4c650b51..6b1deb8f 100644
--- a/javadoc/package-list
+++ b/javadoc/package-list
@@ -1,3 +1,6 @@
 com.isupatches.wisefy
+com.isupatches.wisefy.annotations
+com.isupatches.wisefy.callbacks
 com.isupatches.wisefy.constants
+com.isupatches.wisefy.threads
 com.isupatches.wisefy.util
diff --git a/wisefy/build.gradle b/wisefy/build.gradle
index a5678b22..9dd0ba3f 100644
--- a/wisefy/build.gradle
+++ b/wisefy/build.gradle
@@ -20,12 +20,6 @@ android {
         installOptions "-d","-t"
     }
 
-    testOptions {
-        // Allows Android code to be called from unit tests without causing a crash.
-        // Helpful for allowing Log.d()-type calls
-        unitTests.returnDefaultValues = true;
-    }
-
     compileSdkVersion 26
     buildToolsVersion "25.0.3"
 
@@ -55,9 +49,7 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
 
-    compile 'com.android.support:support-annotations:25.3.1'
-
-    androidTestCompile 'com.android.support:support-annotations:25.3.1'
+    androidTestCompile 'com.android.support:support-annotations:26.0.0-alpha1'
     androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
     androidTestCompile 'org.mockito:mockito-android:2.8.47'
     androidTestCompile 'com.android.support.test:runner:0.5'
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/AddOpenNetworkTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/AddOpenNetworkTests.java
new file mode 100644
index 00000000..76073241
--- /dev/null
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/AddOpenNetworkTests.java
@@ -0,0 +1,160 @@
+package com.isupatches.wisefy;
+
+
+import android.net.wifi.WifiConfiguration;
+import com.isupatches.wisefy.callbacks.AddOpenNetworkCallbacks;
+import com.isupatches.wisefy.constants.WiseFyCodes;
+import com.isupatches.wisefy.base.TestActivity;
+import org.junit.Test;
+import static com.isupatches.wisefy.base.TestUtils.OPEN_NETWORK_SSID;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+
+public class AddOpenNetworkTests extends BaseTestClass<TestActivity> {
+
+    public AddOpenNetworkTests() {
+        super(TestActivity.class);
+    }
+
+    @Test
+    public void noCallbacks_failure() {
+        when(mMockWiFiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(WiseFy.WIFI_MANAGER_FAILURE);
+        assertEquals(WiseFy.WIFI_MANAGER_FAILURE,  mWiseFy.addOpenNetwork(OPEN_NETWORK_SSID));
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).addNetwork(any(WifiConfiguration.class));
+    }
+
+    @Test
+    public void noCallbacks_failure_nullSSIDParam() {
+        assertEquals(WiseFyCodes.MISSING_PARAMETER, mWiseFy.addOpenNetwork(null));
+        verify(mMockWiFiManager, never()).addNetwork(any(WifiConfiguration.class));
+    }
+
+    @Test
+    public void noCallbacks_failure_missingPrerequisite() {
+        missingPrerequisite();
+        assertEquals(WiseFyCodes.MISSING_PREREQUISITE, mWiseFy.addOpenNetwork(OPEN_NETWORK_SSID));
+        verify(mMockWiFiManager, never()).addNetwork(any(WifiConfiguration.class));
+    }
+
+    @Test
+    public void noCallbacks_success() {
+        when(mMockWiFiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(0);
+        assertNotEquals(WiseFy.WIFI_MANAGER_FAILURE, mWiseFy.addOpenNetwork(OPEN_NETWORK_SSID));
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).addNetwork(any(WifiConfiguration.class));
+    }
+
+    @Test
+    public void noCallbacks_success_alreadyConfigured() {
+        networkAlreadyInConfigurationList();
+        assertEquals(WiseFyCodes.NETWORK_ALREADY_CONFIGURED, mWiseFy.addOpenNetwork(OPEN_NETWORK_SSID));
+        verify(mMockWiFiManager, never()).addNetwork(any(WifiConfiguration.class));
+    }
+
+    @Test
+    public void callbacks_failure() {
+        when(mMockWiFiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(WiseFy.WIFI_MANAGER_FAILURE);
+        AddOpenNetworkCallbacks mockCallbacks = mock(AddOpenNetworkCallbacks.class);
+        mWiseFy.addOpenNetwork(OPEN_NETWORK_SSID, mockCallbacks);
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).failureAddingOpenNetwork(WiseFy.WIFI_MANAGER_FAILURE);
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).addNetwork(any(WifiConfiguration.class));
+    }
+
+    @Test
+    public void callbacks_failure_nullCallback() {
+        when(mMockWiFiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(WiseFy.WIFI_MANAGER_FAILURE);
+        try {
+            mWiseFy.addOpenNetwork(OPEN_NETWORK_SSID, null);
+            verify(mMockWiFiManager, never()).addNetwork(any(WifiConfiguration.class));
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_failure_nullSSIDParam() {
+        AddOpenNetworkCallbacks mockCallbacks = mock(AddOpenNetworkCallbacks.class);
+        mWiseFy.addOpenNetwork(null, mockCallbacks);
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).addOpenNetworkWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
+        verify(mMockWiFiManager, never()).addNetwork(any(WifiConfiguration.class));
+    }
+
+    @Test
+    public void callbacks_failure_nullSSIDParam_nullCallback() {
+        try {
+            mWiseFy.addOpenNetwork(null, null);
+            verify(mMockWiFiManager, never()).addNetwork(any(WifiConfiguration.class));
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_failure_missingPrerequisite() {
+        missingPrerequisite();
+        AddOpenNetworkCallbacks mockCallbacks = mock(AddOpenNetworkCallbacks.class);
+        mWiseFy.addOpenNetwork(OPEN_NETWORK_SSID, mockCallbacks);
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).addOpenNetworkWiseFyFailure(WiseFyCodes.MISSING_PREREQUISITE);
+        verify(mMockWiFiManager, never()).addNetwork(any(WifiConfiguration.class));
+    }
+
+    @Test
+    public void callbacks_failure_missingPrerequisite_nullCallback() {
+        missingPrerequisite();
+        try {
+            mWiseFy.addOpenNetwork(OPEN_NETWORK_SSID, null);
+            verify(mMockWiFiManager, never()).addNetwork(any(WifiConfiguration.class));
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_success() {
+        when(mMockWiFiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(0);
+        AddOpenNetworkCallbacks mockCallbacks = mock(AddOpenNetworkCallbacks.class);
+        mWiseFy.addOpenNetwork(OPEN_NETWORK_SSID, mockCallbacks);
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).openNetworkAdded(any(WifiConfiguration.class));
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).addNetwork(any(WifiConfiguration.class));
+    }
+
+    @Test
+    public void callbacks_success_nullCallback() {
+        when(mMockWiFiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(0);
+        try {
+            mWiseFy.addOpenNetwork(OPEN_NETWORK_SSID, null);
+            verify(mMockWiFiManager, never()).addNetwork(any(WifiConfiguration.class));
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_success_alreadyConfigured() {
+        networkAlreadyInConfigurationList();
+
+        AddOpenNetworkCallbacks mockCallbacks = mock(AddOpenNetworkCallbacks.class);
+        mWiseFy.addOpenNetwork(OPEN_NETWORK_SSID, mockCallbacks);
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).addOpenNetworkWiseFyFailure(WiseFyCodes.NETWORK_ALREADY_CONFIGURED);
+        verify(mMockWiFiManager, never()).addNetwork(any(WifiConfiguration.class));
+    }
+
+    @Test
+    public void callbacks_success_alreadyConfigured_nullCallback() {
+        networkAlreadyInConfigurationList();
+
+        try {
+            mWiseFy.addOpenNetwork(OPEN_NETWORK_SSID, null);
+            verify(mMockWiFiManager, never()).addNetwork(any(WifiConfiguration.class));
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+}
\ No newline at end of file
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/AddWEPNetworkTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/AddWEPNetworkTests.java
new file mode 100644
index 00000000..d637cf7d
--- /dev/null
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/AddWEPNetworkTests.java
@@ -0,0 +1,188 @@
+package com.isupatches.wisefy;
+
+
+import android.net.wifi.WifiConfiguration;
+import com.isupatches.wisefy.base.TestActivity;
+import com.isupatches.wisefy.callbacks.AddWEPNetworkCallbacks;
+import com.isupatches.wisefy.constants.WiseFyCodes;
+import org.junit.Test;
+import static com.isupatches.wisefy.base.TestUtils.WEP_NETWORK_PASSWORD;
+import static com.isupatches.wisefy.base.TestUtils.WEP_NETWORK_SSID;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+
+public class AddWEPNetworkTests extends BaseTestClass<TestActivity> {
+
+    public AddWEPNetworkTests() {
+        super(TestActivity.class);
+    }
+
+    @Test
+    public void noCallbacks_failure() {
+        when(mMockWiFiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(WiseFy.WIFI_MANAGER_FAILURE);
+        assertEquals(WiseFy.WIFI_MANAGER_FAILURE, mWiseFy.addWEPNetwork(WEP_NETWORK_SSID, WEP_NETWORK_PASSWORD));
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).addNetwork(any(WifiConfiguration.class));
+    }
+
+    @Test
+    public void noCallbacks_failure_nullPasswordParam() {
+        assertEquals(WiseFyCodes.MISSING_PARAMETER, mWiseFy.addWEPNetwork(WEP_NETWORK_SSID, null));
+        verify(mMockWiFiManager, never()).addNetwork(any(WifiConfiguration.class));
+    }
+
+    @Test
+    public void noCallbacks_failure_nullSSIDParam() {
+        assertEquals(WiseFyCodes.MISSING_PARAMETER, mWiseFy.addWEPNetwork(null, WEP_NETWORK_PASSWORD));
+        verify(mMockWiFiManager, never()).addNetwork(any(WifiConfiguration.class));
+    }
+
+    @Test
+    public void noCallbacks_failure_missingPrerequisite() {
+        missingPrerequisite();
+        assertEquals(WiseFyCodes.MISSING_PREREQUISITE, mWiseFy.addWEPNetwork(WEP_NETWORK_SSID, WEP_NETWORK_PASSWORD));
+        verify(mMockWiFiManager, never()).addNetwork(any(WifiConfiguration.class));
+    }
+
+    @Test
+    public void noCallbacks_success() {
+        when(mMockWiFiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(0);
+        assertNotEquals(WiseFy.WIFI_MANAGER_FAILURE, mWiseFy.addWEPNetwork(WEP_NETWORK_SSID, WEP_NETWORK_PASSWORD));
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).addNetwork(any(WifiConfiguration.class));
+    }
+
+    @Test
+    public void noCallbacks_success_alreadyConfigured() {
+        networkAlreadyInConfigurationList();
+        assertEquals(WiseFyCodes.NETWORK_ALREADY_CONFIGURED, mWiseFy.addWEPNetwork(WEP_NETWORK_SSID, WEP_NETWORK_PASSWORD));
+        verify(mMockWiFiManager, never()).addNetwork(any(WifiConfiguration.class));
+    }
+
+    @Test
+    public void callbacks_failure() {
+        when(mMockWiFiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(WiseFy.WIFI_MANAGER_FAILURE);
+        AddWEPNetworkCallbacks mockCallbacks = mock(AddWEPNetworkCallbacks.class);
+        mWiseFy.addWEPNetwork(WEP_NETWORK_SSID, WEP_NETWORK_PASSWORD, mockCallbacks);
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).failureAddingWEPNetwork(WiseFy.WIFI_MANAGER_FAILURE);
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).addNetwork(any(WifiConfiguration.class));
+    }
+
+    @Test
+    public void callbacks_failure_nullCallback() {
+        when(mMockWiFiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(WiseFy.WIFI_MANAGER_FAILURE);
+
+        try {
+            mWiseFy.addWEPNetwork(WEP_NETWORK_SSID, WEP_NETWORK_PASSWORD, null);
+            verify(mMockWiFiManager, never()).addNetwork(any(WifiConfiguration.class));
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_failure_nullPasswordParam() {
+        AddWEPNetworkCallbacks mockCallbacks = mock(AddWEPNetworkCallbacks.class);
+        mWiseFy.addWEPNetwork(WEP_NETWORK_SSID, null, mockCallbacks);
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).addWEPNetworkWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
+        verify(mMockWiFiManager, never()).addNetwork(any(WifiConfiguration.class));
+    }
+
+    @Test
+    public void callbacks_failure_nullPasswordParam_nullCallback() {
+        try {
+            mWiseFy.addWEPNetwork(WEP_NETWORK_SSID, null, null);
+            verify(mMockWiFiManager, never()).addNetwork(any(WifiConfiguration.class));
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_failure_nullSSIDParam() {
+        AddWEPNetworkCallbacks mockCallbacks = mock(AddWEPNetworkCallbacks.class);
+        mWiseFy.addWEPNetwork(null, WEP_NETWORK_PASSWORD, mockCallbacks);
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).addWEPNetworkWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
+        verify(mMockWiFiManager, never()).addNetwork(any(WifiConfiguration.class));
+    }
+
+    @Test
+    public void callbacks_failure_nullSSIDParam_nullCallback() {
+        try {
+            mWiseFy.addWEPNetwork(null, WEP_NETWORK_PASSWORD, null);
+            verify(mMockWiFiManager, never()).addNetwork(any(WifiConfiguration.class));
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_failure_missingPrerequisite() {
+        missingPrerequisite();
+        AddWEPNetworkCallbacks mockCallbacks = mock(AddWEPNetworkCallbacks.class);
+        mWiseFy.addWEPNetwork(WEP_NETWORK_SSID, WEP_NETWORK_PASSWORD, mockCallbacks);
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).addWEPNetworkWiseFyFailure(WiseFyCodes.MISSING_PREREQUISITE);
+        verify(mMockWiFiManager, never()).addNetwork(any(WifiConfiguration.class));
+    }
+
+    @Test
+    public void callbacks_failure_missingPrerequisite_nullCallback() {
+        missingPrerequisite();
+
+        try {
+            mWiseFy.addWEPNetwork(WEP_NETWORK_SSID, WEP_NETWORK_PASSWORD, null);
+            verify(mMockWiFiManager, never()).addNetwork(any(WifiConfiguration.class));
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_success() {
+        when(mMockWiFiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(0);
+        AddWEPNetworkCallbacks mockCallbacks = mock(AddWEPNetworkCallbacks.class);
+        mWiseFy.addWEPNetwork(WEP_NETWORK_SSID, WEP_NETWORK_PASSWORD, mockCallbacks);
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).wepNetworkAdded(any(WifiConfiguration.class));
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).addNetwork(any(WifiConfiguration.class));
+    }
+
+    @Test
+    public void callbacks_success_nullCallback() {
+        when(mMockWiFiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(0);
+
+        try {
+            mWiseFy.addWEPNetwork(WEP_NETWORK_SSID, WEP_NETWORK_PASSWORD, null);
+            verify(mMockWiFiManager, never()).addNetwork(any(WifiConfiguration.class));
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_success_alreadyConfigured() {
+        networkAlreadyInConfigurationList();
+
+        AddWEPNetworkCallbacks mockCallbacks = mock(AddWEPNetworkCallbacks.class);
+        mWiseFy.addWEPNetwork(WEP_NETWORK_SSID, WEP_NETWORK_PASSWORD, mockCallbacks);
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).addWEPNetworkWiseFyFailure(WiseFyCodes.NETWORK_ALREADY_CONFIGURED);
+        verify(mMockWiFiManager, never()).addNetwork(any(WifiConfiguration.class));
+    }
+
+    @Test
+    public void callbacks_success_alreadyConfigured_nullCallback() {
+        networkAlreadyInConfigurationList();
+
+        try {
+            mWiseFy.addWEPNetwork(WEP_NETWORK_SSID, WEP_NETWORK_PASSWORD, null);
+            verify(mMockWiFiManager, never()).addNetwork(any(WifiConfiguration.class));
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/AddWPA2NetworkTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/AddWPA2NetworkTests.java
new file mode 100644
index 00000000..4e3d2480
--- /dev/null
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/AddWPA2NetworkTests.java
@@ -0,0 +1,187 @@
+package com.isupatches.wisefy;
+
+
+import android.net.wifi.WifiConfiguration;
+import com.isupatches.wisefy.base.TestActivity;
+import com.isupatches.wisefy.callbacks.AddWPA2NetworkCallbacks;
+import com.isupatches.wisefy.constants.WiseFyCodes;
+import org.junit.Test;
+import static com.isupatches.wisefy.base.TestUtils.WPA2_NETWORK_PASSWORD;
+import static com.isupatches.wisefy.base.TestUtils.WPA2_NETWORK_SSID;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+
+public class AddWPA2NetworkTests extends BaseTestClass<TestActivity> {
+
+    public AddWPA2NetworkTests() {
+        super(TestActivity.class);
+    }
+
+    @Test
+    public void noCallbacks_failure() {
+        when(mMockWiFiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(WiseFy.WIFI_MANAGER_FAILURE);
+        assertEquals(WiseFy.WIFI_MANAGER_FAILURE, mWiseFy.addWPA2Network(WPA2_NETWORK_SSID, WPA2_NETWORK_PASSWORD));
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).addNetwork(any(WifiConfiguration.class));
+    }
+
+    @Test
+    public void noCallbacks_failure_nullPasswordParam() {
+        assertEquals(WiseFyCodes.MISSING_PARAMETER, mWiseFy.addWPA2Network(WPA2_NETWORK_SSID, null));
+        verify(mMockWiFiManager, never()).addNetwork(any(WifiConfiguration.class));
+    }
+
+    @Test
+    public void anoCallbacks_failure_nullSSIDParam() {
+        assertEquals(WiseFyCodes.MISSING_PARAMETER, mWiseFy.addWPA2Network(null, WPA2_NETWORK_PASSWORD));
+        verify(mMockWiFiManager, never()).addNetwork(any(WifiConfiguration.class));
+    }
+
+    @Test
+    public void noCallbacks_failure_missingPrerequisite() {
+        missingPrerequisite();
+        assertEquals(WiseFyCodes.MISSING_PREREQUISITE, mWiseFy.addWPA2Network(WPA2_NETWORK_SSID, WPA2_NETWORK_PASSWORD));
+        verify(mMockWiFiManager, never()).addNetwork(any(WifiConfiguration.class));
+    }
+
+    @Test
+    public void noCallbacks_success() {
+        when(mMockWiFiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(0);
+        assertNotEquals(WiseFy.WIFI_MANAGER_FAILURE, mWiseFy.addWPA2Network(WPA2_NETWORK_SSID, WPA2_NETWORK_PASSWORD));
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).addNetwork(any(WifiConfiguration.class));
+    }
+
+    @Test
+    public void noCallbacks_success_alreadyConfigured() {
+        networkAlreadyInConfigurationList();
+        assertEquals(WiseFyCodes.NETWORK_ALREADY_CONFIGURED, mWiseFy.addWPA2Network(WPA2_NETWORK_SSID, WPA2_NETWORK_PASSWORD));
+        verify(mMockWiFiManager, never()).addNetwork(any(WifiConfiguration.class));
+    }
+
+    @Test
+    public void callbacks_failure() {
+        when(mMockWiFiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(WiseFy.WIFI_MANAGER_FAILURE);
+        AddWPA2NetworkCallbacks mockCallbacks = mock(AddWPA2NetworkCallbacks.class);
+        mWiseFy.addWPA2Network(WPA2_NETWORK_SSID, WPA2_NETWORK_PASSWORD, mockCallbacks);
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).failureAddingWPA2Network(WiseFy.WIFI_MANAGER_FAILURE);
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).addNetwork(any(WifiConfiguration.class));
+    }
+
+    @Test
+    public void callbacks_failure_nullCallback() {
+        when(mMockWiFiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(WiseFy.WIFI_MANAGER_FAILURE);
+        try {
+            mWiseFy.addWPA2Network(WPA2_NETWORK_SSID, WPA2_NETWORK_PASSWORD, null);
+            verify(mMockWiFiManager, never()).addNetwork(any(WifiConfiguration.class));
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_failure_nullPasswordParam() {
+        AddWPA2NetworkCallbacks mockCallbacks = mock(AddWPA2NetworkCallbacks.class);
+        mWiseFy.addWPA2Network(WPA2_NETWORK_SSID, null, mockCallbacks);
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).addWPA2NetworkWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
+        verify(mMockWiFiManager, never()).addNetwork(any(WifiConfiguration.class));
+    }
+
+    @Test
+    public void callbacks_failure_nullPasswordParam_nullCallback() {
+        try {
+            mWiseFy.addWPA2Network(WPA2_NETWORK_SSID, null, null);
+            verify(mMockWiFiManager, never()).addNetwork(any(WifiConfiguration.class));
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_failure_nullSSIDParam() {
+        AddWPA2NetworkCallbacks mockCallbacks = mock(AddWPA2NetworkCallbacks.class);
+        mWiseFy.addWPA2Network(null, WPA2_NETWORK_PASSWORD, mockCallbacks);
+        verify(mockCallbacks, never()).addWPA2NetworkWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
+    }
+
+    @Test
+    public void callbacks_failure_nullSSIDParam_nullCallback() {
+        try {
+            mWiseFy.addWPA2Network(null, WPA2_NETWORK_PASSWORD, null);
+            verify(mMockWiFiManager, never()).addNetwork(any(WifiConfiguration.class));
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_failure_missingPrerequisite() {
+        missingPrerequisite();
+
+        AddWPA2NetworkCallbacks mockCallbacks = mock(AddWPA2NetworkCallbacks.class);
+        mWiseFy.addWPA2Network(WPA2_NETWORK_SSID, WPA2_NETWORK_PASSWORD, mockCallbacks);
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).addWPA2NetworkWiseFyFailure(WiseFyCodes.MISSING_PREREQUISITE);
+        verify(mMockWiFiManager, never()).addNetwork(any(WifiConfiguration.class));
+    }
+
+    @Test
+    public void callbacks_failure_missingPrerequisite_nullCallback() {
+        missingPrerequisite();
+
+        try {
+            mWiseFy.addWPA2Network(WPA2_NETWORK_SSID, WPA2_NETWORK_PASSWORD, null);
+            verify(mMockWiFiManager, never()).addNetwork(any(WifiConfiguration.class));
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_success() {
+        when(mMockWiFiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(0);
+        AddWPA2NetworkCallbacks mockCallbacks = mock(AddWPA2NetworkCallbacks.class);
+        mWiseFy.addWPA2Network(WPA2_NETWORK_SSID, WPA2_NETWORK_PASSWORD, mockCallbacks);
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).wpa2NetworkAdded(any(WifiConfiguration.class));
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).addNetwork(any(WifiConfiguration.class));
+    }
+
+    @Test
+    public void callbacks_success_nullCallback() {
+        when(mMockWiFiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(0);
+
+        try {
+            mWiseFy.addWPA2Network(WPA2_NETWORK_SSID, WPA2_NETWORK_PASSWORD, null);
+            verify(mMockWiFiManager, never()).addNetwork(any(WifiConfiguration.class));
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_success_alreadyConfigured() {
+        networkAlreadyInConfigurationList();
+
+        AddWPA2NetworkCallbacks mockCallbacks = mock(AddWPA2NetworkCallbacks.class);
+        mWiseFy.addWPA2Network(WPA2_NETWORK_SSID, WPA2_NETWORK_PASSWORD, mockCallbacks);
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).addWPA2NetworkWiseFyFailure(WiseFyCodes.NETWORK_ALREADY_CONFIGURED);
+        verify(mMockWiFiManager, never()).addNetwork(any(WifiConfiguration.class));
+    }
+
+    @Test
+    public void callbacks_success_alreadyConfigured_nullCallback() {
+        networkAlreadyInConfigurationList();
+
+        try {
+            mWiseFy.addWPA2Network(WPA2_NETWORK_SSID, WPA2_NETWORK_PASSWORD, null);
+            verify(mMockWiFiManager, never()).addNetwork(any(WifiConfiguration.class));
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/BaseTestClass.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/BaseTestClass.java
new file mode 100644
index 00000000..070ec0d0
--- /dev/null
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/BaseTestClass.java
@@ -0,0 +1,78 @@
+package com.isupatches.wisefy;
+
+
+import android.app.Activity;
+import android.content.Intent;
+import android.net.ConnectivityManager;
+import android.net.wifi.WifiManager;
+import android.support.test.rule.ActivityTestRule;
+import com.isupatches.wisefy.base.TestActivity;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+
+public abstract class BaseTestClass<T extends Activity> extends ActivityTestRule<T> {
+
+    @Rule
+    public ActivityTestRule<TestActivity> mActivityTestRule = new ActivityTestRule<>(TestActivity.class);
+
+    ConnectivityManager mMockConnectivityManager;
+
+    protected WifiManager mMockWiFiManager;
+
+    protected WiseFy mWiseFy;
+
+    protected static final Integer VERIFICATION_TIMEOUT = 2000;
+
+    public BaseTestClass(Class<T> activityClass) {
+        super(activityClass);
+    }
+
+    @Before
+    public void setUp() {
+        mMockWiFiManager = mock(WifiManager.class);
+        mMockConnectivityManager = mock(ConnectivityManager.class);
+
+        mMockWiFiManager = mock(WifiManager.class);
+        mMockConnectivityManager = mock(ConnectivityManager.class);
+
+        mActivityTestRule.launchActivity(new Intent());
+
+        mWiseFy = new WiseFy.brains(mActivityTestRule.getActivity()).logging(true).getSmarts();
+        setManagers();
+    }
+
+    @After
+    public void tearDown() {
+        mWiseFy.dump();
+    }
+
+    /**
+     * HELPERS
+     */
+
+    public void missingPrerequisite() {
+        WiseFyPrerequisites mockPrereqs = mock(WiseFyPrerequisites.class);
+        mWiseFy.mWiseFyPrerequisites = mockPrereqs;
+        when(mockPrereqs.hasPrerequisites()).thenReturn(false);
+    }
+
+    void networkAlreadyInConfigurationList() {
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        when(mockWiseFySearch.isNetworkASavedConfiguration(anyString())).thenReturn(true);
+    }
+
+    private void setManagers() {
+        WiseFyPrerequisites mockPrereqs = mock(WiseFyPrerequisites.class);
+        mWiseFy.mWiseFyPrerequisites = mockPrereqs;
+        mWiseFy.mWiseFySearch.mWiseFyPrerequisites = mockPrereqs;
+        when(mockPrereqs.hasPrerequisites()).thenReturn(true);
+        when(mockPrereqs.getWifiManager()).thenReturn(mMockWiFiManager);
+        when(mockPrereqs.getConnectivityManager()).thenReturn(mMockConnectivityManager);
+    }
+}
\ No newline at end of file
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/ConnectToNetworkTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/ConnectToNetworkTests.java
new file mode 100644
index 00000000..e5893856
--- /dev/null
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/ConnectToNetworkTests.java
@@ -0,0 +1,222 @@
+package com.isupatches.wisefy;
+
+
+import android.net.wifi.WifiConfiguration;
+import com.isupatches.wisefy.base.TestActivity;
+import com.isupatches.wisefy.callbacks.ConnectToNetworkCallbacks;
+import com.isupatches.wisefy.constants.WiseFyCodes;
+import org.junit.Test;
+import static com.isupatches.wisefy.base.TestUtils.TEST_SSID;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+
+public class ConnectToNetworkTests extends BaseTestClass<TestActivity> {
+
+    public ConnectToNetworkTests() {
+        super(TestActivity.class);
+    }
+
+    @Test
+    public void noCallbacks_failure_nullSSIDParam() {
+        assertEquals(false, mWiseFy.connectToNetwork(null, 1));
+        verify(mMockWiFiManager, never()).enableNetwork(anyInt(), anyBoolean());
+    }
+
+    @Test
+    public void noCallbacks_failure_missingPrerequisites() {
+        missingPrerequisite();
+        assertEquals(false, mWiseFy.connectToNetwork(TEST_SSID, 1));
+        verify(mMockWiFiManager, never()).enableNetwork(anyInt(), anyBoolean());
+    }
+
+    @Test
+    public void noCallbacks_failure_noSavedNetwork() {
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        when(mockWiseFySearch.findSavedNetworkByRegex(anyString())).thenReturn(null);
+
+        assertEquals(false, mWiseFy.connectToNetwork(TEST_SSID, 1));
+        verify(mMockWiFiManager, never()).enableNetwork(anyInt(), anyBoolean());
+    }
+
+    @Test
+    public void noCallbacks_failure() {
+        WifiConfiguration wiFiConfiguration = new WifiConfiguration();
+        wiFiConfiguration.SSID = TEST_SSID;
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        when(mockWiseFySearch.findSavedNetworkByRegex(anyString())).thenReturn(wiFiConfiguration);
+
+        WiseFyConnection mockWiseFyConnection = mock(WiseFyConnection.class);
+        mWiseFy.mWiseFyConnection = mockWiseFyConnection;
+        when(mockWiseFyConnection.waitToConnectToSSID(anyString(), anyInt())).thenReturn(false);
+
+        assertEquals(false, mWiseFy.connectToNetwork(TEST_SSID, 1));
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).enableNetwork(anyInt(), anyBoolean());
+    }
+
+    @Test
+    public void noCallbacks_success() {
+        WifiConfiguration wiFiConfiguration = new WifiConfiguration();
+        wiFiConfiguration.SSID = TEST_SSID;
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        when(mockWiseFySearch.findSavedNetworkByRegex(anyString())).thenReturn(wiFiConfiguration);
+
+        WiseFyConnection mockWiseFyConnection = mock(WiseFyConnection.class);
+        mWiseFy.mWiseFyConnection = mockWiseFyConnection;
+        when(mockWiseFyConnection.waitToConnectToSSID(anyString(), anyInt())).thenReturn(true);
+
+        assertEquals(true, mWiseFy.connectToNetwork(TEST_SSID, 1));
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).enableNetwork(anyInt(), anyBoolean());
+    }
+
+    @Test
+    public void callbacks_failure_nullSSIDParam() {
+        ConnectToNetworkCallbacks mockCallbacks = mock(ConnectToNetworkCallbacks.class);
+        mWiseFy.connectToNetwork(null, 1, mockCallbacks);
+        verify(mockCallbacks, timeout(3000)).connectToNetworkWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
+        verify(mMockWiFiManager, never()).enableNetwork(anyInt(), anyBoolean());
+    }
+
+    @Test
+    public void callbacks_failure_nullSSIDParam_nullCallback() {
+        try {
+            mWiseFy.connectToNetwork(null, 1, null);
+            verify(mMockWiFiManager, never()).enableNetwork(anyInt(), anyBoolean());
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_failure_missingPrerequisites() {
+        missingPrerequisite();
+        ConnectToNetworkCallbacks mockCallbacks = mock(ConnectToNetworkCallbacks.class);
+        mWiseFy.connectToNetwork(TEST_SSID, 1, mockCallbacks);
+        verify(mockCallbacks, timeout(3000)).connectToNetworkWiseFyFailure(WiseFyCodes.MISSING_PREREQUISITE);
+        verify(mMockWiFiManager, never()).enableNetwork(anyInt(), anyBoolean());
+    }
+
+    @Test
+    public void callbacks_failure_missingPrerequisites_nullCallback() {
+        missingPrerequisite();
+        try {
+            mWiseFy.connectToNetwork(TEST_SSID, 1, null);
+            verify(mMockWiFiManager, never()).enableNetwork(anyInt(), anyBoolean());
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_failure_noSavedNetwork() {
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        when(mockWiseFySearch.findSavedNetworkByRegex(anyString())).thenReturn(null);
+
+        ConnectToNetworkCallbacks mockCallbacks = mock(ConnectToNetworkCallbacks.class);
+        mWiseFy.connectToNetwork(TEST_SSID, 1, mockCallbacks);
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).networkNotFoundToConnectTo();
+        verify(mMockWiFiManager, never()).enableNetwork(anyInt(), anyBoolean());
+    }
+
+    @Test
+    public void callbacks_failure_noSavedNetwork_nullCallback() {
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        when(mockWiseFySearch.findSavedNetworkByRegex(anyString())).thenReturn(null);
+
+        try {
+            mWiseFy.connectToNetwork(TEST_SSID, 1, null);
+            verify(mMockWiFiManager, never()).enableNetwork(anyInt(), anyBoolean());
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_failure() {
+        WifiConfiguration wiFiConfiguration = new WifiConfiguration();
+        wiFiConfiguration.SSID = TEST_SSID;
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        when(mockWiseFySearch.findSavedNetworkByRegex(anyString())).thenReturn(wiFiConfiguration);
+
+        WiseFyConnection mockWiseFyConnection = mock(WiseFyConnection.class);
+        mWiseFy.mWiseFyConnection = mockWiseFyConnection;
+        when(mockWiseFyConnection.waitToConnectToSSID(anyString(), anyInt())).thenReturn(false);
+
+        ConnectToNetworkCallbacks mockCallbacks = mock(ConnectToNetworkCallbacks.class);
+        mWiseFy.connectToNetwork(TEST_SSID, 1, mockCallbacks);
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).failureConnectingToNetwork();
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).enableNetwork(anyInt(), anyBoolean());
+    }
+
+    @Test
+    public void callbacks_failure_nullCallback() {
+        WifiConfiguration wiFiConfiguration = new WifiConfiguration();
+        wiFiConfiguration.SSID = TEST_SSID;
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        when(mockWiseFySearch.findSavedNetworkByRegex(anyString())).thenReturn(wiFiConfiguration);
+
+        WiseFyConnection mockWiseFyConnection = mock(WiseFyConnection.class);
+        mWiseFy.mWiseFyConnection = mockWiseFyConnection;
+        when(mockWiseFyConnection.waitToConnectToSSID(anyString(), anyInt())).thenReturn(false);
+
+        try {
+            mWiseFy.connectToNetwork(TEST_SSID, 1, null);
+            verify(mMockWiFiManager, never()).enableNetwork(anyInt(), anyBoolean());
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_success() {
+        WifiConfiguration wiFiConfiguration = new WifiConfiguration();
+        wiFiConfiguration.SSID = TEST_SSID;
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        when(mockWiseFySearch.findSavedNetworkByRegex(anyString())).thenReturn(wiFiConfiguration);
+
+        WiseFyConnection mockWiseFyConnection = mock(WiseFyConnection.class);
+        mWiseFy.mWiseFyConnection = mockWiseFyConnection;
+        when(mockWiseFyConnection.waitToConnectToSSID(anyString(), anyInt())).thenReturn(true);
+
+        ConnectToNetworkCallbacks mockCallbacks = mock(ConnectToNetworkCallbacks.class);
+        mWiseFy.connectToNetwork(TEST_SSID, 1, mockCallbacks);
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).connectedToNetwork();
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).enableNetwork(anyInt(), anyBoolean());
+    }
+
+    @Test
+    public void callbacks_success_nullCallback() {
+        WifiConfiguration wiFiConfiguration = new WifiConfiguration();
+        wiFiConfiguration.SSID = TEST_SSID;
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        when(mockWiseFySearch.findSavedNetworkByRegex(anyString())).thenReturn(wiFiConfiguration);
+
+        WiseFyConnection mockWiseFyConnection = mock(WiseFyConnection.class);
+        mWiseFy.mWiseFyConnection = mockWiseFyConnection;
+        when(mockWiseFyConnection.waitToConnectToSSID(anyString(), anyInt())).thenReturn(true);
+
+        try {
+            mWiseFy.connectToNetwork(TEST_SSID, 1, null);
+            verify(mMockWiFiManager, never()).enableNetwork(anyInt(), anyBoolean());
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+}
\ No newline at end of file
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/DisableWifiTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/DisableWifiTests.java
new file mode 100644
index 00000000..9afbe40d
--- /dev/null
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/DisableWifiTests.java
@@ -0,0 +1,104 @@
+package com.isupatches.wisefy;
+
+
+import com.isupatches.wisefy.base.TestActivity;
+import com.isupatches.wisefy.callbacks.DisableWifiCallbacks;
+import com.isupatches.wisefy.constants.WiseFyCodes;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+
+public class DisableWifiTests extends BaseTestClass<TestActivity> {
+
+    public DisableWifiTests() {
+        super(TestActivity.class);
+    }
+
+    @Test
+    public void noCallbacks_failure() {
+        when(mMockWiFiManager.setWifiEnabled(anyBoolean())).thenReturn(false);
+        assertEquals(false, mWiseFy.disableWifi());
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).setWifiEnabled(false);
+    }
+
+    @Test
+    public void noCallbacks_failure_missingPrerequisite() {
+        missingPrerequisite();
+        assertEquals(false, mWiseFy.disableWifi());
+        verify(mMockWiFiManager, never()).setWifiEnabled(false);
+    }
+
+    @Test
+    public void noCallbacks_success() {
+        when(mMockWiFiManager.setWifiEnabled(anyBoolean())).thenReturn(true);
+        assertEquals(true, mWiseFy.disableWifi());
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).setWifiEnabled(false);
+    }
+
+    @Test
+    public void callbacks_failure() {
+        when(mMockWiFiManager.setWifiEnabled(anyBoolean())).thenReturn(false);
+        DisableWifiCallbacks mockCallbacks = mock(DisableWifiCallbacks.class);
+        mWiseFy.disableWifi(mockCallbacks);
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).setWifiEnabled(false);
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).failureDisablingWifi();
+    }
+
+    @Test
+    public void callbacks_failure_nullCallback() {
+        when(mMockWiFiManager.setWifiEnabled(anyBoolean())).thenReturn(false);
+        try {
+            mWiseFy.disableWifi(null);
+            verify(mMockWiFiManager, never()).setWifiEnabled(false);
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_failure_missingPrerequisite() {
+        missingPrerequisite();
+        DisableWifiCallbacks mockCallbacks = mock(DisableWifiCallbacks.class);
+        mWiseFy.disableWifi(mockCallbacks);
+        verify(mMockWiFiManager, never()).setWifiEnabled(false);
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).disableWifiWiseFyFailure(WiseFyCodes.MISSING_PREREQUISITE);
+    }
+
+    @Test
+    public void callbacks_failure_missingPrerequisite_nullCallback() {
+        missingPrerequisite();
+        try {
+            mWiseFy.disableWifi(null);
+            verify(mMockWiFiManager, never()).setWifiEnabled(false);
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_success() {
+        when(mMockWiFiManager.setWifiEnabled(anyBoolean())).thenReturn(true);
+        DisableWifiCallbacks mockCallbacks = mock(DisableWifiCallbacks.class);
+        mWiseFy.disableWifi(mockCallbacks);
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).setWifiEnabled(false);
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).wifiDisabled();
+    }
+
+    @Test
+    public void callbacks_success_nullCallback() {
+        when(mMockWiFiManager.setWifiEnabled(anyBoolean())).thenReturn(true);
+        try {
+            mWiseFy.disableWifi(null);
+            verify(mMockWiFiManager, never()).setWifiEnabled(false);
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/DisconnectFromCurrentNetworkTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/DisconnectFromCurrentNetworkTests.java
new file mode 100644
index 00000000..d26f12a4
--- /dev/null
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/DisconnectFromCurrentNetworkTests.java
@@ -0,0 +1,103 @@
+package com.isupatches.wisefy;
+
+
+import com.isupatches.wisefy.base.TestActivity;
+import com.isupatches.wisefy.callbacks.DisconnectFromCurrentNetworkCallbacks;
+import com.isupatches.wisefy.constants.WiseFyCodes;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+
+public class DisconnectFromCurrentNetworkTests extends BaseTestClass<TestActivity> {
+
+    public DisconnectFromCurrentNetworkTests() {
+        super(TestActivity.class);
+    }
+
+    @Test
+    public void noCallbacks_failure() {
+        when(mMockWiFiManager.disconnect()).thenReturn(false);
+        assertEquals(false, mWiseFy.disconnectFromCurrentNetwork());
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).disconnect();
+    }
+
+    @Test
+    public void noCallbacks_failure_missingPrerequisite() {
+        missingPrerequisite();
+        assertEquals(false, mWiseFy.disconnectFromCurrentNetwork());
+        verify(mMockWiFiManager, never()).disconnect();
+    }
+
+    @Test
+    public void noCallbacks_success() {
+        when(mMockWiFiManager.disconnect()).thenReturn(true);
+        assertEquals(true, mWiseFy.disconnectFromCurrentNetwork());
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).disconnect();
+    }
+
+    @Test
+    public void callbacks_failure() {
+        when(mMockWiFiManager.disconnect()).thenReturn(false);
+        DisconnectFromCurrentNetworkCallbacks mockCallbacks = mock(DisconnectFromCurrentNetworkCallbacks.class);
+        mWiseFy.disconnectFromCurrentNetwork(mockCallbacks);
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).disconnect();
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).failureDisconnectingFromCurrentNetwork();
+    }
+
+    @Test
+    public void callbacks_failure_nullCallback() {
+        when(mMockWiFiManager.disconnect()).thenReturn(false);
+        try {
+            mWiseFy.disconnectFromCurrentNetwork(null);
+            verify(mMockWiFiManager, never()).disconnect();
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_failure_missingPrerequisite() {
+        missingPrerequisite();
+        DisconnectFromCurrentNetworkCallbacks mockCallbacks = mock(DisconnectFromCurrentNetworkCallbacks.class);
+        mWiseFy.disconnectFromCurrentNetwork(mockCallbacks);
+        verify(mMockWiFiManager, never()).disconnect();
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).disconnectFromCurrentNetworkWiseFyFailure(WiseFyCodes.MISSING_PREREQUISITE);
+    }
+
+    @Test
+    public void callbacks_failure_missingPrerequisite_nullCallback() {
+        missingPrerequisite();
+        try {
+            mWiseFy.disconnectFromCurrentNetwork(null);
+            verify(mMockWiFiManager, never()).disconnect();
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_success() {
+        when(mMockWiFiManager.disconnect()).thenReturn(true);
+        DisconnectFromCurrentNetworkCallbacks mockCallbacks = mock(DisconnectFromCurrentNetworkCallbacks.class);
+        mWiseFy.disconnectFromCurrentNetwork(mockCallbacks);
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).disconnect();
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).disconnectedFromCurrentNetwork();
+    }
+
+    @Test
+    public void callbacks_success_nullCallback() {
+        when(mMockWiFiManager.disconnect()).thenReturn(true);
+        try {
+            mWiseFy.disconnectFromCurrentNetwork(null);
+            verify(mMockWiFiManager, never()).disconnect();
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/EnableWifiTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/EnableWifiTests.java
new file mode 100644
index 00000000..f962b3e7
--- /dev/null
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/EnableWifiTests.java
@@ -0,0 +1,104 @@
+package com.isupatches.wisefy;
+
+
+import com.isupatches.wisefy.base.TestActivity;
+import com.isupatches.wisefy.callbacks.EnableWifiCallbacks;
+import com.isupatches.wisefy.constants.WiseFyCodes;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+
+public class EnableWifiTests extends BaseTestClass<TestActivity> {
+
+    public EnableWifiTests() {
+        super(TestActivity.class);
+    }
+
+    @Test
+    public void noCallbacks_failure() {
+        when(mMockWiFiManager.setWifiEnabled(anyBoolean())).thenReturn(false);
+        assertEquals(false, mWiseFy.enableWifi());
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).setWifiEnabled(true);
+    }
+
+    @Test
+    public void noCallbacks_failure_missingPrerequisite() {
+        missingPrerequisite();
+        assertEquals(false, mWiseFy.enableWifi());
+        verify(mMockWiFiManager, never()).setWifiEnabled(true);
+    }
+
+    @Test
+    public void noCallbacks_success() {
+        when(mMockWiFiManager.setWifiEnabled(anyBoolean())).thenReturn(true);
+        assertEquals(true, mWiseFy.enableWifi());
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).setWifiEnabled(true);
+    }
+
+    @Test
+    public void callbacks_failure() {
+        when(mMockWiFiManager.setWifiEnabled(anyBoolean())).thenReturn(false);
+        EnableWifiCallbacks mockCallbacks = mock(EnableWifiCallbacks.class);
+        mWiseFy.enableWifi(mockCallbacks);
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).setWifiEnabled(true);
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).failureEnablingWifi();
+    }
+
+    @Test
+    public void callbacks_failure_nullCallback() {
+        when(mMockWiFiManager.setWifiEnabled(anyBoolean())).thenReturn(false);
+        try {
+            mWiseFy.enableWifi(null);
+            verify(mMockWiFiManager, never()).setWifiEnabled(true);
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_failure_missingPrerequisite() {
+        missingPrerequisite();
+        EnableWifiCallbacks mockCallbacks = mock(EnableWifiCallbacks.class);
+        mWiseFy.enableWifi(mockCallbacks);
+        verify(mMockWiFiManager, never()).setWifiEnabled(true);
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).enableWifiWiseFyFailure(WiseFyCodes.MISSING_PREREQUISITE);
+    }
+
+    @Test
+    public void callbacks_failure_missingPrerequisite_nullCallback() {
+        missingPrerequisite();
+        try {
+            mWiseFy.enableWifi(null);
+            verify(mMockWiFiManager, never()).setWifiEnabled(true);
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_success() {
+        when(mMockWiFiManager.setWifiEnabled(anyBoolean())).thenReturn(true);
+        EnableWifiCallbacks mockCallbacks = mock(EnableWifiCallbacks.class);
+        mWiseFy.enableWifi(mockCallbacks);
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).setWifiEnabled(true);
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).wifiEnabled();
+    }
+
+    @Test
+    public void callbacks_success_nullCallback() {
+        when(mMockWiFiManager.setWifiEnabled(anyBoolean())).thenReturn(true);
+        try {
+            mWiseFy.enableWifi(null);
+            verify(mMockWiFiManager, never()).setWifiEnabled(true);
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/GetCurrentNetworkTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/GetCurrentNetworkTests.java
new file mode 100644
index 00000000..6acdfd66
--- /dev/null
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/GetCurrentNetworkTests.java
@@ -0,0 +1,87 @@
+package com.isupatches.wisefy;
+
+
+import android.net.wifi.WifiInfo;
+import com.isupatches.wisefy.base.TestActivity;
+import com.isupatches.wisefy.callbacks.GetCurrentNetworkCallbacks;
+import com.isupatches.wisefy.constants.WiseFyCodes;
+import org.junit.Test;
+import static com.isupatches.wisefy.base.TestUtils.TEST_SSID;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+
+public class GetCurrentNetworkTests extends BaseTestClass<TestActivity> {
+
+    public GetCurrentNetworkTests() {
+        super(TestActivity.class);
+    }
+
+    @Test
+    public void noCallbacks_failure_missingPrerequisite() {
+        missingPrerequisite();
+        assertEquals(null, mWiseFy.getCurrentNetwork());
+        verify(mMockWiFiManager, never()).getConnectionInfo();
+    }
+
+    @Test
+    public void noCallbacks_success() {
+        WifiInfo mockWifiInfo = mock(WifiInfo.class);
+        when(mockWifiInfo.getSSID()).thenReturn(TEST_SSID);
+        when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWifiInfo);
+
+        assertEquals(TEST_SSID, mWiseFy.getCurrentNetwork().getSSID());
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).getConnectionInfo();
+    }
+
+    @Test
+    public void callbacks_failure_missingPrerequisite() {
+        missingPrerequisite();
+        GetCurrentNetworkCallbacks mockCallbacks = mock(GetCurrentNetworkCallbacks.class);
+        mWiseFy.getCurrentNetwork(mockCallbacks);
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).getCurrentNetworkWiseFyFailure(WiseFyCodes.MISSING_PREREQUISITE);
+        verify(mMockWiFiManager, never()).getConnectionInfo();
+    }
+
+    @Test
+    public void callbacks_failure_missingPrerequisite_nullCallbacks() {
+        missingPrerequisite();
+        try {
+            mWiseFy.getCurrentNetwork(null);
+            verify(mMockWiFiManager, never()).getConnectionInfo();
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_success() {
+        WifiInfo mockWifiInfo = mock(WifiInfo.class);
+        when(mockWifiInfo.getSSID()).thenReturn(TEST_SSID);
+        when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWifiInfo);
+
+        GetCurrentNetworkCallbacks mockCallbacks = mock(GetCurrentNetworkCallbacks.class);
+        mWiseFy.getCurrentNetwork(mockCallbacks);
+        verify(mockCallbacks, timeout(2000)).retrievedCurrentNetwork(mockWifiInfo);
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).getConnectionInfo();
+    }
+
+    @Test
+    public void callbacks_success_nullCallback() {
+        WifiInfo mockWifiInfo = mock(WifiInfo.class);
+        when(mockWifiInfo.getSSID()).thenReturn(TEST_SSID);
+        when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWifiInfo);
+
+        try {
+            mWiseFy.getCurrentNetwork(null);
+            verify(mMockWiFiManager, never()).getConnectionInfo();
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/GetFrequencyTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/GetFrequencyTests.java
similarity index 63%
rename from wisefy/src/androidTest/java/com/isupatches/wisefy/test/GetFrequencyTests.java
rename to wisefy/src/androidTest/java/com/isupatches/wisefy/GetFrequencyTests.java
index 29c1b7cc..3963809e 100644
--- a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/GetFrequencyTests.java
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/GetFrequencyTests.java
@@ -1,17 +1,16 @@
-package com.isupatches.wisefy.test;
+package com.isupatches.wisefy;
 
 
 import android.net.wifi.WifiInfo;
 import android.os.Build;
+import com.isupatches.wisefy.base.TestActivity;
 import com.isupatches.wisefy.callbacks.GetFrequencyCallbacks;
 import com.isupatches.wisefy.constants.WiseFyCodes;
-import com.isupatches.wisefy.test.base.BaseTestClass;
-import com.isupatches.wisefy.test.base.TestActivity;
 import org.junit.Test;
-import static com.isupatches.wisefy.test.base.TestUtils.TEST_NETWORK_FREQUENCY_24GHZ;
+import static com.isupatches.wisefy.base.TestUtils.TEST_NETWORK_FREQUENCY_24GHZ;
 import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.fail;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.timeout;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -26,7 +25,6 @@ public GetFrequencyTests() {
     @Test
     public void noCallbacks_getFrequency_currentNetwork_failure() {
         if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            setManagers();
             when(mMockWiFiManager.getConnectionInfo()).thenReturn(null);
             assertEquals(null, mWiseFy.getFrequency());
         }
@@ -35,66 +33,66 @@ public void noCallbacks_getFrequency_currentNetwork_failure() {
     @Test
     public void noCallbacks_getFrequency_currentNetwork_success() {
         if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            setManagers();
             WifiInfo mockWifiInfo = mock(WifiInfo.class);
             when(mockWifiInfo.getFrequency()).thenReturn(TEST_NETWORK_FREQUENCY_24GHZ);
             when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWifiInfo);
             assertEquals(TEST_NETWORK_FREQUENCY_24GHZ, (int) mWiseFy.getFrequency());
+            verify(mockWifiInfo, timeout(VERIFICATION_TIMEOUT)).getFrequency();
         }
     }
 
     @Test
     public void callbacks_getFrequency_currentNetwork_failure() {
         if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            setManagers();
             when(mMockWiFiManager.getConnectionInfo()).thenReturn(null);
-            GetFrequencyCallbacks mockGetFrequencyCallbacks = mock(GetFrequencyCallbacks.class);
-            mWiseFy.getFrequency(mockGetFrequencyCallbacks);
-            verify(mockGetFrequencyCallbacks, timeout(2000)).failureGettingFrequency();
+            GetFrequencyCallbacks mockCallbacks = mock(GetFrequencyCallbacks.class);
+            mWiseFy.getFrequency(mockCallbacks);
+            verify(mockCallbacks, timeout(2000)).failureGettingFrequency();
         }
     }
 
     @Test
     public void callbacks_getFrequency_currentNetwork_failure_nullCallback() {
         if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            setManagers();
             when(mMockWiFiManager.getConnectionInfo()).thenReturn(null);
-            GetFrequencyCallbacks mockGetFrequencyCallbacks = mock(GetFrequencyCallbacks.class);
-            mWiseFy.getFrequency((GetFrequencyCallbacks) null);
-            verify(mockGetFrequencyCallbacks, never()).failureGettingFrequency();
+            try {
+                mWiseFy.getFrequency((GetFrequencyCallbacks) null);
+            } catch (NullPointerException npe) {
+                fail();
+            }
         }
     }
 
     @Test
     public void callbacks_getFrequency_currentNetwork_success() {
         if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            setManagers();
             WifiInfo mockWifiInfo = mock(WifiInfo.class);
             when(mockWifiInfo.getFrequency()).thenReturn(TEST_NETWORK_FREQUENCY_24GHZ);
             when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWifiInfo);
-            GetFrequencyCallbacks mockGetFrequencyCallbacks = mock(GetFrequencyCallbacks.class);
-            mWiseFy.getFrequency(mockGetFrequencyCallbacks);
-            verify(mockGetFrequencyCallbacks, timeout(2000)).retrievedFrequency(TEST_NETWORK_FREQUENCY_24GHZ);
+            GetFrequencyCallbacks mockCallbacks = mock(GetFrequencyCallbacks.class);
+            mWiseFy.getFrequency(mockCallbacks);
+            verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).retrievedFrequency(TEST_NETWORK_FREQUENCY_24GHZ);
+            verify(mockWifiInfo, timeout(VERIFICATION_TIMEOUT)).getFrequency();
         }
     }
 
     @Test
     public void callbacks_getFrequency_currentNetwork_success_nullCallback() {
         if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            setManagers();
             WifiInfo mockWifiInfo = mock(WifiInfo.class);
             when(mockWifiInfo.getFrequency()).thenReturn(TEST_NETWORK_FREQUENCY_24GHZ);
             when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWifiInfo);
-            GetFrequencyCallbacks mockGetFrequencyCallbacks = mock(GetFrequencyCallbacks.class);
-            mWiseFy.getFrequency((GetFrequencyCallbacks) null);
-            verify(mockGetFrequencyCallbacks, never()).retrievedFrequency(TEST_NETWORK_FREQUENCY_24GHZ);
+            try {
+                mWiseFy.getFrequency((GetFrequencyCallbacks) null);
+            } catch (NullPointerException npe) {
+                fail();
+            }
         }
     }
 
     @Test
     public void noCallbacks_getFrequency_provideWifiInfo_failure() {
         if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            setManagers();
             when(mMockWiFiManager.getConnectionInfo()).thenReturn(null);
             assertEquals(null, mWiseFy.getFrequency((WifiInfo) null));
         }
@@ -103,7 +101,6 @@ public void noCallbacks_getFrequency_provideWifiInfo_failure() {
     @Test
     public void noCallbacks_getFrequency_provideWifiInfo_success() {
         if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            setManagers();
             WifiInfo mockWifiInfo = mock(WifiInfo.class);
             when(mockWifiInfo.getFrequency()).thenReturn(TEST_NETWORK_FREQUENCY_24GHZ);
             when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWifiInfo);
@@ -114,48 +111,48 @@ public void noCallbacks_getFrequency_provideWifiInfo_success() {
     @Test
     public void callbacks_getFrequency_provideWifiInfo_failure() {
         if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            setManagers();
             when(mMockWiFiManager.getConnectionInfo()).thenReturn(null);
-            GetFrequencyCallbacks mockGetFrequencyCallbacks = mock(GetFrequencyCallbacks.class);
-            mWiseFy.getFrequency(null, mockGetFrequencyCallbacks);
-            verify(mockGetFrequencyCallbacks, timeout(2000)).getFrequencyWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
+            GetFrequencyCallbacks mockCallbacks = mock(GetFrequencyCallbacks.class);
+            mWiseFy.getFrequency(null, mockCallbacks);
+            verify(mockCallbacks, timeout(2000)).getFrequencyWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
         }
     }
 
     @Test
     public void callbacks_getFrequency_provideWifiInfo_failure_nullCallback() {
         if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            setManagers();
             when(mMockWiFiManager.getConnectionInfo()).thenReturn(null);
-            GetFrequencyCallbacks mockGetFrequencyCallbacks = mock(GetFrequencyCallbacks.class);
-            mWiseFy.getFrequency(null, null);
-            verify(mockGetFrequencyCallbacks, never()).failureGettingFrequency();
+            try {
+                mWiseFy.getFrequency(null, null);
+            } catch (NullPointerException npe) {
+                fail();
+            }
         }
     }
 
     @Test
     public void callbacks_getFrequency_provideWifiInfo_success() {
         if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            setManagers();
             WifiInfo mockWifiInfo = mock(WifiInfo.class);
             when(mockWifiInfo.getFrequency()).thenReturn(TEST_NETWORK_FREQUENCY_24GHZ);
             when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWifiInfo);
-            GetFrequencyCallbacks mockGetFrequencyCallbacks = mock(GetFrequencyCallbacks.class);
-            mWiseFy.getFrequency(mockWifiInfo, mockGetFrequencyCallbacks);
-            verify(mockGetFrequencyCallbacks, timeout(2000)).retrievedFrequency(TEST_NETWORK_FREQUENCY_24GHZ);
+            GetFrequencyCallbacks mockCallbacks = mock(GetFrequencyCallbacks.class);
+            mWiseFy.getFrequency(mockWifiInfo, mockCallbacks);
+            verify(mockCallbacks, timeout(2000)).retrievedFrequency(TEST_NETWORK_FREQUENCY_24GHZ);
         }
     }
 
     @Test
     public void callbacks_getFrequency_provideWifiInfo_success_nullCallback() {
         if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            setManagers();
             WifiInfo mockWifiInfo = mock(WifiInfo.class);
             when(mockWifiInfo.getFrequency()).thenReturn(TEST_NETWORK_FREQUENCY_24GHZ);
             when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWifiInfo);
-            GetFrequencyCallbacks mockGetFrequencyCallbacks = mock(GetFrequencyCallbacks.class);
-            mWiseFy.getFrequency(mockWifiInfo, null);
-            verify(mockGetFrequencyCallbacks, never()).retrievedFrequency(TEST_NETWORK_FREQUENCY_24GHZ);
+            try {
+                mWiseFy.getFrequency(mockWifiInfo, null);
+            } catch (NullPointerException npe) {
+                fail();
+            }
         }
     }
 }
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/GetNearbyAccessPointsTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/GetNearbyAccessPointsTests.java
new file mode 100644
index 00000000..df07acfc
--- /dev/null
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/GetNearbyAccessPointsTests.java
@@ -0,0 +1,210 @@
+package com.isupatches.wisefy;
+
+
+import android.net.wifi.ScanResult;
+import com.isupatches.wisefy.base.TestActivity;
+import com.isupatches.wisefy.callbacks.GetNearbyAccessPointsCallbacks;
+import com.isupatches.wisefy.constants.WiseFyCodes;
+import org.junit.Test;
+import org.mockito.ArgumentMatchers;
+import java.util.ArrayList;
+import java.util.List;
+import static com.isupatches.wisefy.base.TestUtils.TEST_SSID;
+import static com.isupatches.wisefy.base.TestUtils.TEST_SSID2;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+
+public class GetNearbyAccessPointsTests extends BaseTestClass<TestActivity> {
+
+    public GetNearbyAccessPointsTests() {
+        super(TestActivity.class);
+    }
+
+    @Test
+    public void noCallbacks_failure_missingPrerequisite_filterDuplicates_false() {
+        missingPrerequisite();
+        assertEquals(null, mWiseFy.getNearbyAccessPoints(false));
+        verify(mMockWiFiManager, never()).getScanResults();
+    }
+
+    @Test
+    public void noCallbacks_failure_missingPrerequisite_filterDuplicates_true() {
+        missingPrerequisite();
+        assertEquals(null, mWiseFy.getNearbyAccessPoints(true));
+        verify(mMockWiFiManager, never()).getScanResults();
+    }
+
+    @Test
+    public void noCallbacks_success_filterDuplicates_false() {
+        List<ScanResult> scanResults = new ArrayList<>();
+        ScanResult scanResult1 = mock(ScanResult.class);
+        scanResult1.SSID = TEST_SSID;
+        scanResult1.level = -35;
+        scanResults.add(scanResult1);
+        ScanResult scanResult2 = mock(ScanResult.class);
+        scanResult2.SSID = TEST_SSID2;
+        scanResult2.level = -70;
+        scanResults.add(scanResult2);
+
+        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
+
+        List<ScanResult> accessPoints = mWiseFy.getNearbyAccessPoints(false);
+        assertEquals(accessPoints, scanResults);
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).getScanResults();
+    }
+
+    @Test
+    public void noCallbacks_success_filterDuplicates_true() {
+        List<ScanResult> scanResults = new ArrayList<>();
+        ScanResult scanResult1 = mock(ScanResult.class);
+        scanResult1.SSID = TEST_SSID;
+        scanResult1.level = -35;
+        scanResults.add(scanResult1);
+        ScanResult scanResult2 = mock(ScanResult.class);
+        scanResult2.SSID = TEST_SSID2;
+        scanResult2.level = -70;
+        scanResults.add(scanResult2);
+
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        when(mockWiseFySearch.removeEntriesWithLowerSignalStrength(ArgumentMatchers.<ScanResult>anyList())).thenReturn(scanResults);
+
+        List<ScanResult> accessPoints = mWiseFy.getNearbyAccessPoints(true);
+        assertEquals(accessPoints, scanResults);
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).getScanResults();
+    }
+
+    @Test
+    public void callbacks_failure_missingPrerequisite_filterDuplicates_false() {
+        missingPrerequisite();
+        GetNearbyAccessPointsCallbacks mockCallbacks = mock(GetNearbyAccessPointsCallbacks.class);
+        mWiseFy.getNearbyAccessPoints(false, mockCallbacks);
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).getNearbyAccessPointsWiseFyFailure(WiseFyCodes.MISSING_PREREQUISITE);
+        verify(mMockWiFiManager, never()).getScanResults();
+    }
+
+    @Test
+    public void callbacks_failure_missingPrerequisite_filterDuplicates_false_nullCallback() {
+        missingPrerequisite();
+        try {
+            mWiseFy.getNearbyAccessPoints(false, null);
+            verify(mMockWiFiManager, never()).getScanResults();
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_failure_missingPrerequisite_filterDuplicates_true() {
+        missingPrerequisite();
+        GetNearbyAccessPointsCallbacks mockCallbacks = mock(GetNearbyAccessPointsCallbacks.class);
+        mWiseFy.getNearbyAccessPoints(true, mockCallbacks);
+        verify(mockCallbacks, timeout(3000)).getNearbyAccessPointsWiseFyFailure(WiseFyCodes.MISSING_PREREQUISITE);
+        verify(mMockWiFiManager, never()).getScanResults();
+    }
+
+    @Test
+    public void callbacks_failure_missingPrerequisite_filterDuplicates_true_nullCallback() {
+        missingPrerequisite();
+        try {
+            mWiseFy.getNearbyAccessPoints(true, null);
+            verify(mMockWiFiManager, never()).getScanResults();
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_success_filterDuplicates_false() {
+        List<ScanResult> scanResults = new ArrayList<>();
+        ScanResult scanResult1 = mock(ScanResult.class);
+        scanResult1.SSID = TEST_SSID;
+        scanResult1.level = -35;
+        scanResults.add(scanResult1);
+        ScanResult scanResult2 = mock(ScanResult.class);
+        scanResult2.SSID = TEST_SSID2;
+        scanResult2.level = -70;
+        scanResults.add(scanResult2);
+
+        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
+
+        GetNearbyAccessPointsCallbacks mockCallbacks = mock(GetNearbyAccessPointsCallbacks.class);
+        mWiseFy.getNearbyAccessPoints(false, mockCallbacks);
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).retrievedNearbyAccessPoints(scanResults);
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).getScanResults();
+    }
+
+    @Test
+    public void callbacks_success_filterDuplicates_false_nullCallback() {
+        List<ScanResult> scanResults = new ArrayList<>();
+        ScanResult scanResult1 = mock(ScanResult.class);
+        scanResult1.SSID = TEST_SSID;
+        scanResult1.level = -35;
+        scanResults.add(scanResult1);
+        ScanResult scanResult2 = mock(ScanResult.class);
+        scanResult2.SSID = TEST_SSID2;
+        scanResult2.level = -70;
+        scanResults.add(scanResult2);
+
+        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
+
+        try {
+            mWiseFy.getNearbyAccessPoints(false, null);
+            verify(mMockWiFiManager, never()).getScanResults();
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_success_filterDuplicates_true() {
+        List<ScanResult> scanResults = new ArrayList<>();
+        ScanResult scanResult1 = mock(ScanResult.class);
+        scanResult1.SSID = TEST_SSID;
+        scanResult1.level = -35;
+        scanResults.add(scanResult1);
+        ScanResult scanResult2 = mock(ScanResult.class);
+        scanResult2.SSID = TEST_SSID2;
+        scanResult2.level = -70;
+        scanResults.add(scanResult2);
+
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        when(mockWiseFySearch.removeEntriesWithLowerSignalStrength(ArgumentMatchers.<ScanResult>anyList())).thenReturn(scanResults);
+
+        GetNearbyAccessPointsCallbacks mockCallbacks = mock(GetNearbyAccessPointsCallbacks.class);
+        mWiseFy.getNearbyAccessPoints(true, mockCallbacks);
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).retrievedNearbyAccessPoints(scanResults);
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).getScanResults();
+    }
+
+    @Test
+    public void callbacks_success_filterDuplicates_true_nullCallback() {
+        List<ScanResult> scanResults = new ArrayList<>();
+        ScanResult scanResult1 = mock(ScanResult.class);
+        scanResult1.SSID = TEST_SSID;
+        scanResult1.level = -35;
+        scanResults.add(scanResult1);
+        ScanResult scanResult2 = mock(ScanResult.class);
+        scanResult2.SSID = TEST_SSID2;
+        scanResult2.level = -70;
+        scanResults.add(scanResult2);
+
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        when(mockWiseFySearch.removeEntriesWithLowerSignalStrength(ArgumentMatchers.<ScanResult>anyList())).thenReturn(scanResults);
+
+        try {
+            mWiseFy.getNearbyAccessPoints(true, null);
+            verify(mMockWiFiManager, never()).getScanResults();
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+}
\ No newline at end of file
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/GetRSSITests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/GetRSSITests.java
new file mode 100644
index 00000000..a1405794
--- /dev/null
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/GetRSSITests.java
@@ -0,0 +1,264 @@
+package com.isupatches.wisefy;
+
+
+import android.net.wifi.ScanResult;
+import com.isupatches.wisefy.base.TestActivity;
+import com.isupatches.wisefy.callbacks.GetRSSICallbacks;
+import com.isupatches.wisefy.constants.WiseFyCodes;
+import org.junit.Test;
+import static com.isupatches.wisefy.base.TestUtils.TEST_RSSI_LEVEL;
+import static com.isupatches.wisefy.base.TestUtils.TEST_SSID;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.fail;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+
+public class GetRSSITests extends BaseTestClass<TestActivity> {
+
+    public GetRSSITests() {
+        super(TestActivity.class);
+    }
+
+    @Test
+    public void noCallbacks_failure_takeHighest_false_nullSSIDParam() {
+        assertEquals(null, mWiseFy.getRSSI(null, false, 1000));
+    }
+
+    @Test
+    public void noCallbacks_failure_takeHighest_true_nullSSIDParam() {
+        assertEquals(null, mWiseFy.getRSSI(null, true, 1000));
+    }
+
+    @Test
+    public void noCallbacks_failure_takeHighest_false_missingPrerequisite() {
+        missingPrerequisite();
+        assertEquals(null, mWiseFy.getRSSI(TEST_SSID, false, 1000));
+    }
+
+    @Test
+    public void noCallbacks_failure_takeHighest_true_missingPrerequisite() {
+        missingPrerequisite();
+        assertEquals(null, mWiseFy.getRSSI(TEST_SSID, true, 1000));
+    }
+
+    @Test
+    public void noCallbacks_failure_takeHighest_false_noNetworkFound() {
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        when(mockWiseFySearch.findAccessPointByRegex(anyString(), anyInt(), anyBoolean())).thenReturn(null);
+
+        assertEquals(null, mWiseFy.getRSSI(TEST_SSID, false, 1000));
+    }
+
+    @Test
+    public void noCallbacks_failure_takeHighest_true_noNetworkFound() {
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        when(mockWiseFySearch.findAccessPointByRegex(anyString(), anyInt(), anyBoolean())).thenReturn(null);
+
+        assertEquals(null, mWiseFy.getRSSI(TEST_SSID, true, 1000));
+    }
+
+    @Test
+    public void noCallbacks_success_takeHighest_false () {
+        ScanResult accessPoint = mock(ScanResult.class);
+        accessPoint.level = TEST_RSSI_LEVEL;
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        when(mockWiseFySearch.findAccessPointByRegex(anyString(), anyInt(), anyBoolean())).thenReturn(accessPoint);
+
+        assertEquals(TEST_RSSI_LEVEL, (int) mWiseFy.getRSSI(TEST_SSID, false, 1000));
+
+    }
+
+    @Test
+    public void noCallbacks_success_takeHighest_true () {
+        ScanResult accessPoint = mock(ScanResult.class);
+        accessPoint.level = TEST_RSSI_LEVEL;
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        when(mockWiseFySearch.findAccessPointByRegex(anyString(), anyInt(), anyBoolean())).thenReturn(accessPoint);
+
+        assertEquals(TEST_RSSI_LEVEL, (int) mWiseFy.getRSSI(TEST_SSID, true, 1000));
+    }
+
+    @Test
+    public void callbacks_failure_takeHighest_false_nullSSIDParam() {
+        GetRSSICallbacks mockCallbacks = mock(GetRSSICallbacks.class);
+        mWiseFy.getRSSI(null, false, 1000, mockCallbacks);
+        verify(mockCallbacks, timeout(2000)).getRSSIWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
+    }
+
+    @Test
+    public void callbacks_failure_takeHighest_false_nullSSIDParam_nullCallback() {
+        try {
+            mWiseFy.getRSSI(null, false, 1000, null);
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_failure_takeHighest_true_nullSSIDParam() {
+        GetRSSICallbacks mockCallbacks = mock(GetRSSICallbacks.class);
+        mWiseFy.getRSSI(null, true, 1000, mockCallbacks);
+        verify(mockCallbacks, timeout(2000)).getRSSIWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
+    }
+
+    @Test
+    public void callbacks_failure_takeHighest_true_nullSSIDParam_nullCallback() {
+        try {
+            mWiseFy.getRSSI(null, true, 1000, null);
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_failure_takeHighest_false_missingPrerequisite() {
+        missingPrerequisite();
+        GetRSSICallbacks mockCallbacks = mock(GetRSSICallbacks.class);
+        mWiseFy.getRSSI(TEST_SSID, false, 1000, mockCallbacks);
+        verify(mockCallbacks, timeout(2000)).getRSSIWiseFyFailure(WiseFyCodes.MISSING_PREREQUISITE);
+    }
+
+    @Test
+    public void callbacks_failure_takeHighest_false_nullSSIDParam_missingPrerequisite() {
+        missingPrerequisite();
+        try {
+            mWiseFy.getRSSI(TEST_SSID, false, 1000, null);
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_failure_takeHighest_true_missingPrerequisite() {
+        missingPrerequisite();
+        GetRSSICallbacks mockCallbacks = mock(GetRSSICallbacks.class);
+        mWiseFy.getRSSI(TEST_SSID, true, 1000, mockCallbacks);
+        verify(mockCallbacks, timeout(2000)).getRSSIWiseFyFailure(WiseFyCodes.MISSING_PREREQUISITE);
+    }
+
+    @Test
+    public void callbacks_failure_takeHighest_true_nullSSIDParam_missingPrerequisite() {
+        missingPrerequisite();
+        try {
+            mWiseFy.getRSSI(TEST_SSID, true, 1000, null);
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_failure_takeHighest_false_noNetworkFound() {
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        when(mockWiseFySearch.findAccessPointByRegex(anyString(), anyInt(), anyBoolean())).thenReturn(null);
+
+        GetRSSICallbacks mockCallbacks = mock(GetRSSICallbacks.class);
+        mWiseFy.getRSSI(TEST_SSID, false, 1000, mockCallbacks);
+        verify(mockCallbacks, timeout(2000)).networkNotFoundToRetrieveRSSI();
+    }
+
+    @Test
+    public void callbacks_failure_takeHighest_false_noNetworkFound_nullCallback() {
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        when(mockWiseFySearch.findAccessPointByRegex(anyString(), anyInt(), anyBoolean())).thenReturn(null);
+
+        try {
+            mWiseFy.getRSSI(TEST_SSID, false, 1000, null);
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_failure_takeHighest_true_noNetworkFound() {
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        when(mockWiseFySearch.findAccessPointByRegex(anyString(), anyInt(), anyBoolean())).thenReturn(null);
+
+        GetRSSICallbacks mockCallbacks = mock(GetRSSICallbacks.class);
+        mWiseFy.getRSSI(TEST_SSID, true, 1000, mockCallbacks);
+        verify(mockCallbacks, timeout(2000)).networkNotFoundToRetrieveRSSI();
+    }
+
+    @Test
+    public void callbacks_failure_takeHighest_true_noNetworkFound_nullCallback() {
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        when(mockWiseFySearch.findAccessPointByRegex(anyString(), anyInt(), anyBoolean())).thenReturn(null);
+
+        try {
+            mWiseFy.getRSSI(TEST_SSID, true, 1000, null);
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_success_takeHighest_false() {
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        ScanResult accessPoint = mock(ScanResult.class);
+        accessPoint.level = TEST_RSSI_LEVEL;
+        when(mockWiseFySearch.findAccessPointByRegex(anyString(), anyInt(), anyBoolean())).thenReturn(accessPoint);
+
+
+        GetRSSICallbacks mockCallbacks = mock(GetRSSICallbacks.class);
+        mWiseFy.getRSSI(TEST_SSID, false, 1000, mockCallbacks);
+        verify(mockCallbacks, timeout(2000)).retrievedRSSI(TEST_RSSI_LEVEL);
+    }
+
+    @Test
+    public void callbacks_success_takeHighest_false_nullCallback() {
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        ScanResult accessPoint = mock(ScanResult.class);
+        accessPoint.level = TEST_RSSI_LEVEL;
+        when(mockWiseFySearch.findAccessPointByRegex(anyString(), anyInt(), anyBoolean())).thenReturn(accessPoint);
+
+        try {
+            mWiseFy.getRSSI(TEST_SSID, false, 1000, null);
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_success_takeHighest_true() {
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        ScanResult accessPoint = mock(ScanResult.class);
+        accessPoint.level = TEST_RSSI_LEVEL;
+        when(mockWiseFySearch.findAccessPointByRegex(anyString(), anyInt(), anyBoolean())).thenReturn(accessPoint);
+
+
+        GetRSSICallbacks mockCallbacks = mock(GetRSSICallbacks.class);
+        mWiseFy.getRSSI(TEST_SSID, true, 1000, mockCallbacks);
+        verify(mockCallbacks, timeout(2000)).retrievedRSSI(TEST_RSSI_LEVEL);
+    }
+
+    @Test
+    public void callbacks_success_takeHighest_true_nullCallback() {
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        ScanResult accessPoint = mock(ScanResult.class);
+        accessPoint.level = TEST_RSSI_LEVEL;
+        when(mockWiseFySearch.findAccessPointByRegex(anyString(), anyInt(), anyBoolean())).thenReturn(accessPoint);
+
+        try {
+            mWiseFy.getRSSI(TEST_SSID, true, 1000, null);
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+}
\ No newline at end of file
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/GetSavedNetworkTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/GetSavedNetworkTests.java
new file mode 100644
index 00000000..1bbe3a07
--- /dev/null
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/GetSavedNetworkTests.java
@@ -0,0 +1,144 @@
+package com.isupatches.wisefy;
+
+
+import android.net.wifi.WifiConfiguration;
+import com.isupatches.wisefy.base.TestActivity;
+import com.isupatches.wisefy.callbacks.GetSavedNetworkCallbacks;
+import com.isupatches.wisefy.constants.WiseFyCodes;
+import org.junit.Test;
+import static com.isupatches.wisefy.base.TestUtils.TEST_SSID;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.fail;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+
+public class GetSavedNetworkTests extends BaseTestClass<TestActivity> {
+
+    public GetSavedNetworkTests() {
+        super(TestActivity.class);
+    }
+
+    @Test
+    public void noCallbacks_failure_nullSSIDParam() {
+        assertEquals(null, mWiseFy.getSavedNetwork(null));
+    }
+
+    @Test
+    public void noCallbacks_failure_missingPrerequisite() {
+        missingPrerequisite();
+        assertEquals(null, mWiseFy.getSavedNetwork(TEST_SSID));
+    }
+
+    @Test
+    public void noCallbacks_failure() {
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        when(mockWiseFySearch.findSavedNetworkByRegex(anyString())).thenReturn(null);
+
+        assertEquals(null, mWiseFy.getSavedNetwork(TEST_SSID));
+    }
+
+    @Test
+    public void noCallbacks_success() {
+        WifiConfiguration wiFiConfiguration = new WifiConfiguration();
+        wiFiConfiguration.SSID = TEST_SSID;
+
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        when(mockWiseFySearch.findSavedNetworkByRegex(anyString())).thenReturn(wiFiConfiguration);
+
+        assertEquals(wiFiConfiguration, mWiseFy.getSavedNetwork(TEST_SSID));
+    }
+
+    @Test
+    public void callbacks_failure_nullSSIDParam() {
+        GetSavedNetworkCallbacks mockCallbacks = mock(GetSavedNetworkCallbacks.class);
+        mWiseFy.getSavedNetwork(null, mockCallbacks);
+        verify(mockCallbacks, timeout(2000)).getSavedNetworkWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
+    }
+
+    @Test
+    public void callbacks_failure_nullSSIDParam_nullCallback() {
+        try {
+            mWiseFy.getSavedNetwork(null, null);
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_failure_missingPrerequisite() {
+        missingPrerequisite();
+        GetSavedNetworkCallbacks mockCallbacks = mock(GetSavedNetworkCallbacks.class);
+        mWiseFy.getSavedNetwork(TEST_SSID, mockCallbacks);
+        verify(mockCallbacks, timeout(2000)).getSavedNetworkWiseFyFailure(WiseFyCodes.MISSING_PREREQUISITE);
+    }
+
+    @Test
+    public void callbacks_failure_missingPrerequisite_nullCallback() {
+        missingPrerequisite();
+        try {
+            mWiseFy.getSavedNetwork(TEST_SSID, null);
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_failure() {
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        when(mockWiseFySearch.findSavedNetworkByRegex(anyString())).thenReturn(null);
+
+        GetSavedNetworkCallbacks mockCallbacks = mock(GetSavedNetworkCallbacks.class);
+        mWiseFy.getSavedNetwork(TEST_SSID, mockCallbacks);
+        verify(mockCallbacks, timeout(2000)).savedNetworkNotFound();
+    }
+
+    @Test
+    public void callbacks_failure_nullCallback() {
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        when(mockWiseFySearch.findSavedNetworkByRegex(anyString())).thenReturn(null);
+
+        try {
+            mWiseFy.getSavedNetwork(TEST_SSID, null);
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_success() {
+        WifiConfiguration wiFiConfiguration = new WifiConfiguration();
+        wiFiConfiguration.SSID = TEST_SSID;
+
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        when(mockWiseFySearch.findSavedNetworkByRegex(anyString())).thenReturn(wiFiConfiguration);
+
+        GetSavedNetworkCallbacks mockCallbacks = mock(GetSavedNetworkCallbacks.class);
+        mWiseFy.getSavedNetwork(TEST_SSID, mockCallbacks);
+        verify(mockCallbacks, timeout(2000)).retrievedSavedNetwork(wiFiConfiguration);
+    }
+
+    @Test
+    public void callbacks_success_nullCallback() {
+        WifiConfiguration wiFiConfiguration = new WifiConfiguration();
+        wiFiConfiguration.SSID = TEST_SSID;
+
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        when(mockWiseFySearch.findSavedNetworkByRegex(anyString())).thenReturn(wiFiConfiguration);
+
+        try {
+            mWiseFy.getSavedNetwork(TEST_SSID, null);
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/GetSavedNetworksTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/GetSavedNetworksTests.java
new file mode 100644
index 00000000..82716210
--- /dev/null
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/GetSavedNetworksTests.java
@@ -0,0 +1,161 @@
+package com.isupatches.wisefy;
+
+
+import android.net.wifi.WifiConfiguration;
+import com.isupatches.wisefy.base.TestActivity;
+import com.isupatches.wisefy.callbacks.GetSavedNetworksCallbacks;
+import com.isupatches.wisefy.constants.WiseFyCodes;
+import org.junit.Test;
+import java.util.ArrayList;
+import java.util.List;
+import static com.isupatches.wisefy.base.TestUtils.TEST_SSID;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+
+public class GetSavedNetworksTests extends BaseTestClass<TestActivity> {
+
+    public GetSavedNetworksTests() {
+        super(TestActivity.class);
+    }
+
+    @Test
+    public void noCallbacks_failure_missingPrerequisite() {
+        missingPrerequisite();
+        assertEquals(null, mWiseFy.getSavedNetworks());
+        verify(mMockWiFiManager, never()).getConfiguredNetworks();
+    }
+
+    @Test
+    public void noCallbacks_success() {
+        List<WifiConfiguration> wifiList = new ArrayList<>();
+        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
+        mWiFiConfiguration.SSID = TEST_SSID;
+        wifiList.add(mWiFiConfiguration);
+        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
+
+        assertEquals(wifiList, mWiseFy.getSavedNetworks());
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).getConfiguredNetworks();
+    }
+
+    @Test
+    public void callbacks_failure_missingPrerequisite() {
+        missingPrerequisite();
+        GetSavedNetworksCallbacks mockCallbacks = mock(GetSavedNetworksCallbacks.class);
+        mWiseFy.getSavedNetworks(mockCallbacks);
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).getSavedNetworksWiseFyFailure(WiseFyCodes.MISSING_PREREQUISITE);
+        verify(mMockWiFiManager, never()).getConfiguredNetworks();
+    }
+
+    @Test
+    public void callbacks_failure_missingPrerequisite_nullCallback() {
+        GetSavedNetworksCallbacks mockCallbacks = mock(GetSavedNetworksCallbacks.class);
+        mWiseFy.getSavedNetworks((GetSavedNetworksCallbacks) null);
+        verify(mockCallbacks, never()).getSavedNetworksWiseFyFailure(WiseFyCodes.MISSING_PREREQUISITE);
+        verify(mMockWiFiManager, never()).getConfiguredNetworks();
+    }
+
+    @Test
+    public void callbacks_success() {
+        List<WifiConfiguration> wifiList = new ArrayList<>();
+        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
+        mWiFiConfiguration.SSID = TEST_SSID;
+        wifiList.add(mWiFiConfiguration);
+        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
+
+        GetSavedNetworksCallbacks mockCallbacks = mock(GetSavedNetworksCallbacks.class);
+        mWiseFy.getSavedNetworks(mockCallbacks);
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).retrievedSavedNetworks(wifiList);
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).getConfiguredNetworks();
+    }
+
+    @Test
+    public void callbacks_success_nullCallback() {
+        List<WifiConfiguration> wifiList = new ArrayList<>();
+        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
+        mWiFiConfiguration.SSID = TEST_SSID;
+        wifiList.add(mWiFiConfiguration);
+        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
+
+        GetSavedNetworksCallbacks mockCallbacks = mock(GetSavedNetworksCallbacks.class);
+        mWiseFy.getSavedNetworks((GetSavedNetworksCallbacks)null);
+        verify(mockCallbacks, never()).retrievedSavedNetworks(wifiList);
+        verify(mMockWiFiManager, never()).getConfiguredNetworks();
+    }
+
+    @Test
+    public void callbacks_failure_withRegex_missingPrerequisite() {
+        missingPrerequisite();
+
+        GetSavedNetworksCallbacks mockCallbacks = mock(GetSavedNetworksCallbacks.class);
+        mWiseFy.getSavedNetworks(TEST_SSID, mockCallbacks);
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).getSavedNetworksWiseFyFailure(WiseFyCodes.MISSING_PREREQUISITE);
+        verify(mMockWiFiManager, never()).getConfiguredNetworks();
+    }
+
+    @Test
+    public void noCallbacks_failure_withRegex_missingPrerequisite() {
+        missingPrerequisite();
+        assertEquals(null, mWiseFy.getSavedNetworks(TEST_SSID));
+        verify(mMockWiFiManager, never()).getConfiguredNetworks();
+    }
+
+    @Test
+    public void noCallbacks_success_withRegex() {
+        List<WifiConfiguration> wifiList = new ArrayList<>();
+        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
+        mWiFiConfiguration.SSID = TEST_SSID;
+        wifiList.add(mWiFiConfiguration);
+        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
+
+        assertEquals(wifiList, mWiseFy.getSavedNetworks(TEST_SSID));
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).getConfiguredNetworks();
+    }
+
+    @Test
+    public void callbacks_failure_withRegex_missingPrerequisite_nullCallback() {
+        missingPrerequisite();
+
+        try{
+            mWiseFy.getSavedNetworks(TEST_SSID, null);
+            verify(mMockWiFiManager, never()).getConfiguredNetworks();
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_success_withRegex() {
+        List<WifiConfiguration> wifiList = new ArrayList<>();
+        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
+        mWiFiConfiguration.SSID = TEST_SSID;
+        wifiList.add(mWiFiConfiguration);
+        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
+
+        GetSavedNetworksCallbacks mockCallbacks = mock(GetSavedNetworksCallbacks.class);
+        mWiseFy.getSavedNetworks(TEST_SSID, mockCallbacks);
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).retrievedSavedNetworks(wifiList);
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).getConfiguredNetworks();
+    }
+
+    @Test
+    public void callbacks_success_withRegex_nullCallbacks() {
+        List<WifiConfiguration> wifiList = new ArrayList<>();
+        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
+        mWiFiConfiguration.SSID = TEST_SSID;
+        wifiList.add(mWiFiConfiguration);
+        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
+
+        try {
+            mWiseFy.getSavedNetworks(TEST_SSID, null);
+            verify(mMockWiFiManager, never()).getConfiguredNetworks();
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/IsDeviceConnectedToMobileNetworkTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/IsDeviceConnectedToMobileNetworkTests.java
new file mode 100644
index 00000000..73f3b9aa
--- /dev/null
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/IsDeviceConnectedToMobileNetworkTests.java
@@ -0,0 +1,46 @@
+package com.isupatches.wisefy;
+
+
+import android.net.NetworkInfo;
+import com.isupatches.wisefy.base.TestActivity;
+import org.junit.Test;
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+
+public class IsDeviceConnectedToMobileNetworkTests extends BaseTestClass<TestActivity> {
+
+    public IsDeviceConnectedToMobileNetworkTests() {
+        super(TestActivity.class);
+    }
+
+    @Test
+    public void failure_missingPrerequisite() {
+        missingPrerequisite();
+        assertFalse(mWiseFy.isDeviceConnectedToMobileNetwork());
+    }
+
+    @Test
+    public void failure() {
+        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(mock(NetworkInfo.class));
+
+        WiseFyConnection mockWiseFyConnection = mock(WiseFyConnection.class);
+        mWiseFy.mWiseFyConnection = mockWiseFyConnection;
+        when(mockWiseFyConnection.isNetworkConnectedAndMatchesType(any(NetworkInfo.class), anyString())).thenReturn(false);
+        assertFalse(mWiseFy.isDeviceConnectedToMobileNetwork());
+    }
+
+    @Test
+    public void success() {
+        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(mock(NetworkInfo.class));
+
+        WiseFyConnection mockWiseFyConnection = mock(WiseFyConnection.class);
+        mWiseFy.mWiseFyConnection = mockWiseFyConnection;
+        when(mockWiseFyConnection.isNetworkConnectedAndMatchesType(any(NetworkInfo.class), anyString())).thenReturn(true);
+        assertTrue(mWiseFy.isDeviceConnectedToMobileNetwork());
+    }
+}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/IsDeviceConnectedToMobileOrWifiNetworkTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/IsDeviceConnectedToMobileOrWifiNetworkTests.java
new file mode 100644
index 00000000..2d15222c
--- /dev/null
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/IsDeviceConnectedToMobileOrWifiNetworkTests.java
@@ -0,0 +1,45 @@
+package com.isupatches.wisefy;
+
+
+import android.net.NetworkInfo;
+import com.isupatches.wisefy.base.TestActivity;
+import org.junit.Test;
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+
+public class IsDeviceConnectedToMobileOrWifiNetworkTests extends BaseTestClass<TestActivity> {
+
+    public IsDeviceConnectedToMobileOrWifiNetworkTests() {
+        super(TestActivity.class);
+    }
+
+    @Test
+    public void failure_missingPrerequisite() {
+        missingPrerequisite();
+        assertFalse(mWiseFy.isDeviceConnectedToMobileOrWifiNetwork());
+    }
+
+    @Test
+    public void failure() {
+        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(mock(NetworkInfo.class));
+
+        WiseFyConnection mockWiseFyConnection = mock(WiseFyConnection.class);
+        mWiseFy.mWiseFyConnection = mockWiseFyConnection;
+        when(mockWiseFyConnection.isNetworkConnected(any(NetworkInfo.class))).thenReturn(false);
+        assertFalse(mWiseFy.isDeviceConnectedToMobileOrWifiNetwork());
+    }
+
+    @Test
+    public void success() {
+        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(mock(NetworkInfo.class));
+
+        WiseFyConnection mockWiseFyConnection = mock(WiseFyConnection.class);
+        mWiseFy.mWiseFyConnection = mockWiseFyConnection;
+        when(mockWiseFyConnection.isNetworkConnected(any(NetworkInfo.class))).thenReturn(true);
+        assertTrue(mWiseFy.isDeviceConnectedToMobileOrWifiNetwork());
+    }
+}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/IsDeviceConnectedToSSIDTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/IsDeviceConnectedToSSIDTests.java
new file mode 100644
index 00000000..1f3d0a78
--- /dev/null
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/IsDeviceConnectedToSSIDTests.java
@@ -0,0 +1,48 @@
+package com.isupatches.wisefy;
+
+
+import com.isupatches.wisefy.base.TestActivity;
+import org.junit.Test;
+import static com.isupatches.wisefy.base.TestUtils.TEST_SSID;
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+
+public class IsDeviceConnectedToSSIDTests extends BaseTestClass<TestActivity> {
+
+    public IsDeviceConnectedToSSIDTests() {
+        super(TestActivity.class);
+    }
+
+    @Test
+    public void noCallbacks_failure_nullSSIDParams() {
+        assertFalse(mWiseFy.isDeviceConnectedToSSID(null));
+    }
+
+    @Test
+    public void noCallbacks_failure_missingPrerequisite() {
+        missingPrerequisite();
+        assertFalse(mWiseFy.isDeviceConnectedToSSID(TEST_SSID));
+    }
+
+    @Test
+    public void noCallbacks_failure() {
+        WiseFyConnection mockWiseFyConnection = mock(WiseFyConnection.class);
+        mWiseFy.mWiseFyConnection = mockWiseFyConnection;
+        when(mockWiseFyConnection.isCurrentNetworkConnectedToSSID(anyString())).thenReturn(false);
+
+        assertFalse(mWiseFy.isDeviceConnectedToSSID(TEST_SSID));
+    }
+
+    @Test
+    public void noCallbacks_success() {
+        WiseFyConnection mockWiseFyConnection = mock(WiseFyConnection.class);
+        mWiseFy.mWiseFyConnection = mockWiseFyConnection;
+        when(mockWiseFyConnection.isCurrentNetworkConnectedToSSID(anyString())).thenReturn(true);
+
+        assertTrue(mWiseFy.isDeviceConnectedToSSID(TEST_SSID));
+    }
+}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/IsDeviceConnectedToWifiNetworkTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/IsDeviceConnectedToWifiNetworkTests.java
new file mode 100644
index 00000000..534a195d
--- /dev/null
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/IsDeviceConnectedToWifiNetworkTests.java
@@ -0,0 +1,46 @@
+package com.isupatches.wisefy;
+
+
+import android.net.NetworkInfo;
+import com.isupatches.wisefy.base.TestActivity;
+import org.junit.Test;
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+
+public class IsDeviceConnectedToWifiNetworkTests extends BaseTestClass<TestActivity> {
+
+    public IsDeviceConnectedToWifiNetworkTests() {
+        super(TestActivity.class);
+    }
+
+    @Test
+    public void failure_missingPrerequisite() {
+        missingPrerequisite();
+        assertFalse(mWiseFy.isDeviceConnectedToWifiNetwork());
+    }
+
+    @Test
+    public void failure() {
+        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(mock(NetworkInfo.class));
+
+        WiseFyConnection mockWiseFyConnection = mock(WiseFyConnection.class);
+        mWiseFy.mWiseFyConnection = mockWiseFyConnection;
+        when(mockWiseFyConnection.isNetworkConnectedAndMatchesType(any(NetworkInfo.class), anyString())).thenReturn(false);
+        assertFalse(mWiseFy.isDeviceConnectedToWifiNetwork());
+    }
+
+    @Test
+    public void success() {
+        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(mock(NetworkInfo.class));
+
+        WiseFyConnection mockWiseFyConnection = mock(WiseFyConnection.class);
+        mWiseFy.mWiseFyConnection = mockWiseFyConnection;
+        when(mockWiseFyConnection.isNetworkConnectedAndMatchesType(any(NetworkInfo.class), anyString())).thenReturn(true);
+        assertTrue(mWiseFy.isDeviceConnectedToWifiNetwork());
+    }
+}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/IsNetwork5gHzTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/IsNetwork5gHzTests.java
similarity index 78%
rename from wisefy/src/androidTest/java/com/isupatches/wisefy/test/IsNetwork5gHzTests.java
rename to wisefy/src/androidTest/java/com/isupatches/wisefy/IsNetwork5gHzTests.java
index 4b2aa279..0e5622c8 100644
--- a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/IsNetwork5gHzTests.java
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/IsNetwork5gHzTests.java
@@ -1,14 +1,13 @@
-package com.isupatches.wisefy.test;
+package com.isupatches.wisefy;
 
 
 import android.net.wifi.WifiInfo;
 import android.os.Build;
-import com.isupatches.wisefy.test.base.BaseTestClass;
-import com.isupatches.wisefy.test.base.TestActivity;
+import com.isupatches.wisefy.base.TestActivity;
 import org.junit.Test;
-import static com.isupatches.wisefy.test.base.TestUtils.TEST_NETWORK_FREQUENCY_5GHZ;
-import static com.isupatches.wisefy.test.base.TestUtils.TEST_NETWORK_FREQUENCY_ABOVE_5GHZ;
-import static com.isupatches.wisefy.test.base.TestUtils.TEST_NETWORK_FREQUENCY_BELOW_5GHZ;
+import static com.isupatches.wisefy.base.TestUtils.TEST_NETWORK_FREQUENCY_5GHZ;
+import static com.isupatches.wisefy.base.TestUtils.TEST_NETWORK_FREQUENCY_ABOVE_5GHZ;
+import static com.isupatches.wisefy.base.TestUtils.TEST_NETWORK_FREQUENCY_BELOW_5GHZ;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -23,7 +22,6 @@ public IsNetwork5gHzTests() {
     @Test
     public void currentNetwork_failure_above5ghz() {
         if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            setManagers();
             WifiInfo mockWifiInfo = mock(WifiInfo.class);
             when(mockWifiInfo.getFrequency()).thenReturn(TEST_NETWORK_FREQUENCY_ABOVE_5GHZ);
             when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWifiInfo);
@@ -35,7 +33,6 @@ public void currentNetwork_failure_above5ghz() {
     @Test
     public void currentNetwork_failure_below5ghz() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            setManagers();
             WifiInfo mockWifiInfo = mock(WifiInfo.class);
             when(mockWifiInfo.getFrequency()).thenReturn(TEST_NETWORK_FREQUENCY_BELOW_5GHZ);
             when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWifiInfo);
@@ -44,10 +41,17 @@ public void currentNetwork_failure_below5ghz() {
         }
     }
 
+    @Test
+    public void currentNetwork_failure_null() {
+        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            when(mMockWiFiManager.getConnectionInfo()).thenReturn(null);
+            assertEquals(false, mWiseFy.isNetwork5gHz());
+        }
+    }
+
     @Test
     public void currentNetwork_success() {
         if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            setManagers();
             WifiInfo mockWifiInfo = mock(WifiInfo.class);
             when(mockWifiInfo.getFrequency()).thenReturn(TEST_NETWORK_FREQUENCY_5GHZ);
             when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWifiInfo);
@@ -59,7 +63,6 @@ public void currentNetwork_success() {
     @Test
     public void provideWifiInfo_failure_above5ghz() {
         if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            setManagers();
             WifiInfo mockWifiInfo = mock(WifiInfo.class);
             when(mockWifiInfo.getFrequency()).thenReturn(TEST_NETWORK_FREQUENCY_ABOVE_5GHZ);
             when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWifiInfo);
@@ -71,7 +74,6 @@ public void provideWifiInfo_failure_above5ghz() {
     @Test
     public void provideWifiInfo_failure_below5ghz() {
         if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            setManagers();
             WifiInfo mockWifiInfo = mock(WifiInfo.class);
             when(mockWifiInfo.getFrequency()).thenReturn(TEST_NETWORK_FREQUENCY_BELOW_5GHZ);
             when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWifiInfo);
@@ -80,10 +82,16 @@ public void provideWifiInfo_failure_below5ghz() {
         }
     }
 
+    @Test
+    public void provideWifiInfo_failure_null() {
+        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            assertEquals(false, mWiseFy.isNetwork5gHz(null));
+        }
+    }
+
     @Test
     public void provideWifiInfo_success() {
         if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            setManagers();
             WifiInfo mockWifiInfo = mock(WifiInfo.class);
             when(mockWifiInfo.getFrequency()).thenReturn(TEST_NETWORK_FREQUENCY_5GHZ);
             when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWifiInfo);
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/IsNetworkEAPTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/IsNetworkEAPTests.java
new file mode 100644
index 00000000..c67106a9
--- /dev/null
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/IsNetworkEAPTests.java
@@ -0,0 +1,49 @@
+package com.isupatches.wisefy;
+
+
+import android.net.wifi.ScanResult;
+import com.isupatches.wisefy.base.TestActivity;
+import com.isupatches.wisefy.constants.Capabilities;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+
+
+public class IsNetworkEAPTests extends BaseTestClass<TestActivity> {
+
+    public IsNetworkEAPTests() {
+        super(TestActivity.class);
+    }
+
+    @Test
+    public void failure_differentCapability() {
+        ScanResult scanResult = mock(ScanResult.class);
+        scanResult.capabilities = "Other";
+        assertEquals(false, mWiseFy.isNetworkEAP(scanResult));
+    }
+
+    @Test
+    public void failure_emptyCapabilities() {
+        ScanResult scanResult = mock(ScanResult.class);
+        scanResult.capabilities = "";
+        assertEquals(false, mWiseFy.isNetworkEAP(scanResult));
+    }
+
+    @Test
+    public void failure_nullCapabilities() {
+        ScanResult scanResult = mock(ScanResult.class);
+        assertEquals(false, mWiseFy.isNetworkEAP(scanResult));
+    }
+
+    @Test
+    public void failure_nullScanResult() {
+        assertEquals(false, mWiseFy.isNetworkEAP(null));
+    }
+
+    @Test
+    public void success() {
+        ScanResult scanResult = mock(ScanResult.class);
+        scanResult.capabilities = Capabilities.EAP;
+        assertEquals(true, mWiseFy.isNetworkEAP(scanResult));
+    }
+}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/IsNetworkInConfigurationListTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/IsNetworkInConfigurationListTests.java
similarity index 84%
rename from wisefy/src/androidTest/java/com/isupatches/wisefy/test/IsNetworkInConfigurationListTests.java
rename to wisefy/src/androidTest/java/com/isupatches/wisefy/IsNetworkInConfigurationListTests.java
index dff68958..ee5bd639 100644
--- a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/IsNetworkInConfigurationListTests.java
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/IsNetworkInConfigurationListTests.java
@@ -1,15 +1,14 @@
-package com.isupatches.wisefy.test;
+package com.isupatches.wisefy;
 
 
 import android.net.wifi.WifiConfiguration;
-import com.isupatches.wisefy.test.base.BaseTestClass;
-import com.isupatches.wisefy.test.base.TestActivity;
+import com.isupatches.wisefy.base.TestActivity;
 import org.junit.Test;
 import java.util.ArrayList;
 import java.util.List;
-import static com.isupatches.wisefy.test.base.TestUtils.TEST_SSID;
-import static com.isupatches.wisefy.test.base.TestUtils.TEST_SSID2;
-import static com.isupatches.wisefy.test.base.TestUtils.TEST_SSID3;
+import static com.isupatches.wisefy.base.TestUtils.TEST_SSID;
+import static com.isupatches.wisefy.base.TestUtils.TEST_SSID2;
+import static com.isupatches.wisefy.base.TestUtils.TEST_SSID3;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.when;
 
@@ -22,14 +21,11 @@ public IsNetworkInConfigurationListTests() {
 
     @Test
     public void failure() {
-        setManagers();
         assertEquals(false, mWiseFy.isNetworkInConfigurationList(TEST_SSID));
     }
 
     @Test
     public void failure_multipleNetworks() {
-        setManagers();
-
         List<WifiConfiguration> wifiList = new ArrayList<>();
 
         WifiConfiguration wifiConfiguration1 = new WifiConfiguration();
@@ -46,7 +42,6 @@ public void failure_multipleNetworks() {
 
     @Test
     public void failure_noNetworks() {
-        setManagers();
         List<WifiConfiguration> wifiList = new ArrayList<>();
         when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
         assertEquals(false, mWiseFy.isNetworkInConfigurationList(TEST_SSID));
@@ -54,7 +49,6 @@ public void failure_noNetworks() {
 
     @Test
     public void failure_nullSSID() {
-        setManagers();
         List<WifiConfiguration> wifiList = new ArrayList<>();
         WifiConfiguration wifiConfiguration = new WifiConfiguration();
         wifiConfiguration.SSID = null;
@@ -65,7 +59,6 @@ public void failure_nullSSID() {
 
     @Test
     public void failure_nullWifiConfiguration() {
-        setManagers();
         List<WifiConfiguration> wifiList = new ArrayList<>();
         wifiList.add(0, null);
         when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
@@ -73,14 +66,13 @@ public void failure_nullWifiConfiguration() {
     }
 
     @Test
-    public void failure_nullWifiManager() {
-        setManagersToNull();
+    public void failure_nmissingPrerequisite() {
+        missingPrerequisite();
         assertEquals(false, mWiseFy.isNetworkInConfigurationList(TEST_SSID));
     }
 
     @Test
     public void success() {
-        setManagers();
         List<WifiConfiguration> wifiList = new ArrayList<>();
         WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
         mWiFiConfiguration.SSID = TEST_SSID;
@@ -91,8 +83,6 @@ public void success() {
 
     @Test
     public void success_multipleNetworks() {
-        setManagers();
-
         List<WifiConfiguration> wifiList = new ArrayList<>();
 
         WifiConfiguration wifiConfiguration1 = new WifiConfiguration();
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/IsNetworkPSKTest.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/IsNetworkPSKTest.java
new file mode 100644
index 00000000..a2a75d78
--- /dev/null
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/IsNetworkPSKTest.java
@@ -0,0 +1,49 @@
+package com.isupatches.wisefy;
+
+
+import android.net.wifi.ScanResult;
+import com.isupatches.wisefy.base.TestActivity;
+import com.isupatches.wisefy.constants.Capabilities;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+
+
+public class IsNetworkPSKTest extends BaseTestClass<TestActivity> {
+
+    public IsNetworkPSKTest() {
+        super(TestActivity.class);
+    }
+
+    @Test
+    public void failure_differentCapability() {
+        ScanResult scanResult = mock(ScanResult.class);
+        scanResult.capabilities = "Other";
+        assertEquals(false, mWiseFy.isNetworkPSK(scanResult));
+    }
+
+    @Test
+    public void failure_emptyCapabilities() {
+        ScanResult scanResult = mock(ScanResult.class);
+        scanResult.capabilities = "";
+        assertEquals(false, mWiseFy.isNetworkPSK(scanResult));
+    }
+
+    @Test
+    public void failure_nullCapabilities() {
+        ScanResult scanResult = mock(ScanResult.class);
+        assertEquals(false, mWiseFy.isNetworkPSK(scanResult));
+    }
+
+    @Test
+    public void failure_nullScanResult() {
+        assertEquals(false, mWiseFy.isNetworkPSK(null));
+    }
+
+    @Test
+    public void success() {
+        ScanResult scanResult = mock(ScanResult.class);
+        scanResult.capabilities = Capabilities.PSK;
+        assertEquals(true, mWiseFy.isNetworkPSK(scanResult));
+    }
+}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/IsNetworkSecureTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/IsNetworkSecureTests.java
similarity index 67%
rename from wisefy/src/androidTest/java/com/isupatches/wisefy/test/IsNetworkSecureTests.java
rename to wisefy/src/androidTest/java/com/isupatches/wisefy/IsNetworkSecureTests.java
index 9dcc7e32..a3b5abf7 100644
--- a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/IsNetworkSecureTests.java
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/IsNetworkSecureTests.java
@@ -1,10 +1,9 @@
-package com.isupatches.wisefy.test;
+package com.isupatches.wisefy;
 
 
 import android.net.wifi.ScanResult;
+import com.isupatches.wisefy.base.TestActivity;
 import com.isupatches.wisefy.constants.Capabilities;
-import com.isupatches.wisefy.test.base.BaseTestClass;
-import com.isupatches.wisefy.test.base.TestActivity;
 import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
@@ -54,4 +53,25 @@ public void success_withWEP() {
         scanResult.capabilities = Capabilities.WEP;
         assertEquals(true, mWiseFy.isNetworkSecure(scanResult));
     }
+
+    @Test
+    public void success_withWPA() {
+        ScanResult scanResult = mock(ScanResult.class);
+        scanResult.capabilities = Capabilities.WPA;
+        assertEquals(true, mWiseFy.isNetworkSecure(scanResult));
+    }
+
+    @Test
+    public void success_withWPA2() {
+        ScanResult scanResult = mock(ScanResult.class);
+        scanResult.capabilities = Capabilities.WPA2;
+        assertEquals(true, mWiseFy.isNetworkSecure(scanResult));
+    }
+
+    @Test
+    public void failure_otherCapabilities() {
+        ScanResult scanResult = mock(ScanResult.class);
+        scanResult.capabilities = "Other";
+        assertEquals(false, mWiseFy.isNetworkSecure(scanResult));
+    }
 }
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/IsNetworkWPA2Test.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/IsNetworkWPA2Test.java
new file mode 100644
index 00000000..02b9958c
--- /dev/null
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/IsNetworkWPA2Test.java
@@ -0,0 +1,49 @@
+package com.isupatches.wisefy;
+
+
+import android.net.wifi.ScanResult;
+import com.isupatches.wisefy.base.TestActivity;
+import com.isupatches.wisefy.constants.Capabilities;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+
+
+public class IsNetworkWPA2Test extends BaseTestClass<TestActivity> {
+
+    public IsNetworkWPA2Test() {
+        super(TestActivity.class);
+    }
+
+    @Test
+    public void failure_differentCapability() {
+        ScanResult scanResult = mock(ScanResult.class);
+        scanResult.capabilities = "Other";
+        assertEquals(false, mWiseFy.isNetworkWPA2(scanResult));
+    }
+
+    @Test
+    public void failure_emptyCapabilities() {
+        ScanResult scanResult = mock(ScanResult.class);
+        scanResult.capabilities = "";
+        assertEquals(false, mWiseFy.isNetworkWPA2(scanResult));
+    }
+
+    @Test
+    public void failure_nullCapabilities() {
+        ScanResult scanResult = mock(ScanResult.class);
+        assertEquals(false, mWiseFy.isNetworkWPA2(scanResult));
+    }
+
+    @Test
+    public void failure_nullScanResult() {
+        assertEquals(false, mWiseFy.isNetworkWPA2(null));
+    }
+
+    @Test
+    public void success() {
+        ScanResult scanResult = mock(ScanResult.class);
+        scanResult.capabilities = Capabilities.WPA2;
+        assertEquals(true, mWiseFy.isNetworkWPA2(scanResult));
+    }
+}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/IsNetworkWPATests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/IsNetworkWPATests.java
new file mode 100644
index 00000000..9ad82084
--- /dev/null
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/IsNetworkWPATests.java
@@ -0,0 +1,49 @@
+package com.isupatches.wisefy;
+
+
+import android.net.wifi.ScanResult;
+import com.isupatches.wisefy.base.TestActivity;
+import com.isupatches.wisefy.constants.Capabilities;
+import org.junit.Test;
+import static junit.framework.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+
+
+public class IsNetworkWPATests extends BaseTestClass<TestActivity> {
+
+    public IsNetworkWPATests() {
+        super(TestActivity.class);
+    }
+
+    @Test
+    public void failure_differentCapability() {
+        ScanResult scanResult = mock(ScanResult.class);
+        scanResult.capabilities = "Other";
+        assertEquals(false, mWiseFy.isNetworkWPA(scanResult));
+    }
+
+    @Test
+    public void failure_emptyCapabilities() {
+        ScanResult scanResult = mock(ScanResult.class);
+        scanResult.capabilities = "";
+        assertEquals(false, mWiseFy.isNetworkWPA(scanResult));
+    }
+
+    @Test
+    public void failure_nullCapabilities() {
+        ScanResult scanResult = mock(ScanResult.class);
+        assertEquals(false, mWiseFy.isNetworkWPA(scanResult));
+    }
+
+    @Test
+    public void failure_nullScanResult() {
+        assertEquals(false, mWiseFy.isNetworkWPA(null));
+    }
+
+    @Test
+    public void success() {
+        ScanResult scanResult = mock(ScanResult.class);
+        scanResult.capabilities = Capabilities.WPA;
+        assertEquals(true, mWiseFy.isNetworkWPA(scanResult));
+    }
+}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/IsNetworkWepTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/IsNetworkWepTests.java
new file mode 100644
index 00000000..5b46f961
--- /dev/null
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/IsNetworkWepTests.java
@@ -0,0 +1,49 @@
+package com.isupatches.wisefy;
+
+
+import android.net.wifi.ScanResult;
+import com.isupatches.wisefy.base.TestActivity;
+import com.isupatches.wisefy.constants.Capabilities;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+
+
+public class IsNetworkWepTests extends BaseTestClass<TestActivity> {
+
+    public IsNetworkWepTests() {
+        super(TestActivity.class);
+    }
+
+    @Test
+    public void failure_differentCapability() {
+        ScanResult scanResult = mock(ScanResult.class);
+        scanResult.capabilities = "Other";
+        assertEquals(false, mWiseFy.isNetworkWEP(scanResult));
+    }
+
+    @Test
+    public void failure_emptyCapabilities() {
+        ScanResult scanResult = mock(ScanResult.class);
+        scanResult.capabilities = "";
+        assertEquals(false, mWiseFy.isNetworkWEP(scanResult));
+    }
+
+    @Test
+    public void failure_nullCapabilities() {
+        ScanResult scanResult = mock(ScanResult.class);
+        assertEquals(false, mWiseFy.isNetworkWEP(scanResult));
+    }
+
+    @Test
+    public void failure_nullScanResult() {
+        assertEquals(false, mWiseFy.isNetworkWEP(null));
+    }
+
+    @Test
+    public void success() {
+        ScanResult scanResult = mock(ScanResult.class);
+        scanResult.capabilities = Capabilities.WEP;
+        assertEquals(true, mWiseFy.isNetworkWEP(scanResult));
+    }
+}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/IsWifiEnabledTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/IsWifiEnabledTests.java
similarity index 71%
rename from wisefy/src/androidTest/java/com/isupatches/wisefy/test/IsWifiEnabledTests.java
rename to wisefy/src/androidTest/java/com/isupatches/wisefy/IsWifiEnabledTests.java
index 62aa4702..97b0e028 100644
--- a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/IsWifiEnabledTests.java
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/IsWifiEnabledTests.java
@@ -1,8 +1,7 @@
-package com.isupatches.wisefy.test;
+package com.isupatches.wisefy;
 
 
-import com.isupatches.wisefy.test.base.BaseTestClass;
-import com.isupatches.wisefy.test.base.TestActivity;
+import com.isupatches.wisefy.base.TestActivity;
 import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.when;
@@ -16,20 +15,18 @@ public IsWifiEnabledTests() {
 
     @Test
     public void failure() {
-        setManagers();
         when(mMockWiFiManager.isWifiEnabled()).thenReturn(false);
         assertEquals(false, mWiseFy.isWifiEnabled());
     }
 
     @Test
-    public void failure_nullWifiManager() {
-        setManagersToNull();
+    public void failure_missingPrerequisite() {
+        missingPrerequisite();
         assertEquals(false, mWiseFy.isWifiEnabled());
     }
 
     @Test
     public void success() {
-        setManagers();
         when(mMockWiFiManager.isWifiEnabled()).thenReturn(true);
         assertEquals(true, mWiseFy.isWifiEnabled());
     }
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/ManagerUtilTest.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/ManagerUtilTest.java
similarity index 57%
rename from wisefy/src/androidTest/java/com/isupatches/wisefy/test/ManagerUtilTest.java
rename to wisefy/src/androidTest/java/com/isupatches/wisefy/ManagerUtilTest.java
index 3fc02ef0..64e125b5 100644
--- a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/ManagerUtilTest.java
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/ManagerUtilTest.java
@@ -1,11 +1,11 @@
-package com.isupatches.wisefy.test;
+package com.isupatches.wisefy;
 
 
 import android.net.ConnectivityManager;
 import android.net.wifi.WifiManager;
 import android.support.test.rule.ActivityTestRule;
-import com.isupatches.wisefy.test.base.BaseTestClass;
-import com.isupatches.wisefy.test.base.TestActivity;
+import com.isupatches.wisefy.base.TestActivity;
+import com.isupatches.wisefy.util.ManagerUtil;
 import org.junit.Rule;
 import org.junit.Test;
 import static junit.framework.Assert.*;
@@ -22,25 +22,25 @@ public ManagerUtilTest() {
 
     @Test
     public void getConnectivityManager_returnsNotNull() {
-        ConnectivityManager connectivityManager = com.isupatches.wisefy.util.ManagerUtil.getInstance().getConnectivityManager(mActivityTestRule.getActivity());
+        ConnectivityManager connectivityManager = ManagerUtil.getInstance().getConnectivityManager(mActivityTestRule.getActivity());
         assertNotNull(connectivityManager);
     }
 
     @Test
     public void getConnectivityManager_returnsNull_noActivity() {
-        ConnectivityManager connectivityManager = com.isupatches.wisefy.util.ManagerUtil.getInstance().getConnectivityManager(null);
+        ConnectivityManager connectivityManager = ManagerUtil.getInstance().getConnectivityManager(null);
         assertNull(connectivityManager);
     }
 
     @Test
     public void getWiFiManager_returnsNotNull() {
-        WifiManager wifiManager = com.isupatches.wisefy.util.ManagerUtil.getInstance().getWiFiManager(mActivityTestRule.getActivity());
+        WifiManager wifiManager = ManagerUtil.getInstance().getWiFiManager(mActivityTestRule.getActivity());
         assertNotNull(wifiManager);
     }
 
     @Test
     public void getWiFiManager_returnsNull_noActivity() {
-        WifiManager wifiManager = com.isupatches.wisefy.util.ManagerUtil.getInstance().getWiFiManager(null);
+        WifiManager wifiManager = ManagerUtil.getInstance().getWiFiManager(null);
         assertNull(wifiManager);
     }
 }
\ No newline at end of file
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/RemoveNetworkTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/RemoveNetworkTests.java
new file mode 100644
index 00000000..942aa1ca
--- /dev/null
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/RemoveNetworkTests.java
@@ -0,0 +1,210 @@
+package com.isupatches.wisefy;
+
+
+import android.net.wifi.WifiConfiguration;
+import com.isupatches.wisefy.base.TestActivity;
+import com.isupatches.wisefy.callbacks.RemoveNetworkCallbacks;
+import com.isupatches.wisefy.constants.WiseFyCodes;
+import org.junit.Test;
+import static com.isupatches.wisefy.base.TestUtils.TEST_SSID;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+
+public class RemoveNetworkTests extends BaseTestClass<TestActivity> {
+
+    public RemoveNetworkTests() {
+        super(TestActivity.class);
+    }
+
+    @Test
+    public void noCallbacks_failure_nullSSIDParam() {
+        assertEquals(false, mWiseFy.removeNetwork(null));
+        verify(mMockWiFiManager, never()).removeNetwork(anyInt());
+    }
+
+    @Test
+    public void noCallbacks_failure_missingPrerequisites() {
+        missingPrerequisite();
+        assertEquals(false, mWiseFy.removeNetwork(TEST_SSID));
+        verify(mMockWiFiManager, never()).removeNetwork(anyInt());
+    }
+
+    @Test
+    public void noCallbacks_failure_noSavedNetwork() {
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        when(mockWiseFySearch.findSavedNetworkByRegex(anyString())).thenReturn(null);
+
+        assertEquals(false, mWiseFy.removeNetwork(TEST_SSID));
+        verify(mMockWiFiManager, never()).removeNetwork(anyInt());
+    }
+
+    @Test
+    public void noCallbacks_failure() {
+        WifiConfiguration wiFiConfiguration = new WifiConfiguration();
+        wiFiConfiguration.SSID = TEST_SSID;
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        when(mockWiseFySearch.findSavedNetworkByRegex(anyString())).thenReturn(wiFiConfiguration);
+
+        when(mMockWiFiManager.removeNetwork(anyInt())).thenReturn(false);
+
+        assertEquals(false, mWiseFy.removeNetwork(TEST_SSID));
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).removeNetwork(anyInt());
+
+    }
+
+    @Test
+    public void noCallbacks_success() {
+        WifiConfiguration wiFiConfiguration = new WifiConfiguration();
+        wiFiConfiguration.SSID = TEST_SSID;
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        when(mockWiseFySearch.findSavedNetworkByRegex(anyString())).thenReturn(wiFiConfiguration);
+
+        when(mMockWiFiManager.removeNetwork(anyInt())).thenReturn(true);
+
+        assertEquals(true, mWiseFy.removeNetwork(TEST_SSID));
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).removeNetwork(anyInt());
+    }
+
+    @Test
+    public void callbacks_failure_nullSSIDParam() {
+        RemoveNetworkCallbacks mockCallbacks = mock(RemoveNetworkCallbacks.class);
+        mWiseFy.removeNetwork(null, mockCallbacks);
+        verify(mockCallbacks, timeout(3000)).removeNetworkWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
+        verify(mMockWiFiManager, never()).removeNetwork(anyInt());
+    }
+
+    @Test
+    public void callbacks_failure_nullSSIDParam_nullCallback() {
+        try {
+            mWiseFy.removeNetwork(null, null);
+            verify(mMockWiFiManager, never()).removeNetwork(anyInt());
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_failure_missingPrerequisites() {
+        missingPrerequisite();
+        RemoveNetworkCallbacks mockCallbacks = mock(RemoveNetworkCallbacks.class);
+        mWiseFy.removeNetwork(TEST_SSID, mockCallbacks);
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).removeNetworkWiseFyFailure(WiseFyCodes.MISSING_PREREQUISITE);
+        verify(mMockWiFiManager, never()).removeNetwork(anyInt());
+    }
+
+    @Test
+    public void callbacks_failure_missingPrerequisites_nullCallback() {
+        missingPrerequisite();
+        try {
+            mWiseFy.removeNetwork(TEST_SSID, null);
+            verify(mMockWiFiManager, never()).removeNetwork(anyInt());
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_failure_noSavedNetwork() {
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        when(mockWiseFySearch.findSavedNetworkByRegex(anyString())).thenReturn(null);
+
+        RemoveNetworkCallbacks mockCallbacks = mock(RemoveNetworkCallbacks.class);
+        mWiseFy.removeNetwork(TEST_SSID, mockCallbacks);
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).networkNotFoundToRemove();
+        verify(mMockWiFiManager, never()).removeNetwork(anyInt());
+    }
+
+    @Test
+    public void callbacks_failure_noSavedNetwork_nullCallback() {
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        when(mockWiseFySearch.findSavedNetworkByRegex(anyString())).thenReturn(null);
+
+        try {
+            mWiseFy.removeNetwork(TEST_SSID, null);
+            verify(mMockWiFiManager, never()).removeNetwork(anyInt());
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_failure() {
+        WifiConfiguration wiFiConfiguration = new WifiConfiguration();
+        wiFiConfiguration.SSID = TEST_SSID;
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        when(mockWiseFySearch.findSavedNetworkByRegex(anyString())).thenReturn(wiFiConfiguration);
+
+        when(mMockWiFiManager.removeNetwork(anyInt())).thenReturn(false);
+
+        RemoveNetworkCallbacks mockCallbacks = mock(RemoveNetworkCallbacks.class);
+        mWiseFy.removeNetwork(TEST_SSID, mockCallbacks);
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).failureRemovingNetwork();
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).removeNetwork(anyInt());
+    }
+
+    @Test
+    public void callbacks_failure_nullCallback() {
+        WifiConfiguration wiFiConfiguration = new WifiConfiguration();
+        wiFiConfiguration.SSID = TEST_SSID;
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        when(mockWiseFySearch.findSavedNetworkByRegex(anyString())).thenReturn(wiFiConfiguration);
+
+        when(mMockWiFiManager.removeNetwork(anyInt())).thenReturn(false);
+
+        try {
+            mWiseFy.removeNetwork(TEST_SSID, null);
+            verify(mMockWiFiManager, never()).removeNetwork(anyInt());
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+
+    @Test
+    public void callbacks_success() {
+        WifiConfiguration wiFiConfiguration = new WifiConfiguration();
+        wiFiConfiguration.SSID = TEST_SSID;
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        when(mockWiseFySearch.findSavedNetworkByRegex(anyString())).thenReturn(wiFiConfiguration);
+
+        when(mMockWiFiManager.removeNetwork(anyInt())).thenReturn(true);
+
+        RemoveNetworkCallbacks mockCallbacks = mock(RemoveNetworkCallbacks.class);
+        mWiseFy.removeNetwork(TEST_SSID, mockCallbacks);
+        verify(mockCallbacks, timeout(VERIFICATION_TIMEOUT)).networkRemoved();
+        verify(mMockWiFiManager, timeout(VERIFICATION_TIMEOUT)).removeNetwork(anyInt());
+    }
+
+    @Test
+    public void callbacks_success_nullCallback() {
+        WifiConfiguration wiFiConfiguration = new WifiConfiguration();
+        wiFiConfiguration.SSID = TEST_SSID;
+        WiseFySearch mockWiseFySearch = mock(WiseFySearch.class);
+        mWiseFy.mWiseFySearch = mockWiseFySearch;
+        when(mockWiseFySearch.findSavedNetworkByRegex(anyString())).thenReturn(wiFiConfiguration);
+
+        when(mMockWiFiManager.removeNetwork(anyInt())).thenReturn(true);
+
+        try {
+            mWiseFy.removeNetwork(TEST_SSID, null);
+            verify(mMockWiFiManager, never()).removeNetwork(anyInt());
+        } catch (NullPointerException npe) {
+            fail();
+        }
+    }
+}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/SearchForAccessPointTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/SearchForAccessPointTests.java
new file mode 100644
index 00000000..322d509e
--- /dev/null
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/SearchForAccessPointTests.java
@@ -0,0 +1,253 @@
+//package com.isupatches.wisefy.test;
+//
+//
+//import android.net.wifi.ScanResult;
+//import com.isupatches.wisefy.callbacks.SearchForAccessPointCallbacks;
+//import com.isupatches.wisefy.constants.WiseFyCodes;
+//import com.isupatches.wisefy.test.base.BaseTestClass;
+//import com.isupatches.wisefy.test.base.TestActivity;
+//import org.junit.Test;
+//import java.util.ArrayList;
+//import java.util.List;
+//import static com.isupatches.wisefy.test.base.TestUtils.TEST_SSID;
+//import static org.junit.Assert.assertEquals;
+//import static org.mockito.Mockito.mock;
+//import static org.mockito.Mockito.never;
+//import static org.mockito.Mockito.timeout;
+//import static org.mockito.Mockito.verify;
+//import static org.mockito.Mockito.when;
+//
+//
+//public class SearchForAccessPointTests extends BaseTestClass<TestActivity> {
+//
+//    public SearchForAccessPointTests() {
+//        super(TestActivity.class);
+//    }
+//
+//    @Test
+//    public void noCallbacks_failure() {
+//        setManagers();
+//        assertEquals(null, mWiseFy.searchForAccessPoint(TEST_SSID, 1));
+//    }
+//
+//    @Test
+//    public void noCallbacks_failure_nullSSID() {
+//        setManagers();
+//
+//        List<ScanResult> scanResults = new ArrayList<>();
+//        ScanResult scanResult = mock(ScanResult.class);
+//        scanResult.SSID = null;
+//        scanResults.add(scanResult);
+//
+//        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
+//
+//        assertEquals(null, mWiseFy.searchForAccessPoint(TEST_SSID, 1));
+//    }
+//
+//    @Test
+//    public void noCallbacks_failure_nullSSIDParam() {
+//        setManagers();
+//
+//        List<ScanResult> scanResults = new ArrayList<>();
+//        ScanResult scanResult = mock(ScanResult.class);
+//        scanResult.SSID = null;
+//        scanResults.add(scanResult);
+//
+//        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
+//
+//        assertEquals(null, mWiseFy.searchForAccessPoint(null, 1));
+//    }
+//
+//    @Test
+//    public void noCallbacks_failure_differentSSID() {
+//        setManagers();
+//
+//        List<ScanResult> scanResults = new ArrayList<>();
+//        ScanResult scanResult = mock(ScanResult.class);
+//        scanResult.SSID = "Another SSID";
+//        scanResults.add(scanResult);
+//
+//        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
+//
+//        assertEquals(null, mWiseFy.searchForAccessPoint(TEST_SSID, 1));
+//    }
+//
+//    @Test
+//    public void noCallbacks_failure_nullWifiManager() {
+//        setManagersToNull();
+//        assertEquals(null, mWiseFy.searchForAccessPoint(TEST_SSID, 1));
+//    }
+//
+//    @Test
+//    public void noCallbacks_success() {
+//        setManagers();
+//
+//        List<ScanResult> scanResults = new ArrayList<>();
+//        ScanResult scanResult = mock(ScanResult.class);
+//        scanResult.SSID = TEST_SSID;
+//        scanResults.add(scanResult);
+//
+//        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
+//
+//        assertEquals(scanResult, mWiseFy.searchForAccessPoint(TEST_SSID, 1));
+//    }
+//
+//    @Test
+//    public void callbacks_failure() {
+//        setManagers();
+//        SearchForAccessPointCallbacks mockSearchForNetworkCallbacks = mock(SearchForAccessPointCallbacks.class);
+//        mWiseFy.searchForAccessPoint(TEST_SSID, 1, mockSearchForNetworkCallbacks);
+//        verify(mockSearchForNetworkCallbacks, timeout(2000)).accessPointNotFound();
+//    }
+//
+//    @Test
+//    public void callbacks_failure_nullCallback() {
+//        setManagers();
+//        SearchForAccessPointCallbacks mockSearchForNetworkCallbacks = mock(SearchForAccessPointCallbacks.class);
+//        mWiseFy.searchForAccessPoint(TEST_SSID, 1, null);
+//        verify(mockSearchForNetworkCallbacks, never()).accessPointNotFound();
+//    }
+//
+//    @Test
+//    public void callbacks_failure_nullSSID() {
+//        setManagers();
+//
+//        List<ScanResult> scanResults = new ArrayList<>();
+//        ScanResult scanResult = mock(ScanResult.class);
+//        scanResult.SSID = null;
+//        scanResults.add(scanResult);
+//
+//        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
+//
+//        SearchForAccessPointCallbacks mockSearchForNetworkCallbacks = mock(SearchForAccessPointCallbacks.class);
+//        mWiseFy.searchForAccessPoint(TEST_SSID, 1, mockSearchForNetworkCallbacks);
+//        verify(mockSearchForNetworkCallbacks, timeout(2000)).accessPointFound();
+//    }
+//
+//    @Test
+//    public void callbacks_failure_nullSSID_nullCallback() {
+//        setManagers();
+//
+//        List<ScanResult> scanResults = new ArrayList<>();
+//        ScanResult scanResult = mock(ScanResult.class);
+//        scanResult.SSID = null;
+//        scanResults.add(scanResult);
+//
+//        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
+//
+//        SearchForAccessPointCallbacks mockSearchForNetworkCallbacks = mock(SearchForAccessPointCallbacks.class);
+//        mWiseFy.searchForAccessPoint(TEST_SSID, 1, null);
+//        verify(mockSearchForNetworkCallbacks, never()).accessPointNotFound();
+//    }
+//
+//    @Test
+//    public void callbacks_failure_nullSSIDParam() {
+//        setManagers();
+//
+//        List<ScanResult> scanResults = new ArrayList<>();
+//        ScanResult scanResult = mock(ScanResult.class);
+//        scanResult.SSID = null;
+//        scanResults.add(scanResult);
+//
+//        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
+//
+//        SearchForAccessPointCallbacks mockSearchForNetworkCallbacks = mock(SearchForAccessPointCallbacks.class);
+//        mWiseFy.searchForAccessPoint(null, 1, mockSearchForNetworkCallbacks);
+//        verify(mockSearchForNetworkCallbacks, timeout(2000)).searchForNetworkWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
+//    }
+//
+//    @Test
+//    public void callbacks_failure_nullSSIDParam_nullCallback() {
+//        setManagers();
+//
+//        List<ScanResult> scanResults = new ArrayList<>();
+//        ScanResult scanResult = mock(ScanResult.class);
+//        scanResult.SSID = null;
+//        scanResults.add(scanResult);
+//
+//        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
+//
+//        SearchForAccessPointCallbacks mockSearchForNetworkCallbacks = mock(SearchForAccessPointCallbacks.class);
+//        mWiseFy.searchForAccessPoint(null, 1, null);
+//        verify(mockSearchForNetworkCallbacks, never()).searchForNetworkWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
+//    }
+//
+//    @Test
+//    public void callbacks_failure_differentSSID() {
+//        setManagers();
+//
+//        List<ScanResult> scanResults = new ArrayList<>();
+//        ScanResult scanResult = mock(ScanResult.class);
+//        scanResult.SSID = "Another SSID";
+//        scanResults.add(scanResult);
+//
+//        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
+//
+//        SearchForAccessPointCallbacks mockSearchForNetworkCallbacks = mock(SearchForAccessPointCallbacks.class);
+//        mWiseFy.searchForAccessPoint(TEST_SSID, 1, mockSearchForNetworkCallbacks);
+//        verify(mockSearchForNetworkCallbacks, timeout(2000)).accessPointFound();
+//    }
+//
+//    @Test
+//    public void callbacks_failure_differentSSID_nullCallback() {
+//        setManagers();
+//
+//        List<ScanResult> scanResults = new ArrayList<>();
+//        ScanResult scanResult = mock(ScanResult.class);
+//        scanResult.SSID = "Another SSID";
+//        scanResults.add(scanResult);
+//
+//        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
+//
+//        SearchForAccessPointCallbacks mockSearchForNetworkCallbacks = mock(SearchForAccessPointCallbacks.class);
+//        mWiseFy.searchForAccessPoint(TEST_SSID, 1, null);
+//        verify(mockSearchForNetworkCallbacks, never()).accessPointNotFound();
+//    }
+//
+//    @Test
+//    public void callbacks_failure_nullWifiManager() {
+//        setManagersToNull();
+//        SearchForAccessPointCallbacks mockSearchForNetworkCallbacks = mock(SearchForAccessPointCallbacks.class);
+//        mWiseFy.searchForAccessPoint(TEST_SSID, 1, mockSearchForNetworkCallbacks);
+//        verify(mockSearchForNetworkCallbacks, timeout(2000)).searchForNetworkWiseFyFailure(WiseFyCodes.MISSING_PREREQUISITE);
+//    }
+//
+//    @Test
+//    public void callbacks_failure_nullWifiManager_nullCallback() {
+//        setManagersToNull();
+//        SearchForAccessPointCallbacks mockSearchForNetworkCallbacks = mock(SearchForAccessPointCallbacks.class);
+//        mWiseFy.searchForAccessPoint(TEST_SSID, 1, null);
+//        verify(mockSearchForNetworkCallbacks, never()).searchForNetworkWiseFyFailure(WiseFyCodes.MISSING_PREREQUISITE);
+//    }
+//
+//    @Test
+//    public void callbacks_success() {
+//        setManagers();
+//
+//        List<ScanResult> scanResults = new ArrayList<>();
+//        ScanResult scanResult = mock(ScanResult.class);
+//        scanResult.SSID = TEST_SSID;
+//        scanResults.add(scanResult);
+//
+//        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
+//
+//        SearchForAccessPointCallbacks mockSearchForNetworkCallbacks = mock(SearchForAccessPointCallbacks.class);
+//        mWiseFy.searchForAccessPoint(TEST_SSID, 1, mockSearchForNetworkCallbacks);
+//        verify(mockSearchForNetworkCallbacks, timeout(2000)).accessPointFound(scanResult);
+//    }
+//
+//    @Test
+//    public void callbacks_success_nullCallback() {
+//        setManagers();
+//        List<ScanResult> scanResults = new ArrayList<>();
+//        ScanResult scanResult = mock(ScanResult.class);
+//        scanResult.SSID = TEST_SSID;
+//        scanResults.add(scanResult);
+//
+//        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
+//
+//        SearchForAccessPointCallbacks mockSearchForNetworkCallbacks = mock(SearchForAccessPointCallbacks.class);
+//        mWiseFy.searchForAccessPoint(TEST_SSID, 1, null);
+//        verify(mockSearchForNetworkCallbacks, never()).accessPointFound(scanResult);
+//    }
+//}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/SearchForAccessPointsTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/SearchForAccessPointsTests.java
new file mode 100644
index 00000000..67b6188e
--- /dev/null
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/SearchForAccessPointsTests.java
@@ -0,0 +1,13 @@
+//package com.isupatches.wisefy.test;
+//
+//
+//import com.isupatches.wisefy.test.base.BaseTestClass;
+//import com.isupatches.wisefy.test.base.TestActivity;
+//
+//
+//public class SearchForAccessPointsTests extends BaseTestClass<TestActivity> {
+//
+//    public SearchForAccessPointsTests() {
+//        super(TestActivity.class);
+//    }
+//}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/SearchForSSIDTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/SearchForSSIDTests.java
new file mode 100644
index 00000000..fbd43437
--- /dev/null
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/SearchForSSIDTests.java
@@ -0,0 +1,253 @@
+//package com.isupatches.wisefy.test;
+//
+//
+//import android.net.wifi.ScanResult;
+//import com.isupatches.wisefy.callbacks.SearchForSSIDCallbacks;
+//import com.isupatches.wisefy.constants.WiseFyCodes;
+//import com.isupatches.wisefy.test.base.BaseTestClass;
+//import com.isupatches.wisefy.test.base.TestActivity;
+//import org.junit.Test;
+//import java.util.ArrayList;
+//import java.util.List;
+//import static com.isupatches.wisefy.test.base.TestUtils.TEST_SSID;
+//import static org.junit.Assert.assertEquals;
+//import static org.mockito.Mockito.mock;
+//import static org.mockito.Mockito.never;
+//import static org.mockito.Mockito.timeout;
+//import static org.mockito.Mockito.verify;
+//import static org.mockito.Mockito.when;
+//
+//
+//public class SearchForSSIDTests extends BaseTestClass<TestActivity> {
+//
+//    public SearchForSSIDTests() {
+//        super(TestActivity.class);
+//    }
+//
+//    @Test
+//    public void noCallbacks_failure() {
+//        setManagers();
+//        assertEquals(null, mWiseFy.searchForSSID(TEST_SSID, false, 1));
+//    }
+//
+//    @Test
+//    public void noCallbacks_failure_nullSSID() {
+//        setManagers();
+//
+//        List<ScanResult> scanResults = new ArrayList<>();
+//        ScanResult scanResult = mock(ScanResult.class);
+//        scanResult.SSID = null;
+//        scanResults.add(scanResult);
+//
+//        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
+//
+//        assertEquals(null, mWiseFy.searchForSSID(TEST_SSID, false, 1));
+//    }
+//
+//    @Test
+//    public void noCallbacks_failure_nullSSIDParam() {
+//        setManagers();
+//
+//        List<ScanResult> scanResults = new ArrayList<>();
+//        ScanResult scanResult = mock(ScanResult.class);
+//        scanResult.SSID = null;
+//        scanResults.add(scanResult);
+//
+//        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
+//
+//        assertEquals(null, mWiseFy.searchForSSID(null, false, 1));
+//    }
+//
+//    @Test
+//    public void noCallbacks_failure_differentSSID() {
+//        setManagers();
+//
+//        List<ScanResult> scanResults = new ArrayList<>();
+//        ScanResult scanResult = mock(ScanResult.class);
+//        scanResult.SSID = "Another SSID";
+//        scanResults.add(scanResult);
+//
+//        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
+//
+//        assertEquals(null, mWiseFy.searchForSSID(TEST_SSID, false, 1));
+//    }
+//
+//    @Test
+//    public void noCallbacks_failure_nullWifiManager() {
+//        setManagersToNull();
+//        assertEquals(null, mWiseFy.searchForSSID(TEST_SSID, false, 1));
+//    }
+//
+//    @Test
+//    public void noCallbacks_success() {
+//        setManagers();
+//
+//        List<ScanResult> scanResults = new ArrayList<>();
+//        ScanResult scanResult = mock(ScanResult.class);
+//        scanResult.SSID = TEST_SSID;
+//        scanResults.add(scanResult);
+//
+//        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
+//
+//        assertEquals(TEST_SSID, mWiseFy.searchForSSID(TEST_SSID, false, 1));
+//    }
+//
+//    @Test
+//    public void callbacks_failure() {
+//        setManagers();
+//        SearchForSSIDCallbacks mockCallbacks = mock(SearchForSSIDCallbacks.class);
+//        mWiseFy.searchForSSID(TEST_SSID, false, 1, mockCallbacks);
+//        verify(mockCallbacks, timeout(2000)).ssidNotFound();
+//    }
+//
+//    @Test
+//    public void callbacks_failure_nullCallback() {
+//        setManagers();
+//        SearchForSSIDCallbacks mockCallbacks = mock(SearchForSSIDCallbacks.class);
+//        mWiseFy.searchForSSID(TEST_SSID, false, 1, null);
+//        verify(mockCallbacks, never()).ssidNotFound();
+//    }
+//
+//    @Test
+//    public void callbacks_failure_nullSSID() {
+//        setManagers();
+//
+//        List<ScanResult> scanResults = new ArrayList<>();
+//        ScanResult scanResult = mock(ScanResult.class);
+//        scanResult.SSID = null;
+//        scanResults.add(scanResult);
+//
+//        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
+//
+//        SearchForSSIDCallbacks mockCallbacks = mock(SearchForSSIDCallbacks.class);
+//        mWiseFy.searchForSSID(TEST_SSID, false, 1, mockCallbacks);
+//        verify(mockCallbacks, timeout(2000)).ssidNotFound();
+//    }
+//
+//    @Test
+//    public void callbacks_failure_nullSSID_nullCallback() {
+//        setManagers();
+//
+//        List<ScanResult> scanResults = new ArrayList<>();
+//        ScanResult scanResult = mock(ScanResult.class);
+//        scanResult.SSID = null;
+//        scanResults.add(scanResult);
+//
+//        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
+//
+//        SearchForSSIDCallbacks mockCallbacks = mock(SearchForSSIDCallbacks.class);
+//        mWiseFy.searchForSSID(TEST_SSID, false, 1, null);
+//        verify(mockCallbacks, never()).ssidNotFound();
+//    }
+//
+//    @Test
+//    public void callbacks_failure_nullSSIDParam() {
+//        setManagers();
+//
+//        List<ScanResult> scanResults = new ArrayList<>();
+//        ScanResult scanResult = mock(ScanResult.class);
+//        scanResult.SSID = null;
+//        scanResults.add(scanResult);
+//
+//        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
+//
+//        SearchForSSIDCallbacks mockCallbacks = mock(SearchForSSIDCallbacks.class);
+//        mWiseFy.searchForSSID(null, false, 1, mockCallbacks);
+//        verify(mockCallbacks, timeout(2000)).searchForSSIDWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
+//    }
+//
+//    @Test
+//    public void callbacks_failure_nullSSIDParam_nullCallback() {
+//        setManagers();
+//
+//        List<ScanResult> scanResults = new ArrayList<>();
+//        ScanResult scanResult = mock(ScanResult.class);
+//        scanResult.SSID = null;
+//        scanResults.add(scanResult);
+//
+//        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
+//
+//        SearchForSSIDCallbacks mockCallbacks = mock(SearchForSSIDCallbacks.class);
+//        mWiseFy.searchForSSID(null, false, 1, null);
+//        verify(mockCallbacks, never()).searchForSSIDWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
+//    }
+//
+//    @Test
+//    public void callbacks_failure_differentSSID() {
+//        setManagers();
+//
+//        List<ScanResult> scanResults = new ArrayList<>();
+//        ScanResult scanResult = mock(ScanResult.class);
+//        scanResult.SSID = "Another SSID";
+//        scanResults.add(scanResult);
+//
+//        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
+//
+//        SearchForSSIDCallbacks mockCallbacks = mock(SearchForSSIDCallbacks.class);
+//        mWiseFy.searchForSSID(TEST_SSID, false, 1, mockCallbacks);
+//        verify(mockCallbacks, timeout(2000)).ssidNotFound();
+//    }
+//
+//    @Test
+//    public void callbacks_failure_differentSSID_nullCallback() {
+//        setManagers();
+//
+//        List<ScanResult> scanResults = new ArrayList<>();
+//        ScanResult scanResult = mock(ScanResult.class);
+//        scanResult.SSID = "Another SSID";
+//        scanResults.add(scanResult);
+//
+//        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
+//
+//        SearchForSSIDCallbacks mockCallbacks = mock(SearchForSSIDCallbacks.class);
+//        mWiseFy.searchForSSID(TEST_SSID, false, 1, null);
+//        verify(mockCallbacks, never()).ssidNotFound();
+//    }
+//
+//    @Test
+//    public void callbacks_failure_nullWifiManager() {
+//        setManagersToNull();
+//        SearchForSSIDCallbacks mockCallbacks = mock(SearchForSSIDCallbacks.class);
+//        mWiseFy.searchForSSID(TEST_SSID, false, 1, mockCallbacks);
+//        verify(mockCallbacks, timeout(2000)).searchForSSIDWiseFyFailure(WiseFyCodes.MISSING_PREREQUISITE);
+//    }
+//
+//    @Test
+//    public void callbacks_failure_nullWifiManager_nullCallback() {
+//        setManagersToNull();
+//        SearchForSSIDCallbacks mockCallbacks = mock(SearchForSSIDCallbacks.class);
+//        mWiseFy.searchForSSID(TEST_SSID, false, 1, null);
+//        verify(mockCallbacks, never()).searchForSSIDWiseFyFailure(WiseFyCodes.MISSING_PREREQUISITE);
+//    }
+//
+//    @Test
+//    public void callbacks_success() {
+//        setManagers();
+//
+//        List<ScanResult> scanResults = new ArrayList<>();
+//        ScanResult scanResult = mock(ScanResult.class);
+//        scanResult.SSID = TEST_SSID;
+//        scanResults.add(scanResult);
+//
+//        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
+//
+//        SearchForSSIDCallbacks mockCallbacks = mock(SearchForSSIDCallbacks.class);
+//        mWiseFy.searchForSSID(TEST_SSID, false, 1, mockCallbacks);
+//        verify(mockCallbacks, timeout(2000)).ssidFound(TEST_SSID);
+//    }
+//
+//    @Test
+//    public void callbacks_success_nullCallback() {
+//        setManagers();
+//        List<ScanResult> scanResults = new ArrayList<>();
+//        ScanResult scanResult = mock(ScanResult.class);
+//        scanResult.SSID = TEST_SSID;
+//        scanResults.add(scanResult);
+//
+//        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
+//
+//        SearchForSSIDCallbacks mockSearchForSSIDCallbacks = mock(SearchForSSIDCallbacks.class);
+//        mWiseFy.searchForSSID(TEST_SSID, false, 1, null);
+//        verify(mockSearchForSSIDCallbacks, never()).ssidFound(TEST_SSID);
+//    }
+//}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/SearchForSSIDsTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/SearchForSSIDsTests.java
new file mode 100644
index 00000000..74ad79dc
--- /dev/null
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/SearchForSSIDsTests.java
@@ -0,0 +1,8 @@
+//package com.isupatches.wisefy;
+//
+///**
+// * Created by Patches on 7/16/17.
+// */
+//
+//public class SearchForSSIDsTests {
+//}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/WiseFyConnectionTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/WiseFyConnectionTests.java
new file mode 100644
index 00000000..038b93ba
--- /dev/null
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/WiseFyConnectionTests.java
@@ -0,0 +1,5 @@
+//package com.isupatches.wisefy;
+//
+//
+//public class WiseFyConnectionTests {
+//}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/WiseFyPrerequisitesTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/WiseFyPrerequisitesTests.java
new file mode 100644
index 00000000..aa94e8bc
--- /dev/null
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/WiseFyPrerequisitesTests.java
@@ -0,0 +1,54 @@
+package com.isupatches.wisefy;
+
+
+import com.isupatches.wisefy.base.TestActivity;
+import org.junit.Test;
+import static junit.framework.Assert.*;
+
+
+public class WiseFyPrerequisitesTests extends BaseTestClass<TestActivity> {
+
+    public WiseFyPrerequisitesTests() {
+        super(TestActivity.class);
+    }
+
+    @Test
+    public void hasPrerequisites_nullWifiManager() {
+        WiseFyPrerequisites.getInstance().setConnectivityManager(mMockConnectivityManager);
+        WiseFyPrerequisites.getInstance().setWifiManager(null);
+        assertFalse(WiseFyPrerequisites.getInstance().hasPrerequisites());
+    }
+
+    @Test
+    public void hasPrerequisites_nullConnectivityManager() {
+        WiseFyPrerequisites.getInstance().setConnectivityManager(null);
+        WiseFyPrerequisites.getInstance().setWifiManager(mMockWiFiManager);
+        assertFalse(WiseFyPrerequisites.getInstance().hasPrerequisites());
+    }
+
+    @Test
+    public void hasPrerequisites_noManagers() {
+        WiseFyPrerequisites.getInstance().setConnectivityManager(null);
+        WiseFyPrerequisites.getInstance().setWifiManager(null);
+        assertFalse(WiseFyPrerequisites.getInstance().hasPrerequisites());
+    }
+
+    @Test
+    public void hasPrerequisites_bothManagers() {
+        WiseFyPrerequisites.getInstance().setConnectivityManager(mMockConnectivityManager);
+        WiseFyPrerequisites.getInstance().setWifiManager(mMockWiFiManager);
+        assertTrue(WiseFyPrerequisites.getInstance().hasPrerequisites());
+    }
+
+    @Test
+    public void connectivityManager_getterAndSetter() {
+        WiseFyPrerequisites.getInstance().setConnectivityManager(mMockConnectivityManager);
+        assertEquals(mMockConnectivityManager, WiseFyPrerequisites.getInstance().getConnectivityManager());
+    }
+
+    @Test
+    public void wifiManager_getterAndSetter() {
+        WiseFyPrerequisites.getInstance().setWifiManager(mMockWiFiManager);
+        assertEquals(mMockWiFiManager, WiseFyPrerequisites.getInstance().getWifiManager());
+    }
+}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/WiseFySearchTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/WiseFySearchTests.java
new file mode 100644
index 00000000..eb786da6
--- /dev/null
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/WiseFySearchTests.java
@@ -0,0 +1,860 @@
+package com.isupatches.wisefy;
+
+
+import android.net.wifi.ScanResult;
+import android.net.wifi.WifiConfiguration;
+import com.isupatches.wisefy.base.TestActivity;
+import org.junit.Test;
+import java.util.ArrayList;
+import java.util.List;
+import static com.isupatches.wisefy.base.TestUtils.TEST_SSID;
+import static com.isupatches.wisefy.base.TestUtils.TEST_SSID2;
+import static com.isupatches.wisefy.base.TestUtils.TEST_SSID3;
+import static junit.framework.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+
+public class WiseFySearchTests extends BaseTestClass<TestActivity> {
+
+    public WiseFySearchTests() {
+        super(TestActivity.class);
+    }
+
+    /*
+     * findAccessPointByRegex tests
+     */
+
+    @Test
+    public void findAccessPointByRegex_failure_nullAccessPoints_takeHighest_false() {
+        when(mMockWiFiManager.getScanResults()).thenReturn(null);
+        assertEquals(null, mWiseFy.mWiseFySearch.findAccessPointByRegex(TEST_SSID, 1000, false));
+    }
+
+    @Test
+    public void findAccessPointByRegex_failure_nullAccessPoints_takeHighest_true() {
+        when(mMockWiFiManager.getScanResults()).thenReturn(null);
+        assertEquals(null, mWiseFy.mWiseFySearch.findAccessPointByRegex(TEST_SSID, 1000, true));
+    }
+
+    @Test
+    public void findAccessPointByRegex_failure_emptyAccessPointList_takeHighest_false() {
+        when(mMockWiFiManager.getScanResults()).thenReturn(new ArrayList<ScanResult>());
+        assertEquals(null, mWiseFy.mWiseFySearch.findAccessPointByRegex(TEST_SSID, 1000, false));
+    }
+
+    @Test
+    public void findAccessPointByRegex_failure_emptyAccessPointList_takeHighest_true() {
+        when(mMockWiFiManager.getScanResults()).thenReturn(new ArrayList<ScanResult>());
+        assertEquals(null, mWiseFy.mWiseFySearch.findAccessPointByRegex(TEST_SSID, 1000, true));
+    }
+
+    @Test
+    public void findAccessPointByRegex_failure_nullAccessPoint_takeHighest_false() {
+        List<ScanResult> accessPoints = new ArrayList<>();
+        accessPoints.add(null);
+
+        when(mMockWiFiManager.getScanResults()).thenReturn(accessPoints);
+        assertEquals(null, mWiseFy.mWiseFySearch.findAccessPointByRegex(TEST_SSID, 1000, false));
+    }
+
+    @Test
+    public void findAccessPointByRegex_failure_nullAccessPoint_takeHighest_true() {
+        List<ScanResult> accessPoints = new ArrayList<>();
+        accessPoints.add(null);
+
+        when(mMockWiFiManager.getScanResults()).thenReturn(accessPoints);
+        assertEquals(null, mWiseFy.mWiseFySearch.findAccessPointByRegex(TEST_SSID, 1000, true));
+    }
+
+    @Test
+    public void findAccessPointByRegex_failure_nullSSID_takeHighest_false() {
+        List<ScanResult> accessPoints = new ArrayList<>();
+
+        ScanResult accessPoint= mock(ScanResult.class);
+        accessPoint.SSID = null;
+        accessPoints.add(accessPoint);
+
+        when(mMockWiFiManager.getScanResults()).thenReturn(accessPoints);
+        assertEquals(null, mWiseFy.mWiseFySearch.findAccessPointByRegex(TEST_SSID, 1000, false));
+    }
+
+    @Test
+    public void findAccessPointByRegex_failure_nullSSID_takeHighest_true() {
+        List<ScanResult> accessPoints = new ArrayList<>();
+
+        ScanResult accessPoint= mock(ScanResult.class);
+        accessPoint.SSID = null;
+        accessPoints.add(accessPoint);
+
+        when(mMockWiFiManager.getScanResults()).thenReturn(accessPoints);
+        assertEquals(null, mWiseFy.mWiseFySearch.findAccessPointByRegex(TEST_SSID, 1000, true));
+    }
+
+    @Test
+    public void findAccessPointByRegex_failure_nonMatchingSSID_takeHighest_false() {
+        List<ScanResult> accessPoints = new ArrayList<>();
+
+        ScanResult accessPoint= mock(ScanResult.class);
+        accessPoint.SSID = TEST_SSID2;
+        accessPoints.add(accessPoint);
+
+        when(mMockWiFiManager.getScanResults()).thenReturn(accessPoints);
+        assertEquals(null, mWiseFy.mWiseFySearch.findAccessPointByRegex(TEST_SSID, 1000, false));
+    }
+
+    @Test
+    public void findAccessPointByRegex_failure_nonMatchingSSID_takeHighest_true() {
+        List<ScanResult> accessPoints = new ArrayList<>();
+
+        ScanResult accessPoint= mock(ScanResult.class);
+        accessPoint.SSID = TEST_SSID2;
+        accessPoints.add(accessPoint);
+
+        when(mMockWiFiManager.getScanResults()).thenReturn(accessPoints);
+        assertEquals(null, mWiseFy.mWiseFySearch.findAccessPointByRegex(TEST_SSID, 1000, true));
+    }
+
+    @Test
+    public void findAccessPointByRegex_failure_multipleNonMatchingSSIDs_takeHighest_false() {
+        List<ScanResult> accessPoints = new ArrayList<>();
+
+        ScanResult accessPoint1 = mock(ScanResult.class);
+        accessPoint1.SSID = TEST_SSID2;
+        accessPoints.add(accessPoint1);
+
+        ScanResult accessPoint2 = mock(ScanResult.class);
+        accessPoint2.SSID = TEST_SSID3;
+        accessPoints.add(accessPoint2);
+
+        when(mMockWiFiManager.getScanResults()).thenReturn(accessPoints);
+        assertEquals(null, mWiseFy.mWiseFySearch.findAccessPointByRegex(TEST_SSID, 1000, false));
+    }
+
+    @Test
+    public void findAccessPointByRegex_failure_multipleNnonMatchingSSIDs_takeHighest_true() {
+        List<ScanResult> accessPoints = new ArrayList<>();
+
+        ScanResult accessPoint1= mock(ScanResult.class);
+        accessPoint1.SSID = TEST_SSID2;
+        accessPoints.add(accessPoint1);
+
+        ScanResult accessPoint2 = mock(ScanResult.class);
+        accessPoint2.SSID = TEST_SSID3;
+        accessPoints.add(accessPoint2);
+
+        when(mMockWiFiManager.getScanResults()).thenReturn(accessPoints);
+        assertEquals(null, mWiseFy.mWiseFySearch.findAccessPointByRegex(TEST_SSID, 1000, true));
+    }
+
+    @Test
+    public void findAccessPointByRegex_success_takeHighest_false() {
+        List<ScanResult> accessPoints = new ArrayList<>();
+
+        ScanResult accessPoint = mock(ScanResult.class);
+        accessPoint.SSID = TEST_SSID;
+        accessPoints.add(accessPoint);
+
+        when(mMockWiFiManager.getScanResults()).thenReturn(accessPoints);
+        assertEquals(accessPoint, mWiseFy.mWiseFySearch.findAccessPointByRegex(TEST_SSID, 1000, false));
+    }
+
+    @Test
+    public void findAccessPointByRegex_success_takeHighest_true() {
+        List<ScanResult> accessPoints = new ArrayList<>();
+
+        ScanResult accessPoint = mock(ScanResult.class);
+        accessPoint.SSID = TEST_SSID;
+        accessPoints.add(accessPoint);
+
+        when(mMockWiFiManager.getScanResults()).thenReturn(accessPoints);
+        assertEquals(accessPoint, mWiseFy.mWiseFySearch.findAccessPointByRegex(TEST_SSID, 1000, true));
+    }
+
+    @Test
+    public void findAccessPointByRegex_success_multipleSSIDs_takeHighest_false() {
+        List<ScanResult> accessPoints = new ArrayList<>();
+
+        ScanResult accessPoint1 = mock(ScanResult.class);
+        accessPoint1.SSID = TEST_SSID;
+        accessPoint1.level = -70;
+        accessPoints.add(accessPoint1);
+
+        ScanResult accessPoint2 = mock(ScanResult.class);
+        accessPoint2.SSID = TEST_SSID2;
+        accessPoint2.level = -50;
+        accessPoints.add(accessPoint2);
+
+        when(mMockWiFiManager.getScanResults()).thenReturn(accessPoints);
+        assertEquals(accessPoint1, mWiseFy.mWiseFySearch.findAccessPointByRegex(TEST_SSID, 1000, false));
+    }
+
+    @Test
+    public void findAccessPointByRegex_success_multipleSSIDs_takeHighest_true() {
+        List<ScanResult> accessPoints = new ArrayList<>();
+
+        ScanResult accessPoint1 = mock(ScanResult.class);
+        accessPoint1.SSID = TEST_SSID;
+        accessPoint1.level = -70;
+        accessPoints.add(accessPoint1);
+
+        ScanResult accessPoint2 = mock(ScanResult.class);
+        accessPoint2.SSID = TEST_SSID2;
+        accessPoint2.level = -50;
+        accessPoints.add(accessPoint2);
+
+        when(mMockWiFiManager.getScanResults()).thenReturn(accessPoints);
+        assertEquals(accessPoint1, mWiseFy.mWiseFySearch.findAccessPointByRegex(TEST_SSID, 1000, true));
+    }
+
+    @Test
+    public void findAccessPointByRegex_success_multipleSameSSIDs_takeHighest_false() {
+        List<ScanResult> accessPoints = new ArrayList<>();
+
+        ScanResult accessPoint1 = mock(ScanResult.class);
+        accessPoint1.SSID = TEST_SSID;
+        accessPoint1.level = -70;
+        accessPoints.add(accessPoint1);
+
+        ScanResult accessPoint2 = mock(ScanResult.class);
+        accessPoint2.SSID = TEST_SSID;
+        accessPoint2.level = -50;
+        accessPoints.add(accessPoint2);
+
+        when(mMockWiFiManager.getScanResults()).thenReturn(accessPoints);
+        assertEquals(accessPoint1, mWiseFy.mWiseFySearch.findAccessPointByRegex(TEST_SSID, 1000, false));
+    }
+
+    @Test
+    public void findAccessPointByRegex_success_multipleSameSSIDs_takeHighest_true() {
+        List<ScanResult> accessPoints = new ArrayList<>();
+
+        ScanResult accessPoint1 = mock(ScanResult.class);
+        accessPoint1.SSID = TEST_SSID;
+        accessPoint1.level = -70;
+        accessPoints.add(accessPoint1);
+
+        ScanResult accessPoint2 = mock(ScanResult.class);
+        accessPoint2.SSID = TEST_SSID;
+        accessPoint2.level = -50;
+        accessPoints.add(accessPoint2);
+
+        when(mMockWiFiManager.getScanResults()).thenReturn(accessPoints);
+        assertEquals(accessPoint2, mWiseFy.mWiseFySearch.findAccessPointByRegex(TEST_SSID, 1000, true));
+    }
+
+    /*
+     * findAccessPointsMatchingRegex tests
+     */
+
+    @Test
+    public void findAccessPointsMatchingRegex_failure_nullAccessPoints_takeHighest_false() {
+        when(mMockWiFiManager.getScanResults()).thenReturn(null);
+        assertEquals(null, mWiseFy.mWiseFySearch.findAccessPointsMatchingRegex(TEST_SSID, false));
+    }
+
+    @Test
+    public void findAccessPointsMatchingRegex_failure_nullAccessPoints_takeHighest_true() {
+        when(mMockWiFiManager.getScanResults()).thenReturn(null);
+        assertEquals(null, mWiseFy.mWiseFySearch.findAccessPointsMatchingRegex(TEST_SSID, true));
+    }
+
+    @Test
+    public void findAccessPointsMatchingRegex_failure_emptyAccessPointList_takeHighest_false() {
+        when(mMockWiFiManager.getScanResults()).thenReturn(new ArrayList<ScanResult>());
+        assertEquals(null, mWiseFy.mWiseFySearch.findAccessPointsMatchingRegex(TEST_SSID, false));
+    }
+
+    @Test
+    public void findAccessPointsMatchingRegex_failure_emptyAccessPointList_takeHighest_true() {
+        when(mMockWiFiManager.getScanResults()).thenReturn(new ArrayList<ScanResult>());
+        assertEquals(null, mWiseFy.mWiseFySearch.findAccessPointsMatchingRegex(TEST_SSID, true));
+    }
+
+    @Test
+    public void findAccessPointsMatchingRegex_failure_nullAccessPoint_takeHighest_false() {
+        List<ScanResult> accessPoints = new ArrayList<>();
+        accessPoints.add(null);
+
+        when(mMockWiFiManager.getScanResults()).thenReturn(accessPoints);
+        assertEquals(null, mWiseFy.mWiseFySearch.findAccessPointsMatchingRegex(TEST_SSID, false));
+    }
+
+    @Test
+    public void findAccessPointsMatchingRegex_failure_nullAccessPoint_takeHighest_true() {
+        List<ScanResult> accessPoints = new ArrayList<>();
+        accessPoints.add(null);
+
+        when(mMockWiFiManager.getScanResults()).thenReturn(accessPoints);
+        assertEquals(null, mWiseFy.mWiseFySearch.findAccessPointsMatchingRegex(TEST_SSID, true));
+    }
+
+    @Test
+    public void findAccessPointsMatchingRegex_failure_nullSSID_takeHighest_false() {
+        List<ScanResult> accessPoints = new ArrayList<>();
+
+        ScanResult accessPoint= mock(ScanResult.class);
+        accessPoint.SSID = null;
+        accessPoints.add(accessPoint);
+
+        when(mMockWiFiManager.getScanResults()).thenReturn(accessPoints);
+        assertEquals(null, mWiseFy.mWiseFySearch.findAccessPointsMatchingRegex(TEST_SSID, false));
+    }
+
+    @Test
+    public void findAccessPointsMatchingRegex_failure_nullSSID_takeHighest_true() {
+        List<ScanResult> accessPoints = new ArrayList<>();
+
+        ScanResult accessPoint= mock(ScanResult.class);
+        accessPoint.SSID = null;
+        accessPoints.add(accessPoint);
+
+        when(mMockWiFiManager.getScanResults()).thenReturn(accessPoints);
+        assertEquals(null, mWiseFy.mWiseFySearch.findAccessPointsMatchingRegex(TEST_SSID, true));
+    }
+
+    @Test
+    public void findAccessPointsMatchingRegex_failure_nonMatchingSSID_takeHighest_false() {
+        List<ScanResult> accessPoints = new ArrayList<>();
+
+        ScanResult accessPoint= mock(ScanResult.class);
+        accessPoint.SSID = TEST_SSID2;
+        accessPoints.add(accessPoint);
+
+        when(mMockWiFiManager.getScanResults()).thenReturn(accessPoints);
+        assertEquals(null, mWiseFy.mWiseFySearch.findAccessPointsMatchingRegex(TEST_SSID, false));
+    }
+
+    @Test
+    public void findAccessPointsMatchingRegex_failure_nonMatchingSSID_takeHighest_true() {
+        List<ScanResult> accessPoints = new ArrayList<>();
+
+        ScanResult accessPoint= mock(ScanResult.class);
+        accessPoint.SSID = TEST_SSID2;
+        accessPoints.add(accessPoint);
+
+        when(mMockWiFiManager.getScanResults()).thenReturn(accessPoints);
+        assertEquals(null, mWiseFy.mWiseFySearch.findAccessPointsMatchingRegex(TEST_SSID, true));
+    }
+
+    @Test
+    public void findAccessPointsMatchingRegex_failure_multipleNonMatchingSSIDs_takeHighest_false() {
+        List<ScanResult> accessPoints = new ArrayList<>();
+
+        ScanResult accessPoint1 = mock(ScanResult.class);
+        accessPoint1.SSID = TEST_SSID2;
+        accessPoints.add(accessPoint1);
+
+        ScanResult accessPoint2 = mock(ScanResult.class);
+        accessPoint2.SSID = TEST_SSID3;
+        accessPoints.add(accessPoint2);
+
+        when(mMockWiFiManager.getScanResults()).thenReturn(accessPoints);
+        assertEquals(null, mWiseFy.mWiseFySearch.findAccessPointsMatchingRegex(TEST_SSID, false));
+    }
+
+    @Test
+    public void findAccessPointsMatchingRegex_failure_multipleNnonMatchingSSIDs_takeHighest_true() {
+        List<ScanResult> accessPoints = new ArrayList<>();
+
+        ScanResult accessPoint1= mock(ScanResult.class);
+        accessPoint1.SSID = TEST_SSID2;
+        accessPoints.add(accessPoint1);
+
+        ScanResult accessPoint2 = mock(ScanResult.class);
+        accessPoint2.SSID = TEST_SSID3;
+        accessPoints.add(accessPoint2);
+
+        when(mMockWiFiManager.getScanResults()).thenReturn(accessPoints);
+        assertEquals(null, mWiseFy.mWiseFySearch.findAccessPointsMatchingRegex(TEST_SSID, true));
+    }
+
+    @Test
+    public void findAccessPointsMatchingRegex_success_takeHighest_false() {
+        List<ScanResult> accessPoints = new ArrayList<>();
+
+        ScanResult accessPoint = mock(ScanResult.class);
+        accessPoint.SSID = TEST_SSID;
+        accessPoints.add(accessPoint);
+
+        when(mMockWiFiManager.getScanResults()).thenReturn(accessPoints);
+        assertEquals(accessPoints, mWiseFy.mWiseFySearch.findAccessPointsMatchingRegex(TEST_SSID, false));
+    }
+
+    @Test
+    public void findAccessPointsMatchingRegex_success_takeHighest_true() {
+        List<ScanResult> accessPoints = new ArrayList<>();
+
+        ScanResult accessPoint = mock(ScanResult.class);
+        accessPoint.SSID = TEST_SSID;
+        accessPoints.add(accessPoint);
+
+        when(mMockWiFiManager.getScanResults()).thenReturn(accessPoints);
+        assertEquals(accessPoints, mWiseFy.mWiseFySearch.findAccessPointsMatchingRegex(TEST_SSID, true));
+    }
+
+    @Test
+    public void findAccessPointsMatchingRegex_success_multipleSSIDs_takeHighest_false() {
+        List<ScanResult> accessPoints = new ArrayList<>();
+        List<ScanResult> expectedResults = new ArrayList<>();
+
+        ScanResult accessPoint1 = mock(ScanResult.class);
+        accessPoint1.SSID = TEST_SSID;
+        accessPoint1.level = -70;
+        accessPoints.add(accessPoint1);
+        expectedResults.add(accessPoint1);
+
+        ScanResult accessPoint2 = mock(ScanResult.class);
+        accessPoint2.SSID = TEST_SSID2;
+        accessPoint2.level = -50;
+        accessPoints.add(accessPoint2);
+
+        when(mMockWiFiManager.getScanResults()).thenReturn(accessPoints);
+        assertEquals(expectedResults, mWiseFy.mWiseFySearch.findAccessPointsMatchingRegex(TEST_SSID, false));
+    }
+
+    @Test
+    public void findAccessPointsMatchingRegex_success_multipleSSIDs_takeHighest_true() {
+        List<ScanResult> accessPoints = new ArrayList<>();
+        List<ScanResult> expectedResults = new ArrayList<>();
+
+        ScanResult accessPoint1 = mock(ScanResult.class);
+        accessPoint1.SSID = TEST_SSID;
+        accessPoint1.level = -70;
+        accessPoints.add(accessPoint1);
+        expectedResults.add(accessPoint1);
+
+        ScanResult accessPoint2 = mock(ScanResult.class);
+        accessPoint2.SSID = TEST_SSID2;
+        accessPoint2.level = -50;
+        accessPoints.add(accessPoint2);
+
+        when(mMockWiFiManager.getScanResults()).thenReturn(accessPoints);
+        assertEquals(expectedResults, mWiseFy.mWiseFySearch.findAccessPointsMatchingRegex(TEST_SSID, true));
+    }
+
+    @Test
+    public void findAccessPointsMatchingRegex_success_multipleSameSSIDs_takeHighest_false() {
+        List<ScanResult> accessPoints = new ArrayList<>();
+        List<ScanResult> expectedResults = new ArrayList<>();
+
+        ScanResult accessPoint1 = mock(ScanResult.class);
+        accessPoint1.SSID = TEST_SSID;
+        accessPoint1.level = -70;
+        accessPoints.add(accessPoint1);
+        expectedResults.add(accessPoint1);
+
+        ScanResult accessPoint2 = mock(ScanResult.class);
+        accessPoint2.SSID = TEST_SSID;
+        accessPoint2.level = -50;
+        accessPoints.add(accessPoint2);
+        expectedResults.add(accessPoint2);
+
+        when(mMockWiFiManager.getScanResults()).thenReturn(accessPoints);
+        assertEquals(expectedResults, mWiseFy.mWiseFySearch.findAccessPointsMatchingRegex(TEST_SSID, false));
+    }
+
+    @Test
+    public void findAccessPointsMatchingRegex_success_multipleSameSSIDs_takeHighest_true() {
+        List<ScanResult> accessPoints = new ArrayList<>();
+        List<ScanResult> expectedResults = new ArrayList<>();
+
+        ScanResult accessPoint1 = mock(ScanResult.class);
+        accessPoint1.SSID = TEST_SSID;
+        accessPoint1.level = -70;
+        accessPoints.add(accessPoint1);
+
+        ScanResult accessPoint2 = mock(ScanResult.class);
+        accessPoint2.SSID = TEST_SSID;
+        accessPoint2.level = -50;
+        accessPoints.add(accessPoint2);
+        expectedResults.add(accessPoint2);
+
+        when(mMockWiFiManager.getScanResults()).thenReturn(accessPoints);
+        assertEquals(expectedResults, mWiseFy.mWiseFySearch.findAccessPointsMatchingRegex(TEST_SSID, true));
+    }
+
+    /*
+     * findSavedNetworkByRegex tests
+     */
+
+    @Test
+    public void findSavedNetworkByRegex_failure_nullSavedNetworkList() {
+        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(null);
+        assertEquals(null, mWiseFy.mWiseFySearch.findSavedNetworkByRegex(TEST_SSID));
+    }
+
+    @Test
+    public void findSavedNetworkByRegex_failure_emptySavedNetworkList() {
+        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(new ArrayList<WifiConfiguration>());
+        assertEquals(null, mWiseFy.mWiseFySearch.findSavedNetworkByRegex(TEST_SSID));
+    }
+
+    @Test
+    public void findSavedNetworkByRegex_failure_nullWifiConfiguration() {
+        List<WifiConfiguration> wifiList = new ArrayList<>();
+        wifiList.add(null);
+
+        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
+        assertEquals(null, mWiseFy.mWiseFySearch.findSavedNetworkByRegex(TEST_SSID));
+    }
+
+    @Test
+    public void findSavedNetworkByRegex_failure_nullSSID() {
+        List<WifiConfiguration> wifiList = new ArrayList<>();
+        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
+        mWiFiConfiguration.SSID = null;
+        wifiList.add(mWiFiConfiguration);
+
+        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
+        assertEquals(null, mWiseFy.mWiseFySearch.findSavedNetworkByRegex(TEST_SSID));
+    }
+
+    @Test
+    public void findSavedNetworkByRegex_failure_nonMatchingSSID() {
+        List<WifiConfiguration> wifiList = new ArrayList<>();
+
+        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
+        mWiFiConfiguration.SSID = TEST_SSID2;
+        wifiList.add(mWiFiConfiguration);
+
+        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
+        assertEquals(null, mWiseFy.mWiseFySearch.findSavedNetworkByRegex(TEST_SSID));
+    }
+
+    @Test
+    public void findSavedNetworkByRegex_failure_multipleNonMatchingSSIDs() {
+        List<WifiConfiguration> wifiList = new ArrayList<>();
+
+        WifiConfiguration mWiFiConfiguration1 = new WifiConfiguration();
+        mWiFiConfiguration1.SSID = TEST_SSID2;
+        wifiList.add(mWiFiConfiguration1);
+
+        WifiConfiguration mWiFiConfiguration2 = new WifiConfiguration();
+        mWiFiConfiguration2.SSID = TEST_SSID3;
+        wifiList.add(mWiFiConfiguration2);
+
+        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
+        assertEquals(null, mWiseFy.mWiseFySearch.findSavedNetworkByRegex(TEST_SSID));
+    }
+
+    @Test
+    public void findSavedNetworkByRegex_success() {
+        List<WifiConfiguration> wifiList = new ArrayList<>();
+
+        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
+        mWiFiConfiguration.SSID = TEST_SSID;
+        wifiList.add(mWiFiConfiguration);
+
+        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
+        assertEquals(mWiFiConfiguration, mWiseFy.mWiseFySearch.findSavedNetworkByRegex(TEST_SSID));
+    }
+
+    @Test
+    public void findSavedNetworkByRegex_success_multipleSSIDs() {
+        List<WifiConfiguration> wifiList = new ArrayList<>();
+
+        WifiConfiguration mWiFiConfiguration1 = new WifiConfiguration();
+        mWiFiConfiguration1.SSID = TEST_SSID;
+        wifiList.add(mWiFiConfiguration1);
+
+        WifiConfiguration mWiFiConfiguration2 = new WifiConfiguration();
+        mWiFiConfiguration2.SSID = TEST_SSID2;
+        wifiList.add(mWiFiConfiguration2);
+
+        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
+        assertEquals(mWiFiConfiguration1, mWiseFy.mWiseFySearch.findSavedNetworkByRegex(TEST_SSID));
+    }
+
+    /*
+     * findSavedNetworksMatchingRegex tests
+     */
+
+    @Test
+    public void findSavedNetworksMatchingRegex_failure_nullSavedNetworkList() {
+        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(null);
+        assertEquals(null, mWiseFy.mWiseFySearch.findSavedNetworksMatchingRegex(TEST_SSID));
+    }
+
+    @Test
+    public void findSavedNetworksMatchingRegex_failure_emptySavedNetworkList() {
+        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(new ArrayList<WifiConfiguration>());
+        assertEquals(null, mWiseFy.mWiseFySearch.findSavedNetworksMatchingRegex(TEST_SSID));
+    }
+
+    @Test
+    public void findSavedNetworksMatchingRegex_failure_nullWifiConfiguration() {
+        List<WifiConfiguration> wifiList = new ArrayList<>();
+        wifiList.add(null);
+
+        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
+        assertEquals(null, mWiseFy.mWiseFySearch.findSavedNetworksMatchingRegex(TEST_SSID));
+    }
+
+    @Test
+    public void findSavedNetworksMatchingRegex_failure_nullSSID() {
+        List<WifiConfiguration> wifiList = new ArrayList<>();
+        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
+        mWiFiConfiguration.SSID = null;
+        wifiList.add(mWiFiConfiguration);
+
+        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
+        assertEquals(null, mWiseFy.mWiseFySearch.findSavedNetworksMatchingRegex(TEST_SSID));
+    }
+
+    @Test
+    public void findSavedNetworksMatchingRegex_failure_nonMatchingSSID() {
+        List<WifiConfiguration> wifiList = new ArrayList<>();
+        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
+        mWiFiConfiguration.SSID = TEST_SSID2;
+        wifiList.add(mWiFiConfiguration);
+
+        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
+        assertEquals(null, mWiseFy.mWiseFySearch.findSavedNetworksMatchingRegex(TEST_SSID));
+    }
+
+    @Test
+    public void findSavedNetworksMatchingRegex_failure_multipleNonMatchingSSIDs() {
+        List<WifiConfiguration> wifiList = new ArrayList<>();
+
+        WifiConfiguration mWiFiConfiguration1 = new WifiConfiguration();
+        mWiFiConfiguration1.SSID = TEST_SSID2;
+        wifiList.add(mWiFiConfiguration1);
+
+        WifiConfiguration mWiFiConfiguration2 = new WifiConfiguration();
+        mWiFiConfiguration2.SSID = TEST_SSID3;
+        wifiList.add(mWiFiConfiguration2);
+
+        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
+        assertEquals(null, mWiseFy.mWiseFySearch.findSavedNetworksMatchingRegex(TEST_SSID));
+    }
+
+    @Test
+    public void findSavedNetworksMatchingRegex_success() {
+        List<WifiConfiguration> wifiList = new ArrayList<>();
+
+        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
+        mWiFiConfiguration.SSID = TEST_SSID;
+        wifiList.add(mWiFiConfiguration);
+
+        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
+        assertEquals(wifiList, mWiseFy.mWiseFySearch.findSavedNetworksMatchingRegex(TEST_SSID));
+    }
+
+    @Test
+    public void findSavedNetworksMatchingRegex_success_multipleSSIDs() {
+        List<WifiConfiguration> wifiList = new ArrayList<>();
+
+        WifiConfiguration mWiFiConfiguration1 = new WifiConfiguration();
+        mWiFiConfiguration1.SSID = TEST_SSID;
+        wifiList.add(mWiFiConfiguration1);
+
+        WifiConfiguration mWiFiConfiguration2 = new WifiConfiguration();
+        mWiFiConfiguration2.SSID = TEST_SSID2;
+        wifiList.add(mWiFiConfiguration2);
+
+        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
+        assertEquals(wifiList, mWiseFy.mWiseFySearch.findSavedNetworksMatchingRegex(".*Test.*"));
+    }
+
+    /*
+     * findSSIDsMatchingRegex tests
+     */
+
+    @Test
+    public void findSSIDsMatchingRegex_failure_nullAccessPoints() {
+        when(mMockWiFiManager.getScanResults()).thenReturn(null);
+        assertEquals(null, mWiseFy.mWiseFySearch.findSSIDsMatchingRegex(TEST_SSID));
+    }
+
+    @Test
+    public void findSSIDsMatchingRegex_failure_emptySavedNetworkList() {
+        when(mMockWiFiManager.getScanResults()).thenReturn(new ArrayList<ScanResult>());
+        assertEquals(null, mWiseFy.mWiseFySearch.findSSIDsMatchingRegex(TEST_SSID));
+    }
+
+    @Test
+    public void findSSIDsMatchingRegex_failure_nullWifiConfiguration() {
+        List<ScanResult> accessPoints = new ArrayList<>();
+        accessPoints.add(null);
+
+        when(mMockWiFiManager.getScanResults()).thenReturn(accessPoints);
+        assertEquals(null, mWiseFy.mWiseFySearch.findSSIDsMatchingRegex(TEST_SSID));
+    }
+
+    @Test
+    public void findSSIDsMatchingRegex_failure_nullSSID() {
+        List<ScanResult> accessPoints = new ArrayList<>();
+
+        ScanResult accessPoint = mock(ScanResult.class);
+        accessPoint.SSID = null;
+        accessPoints.add(accessPoint);
+
+        when(mMockWiFiManager.getScanResults()).thenReturn(accessPoints);
+        assertEquals(null, mWiseFy.mWiseFySearch.findSSIDsMatchingRegex(TEST_SSID));
+    }
+
+    @Test
+    public void findSSIDsMatchingRegex_failure_nonMatchingSSID() {
+        List<ScanResult> accessPoints = new ArrayList<>();
+
+        ScanResult accessPoint = mock(ScanResult.class);
+        accessPoint.SSID = TEST_SSID2;
+        accessPoints.add(accessPoint);
+
+        when(mMockWiFiManager.getScanResults()).thenReturn(accessPoints);
+        assertEquals(null, mWiseFy.mWiseFySearch.findSSIDsMatchingRegex(TEST_SSID));
+    }
+
+    @Test
+    public void findSSIDsMatchingRegex_failure_multipleNonMatchingSSIDs() {
+        List<ScanResult> accessPoints = new ArrayList<>();
+
+        ScanResult accessPoint1 = mock(ScanResult.class);
+        accessPoint1.SSID = TEST_SSID2;
+        accessPoints.add(accessPoint1);
+
+        ScanResult accessPoint2 = mock(ScanResult.class);
+        accessPoint2.SSID = TEST_SSID3;
+        accessPoints.add(accessPoint2);
+
+        when(mMockWiFiManager.getScanResults()).thenReturn(accessPoints);
+        assertEquals(null, mWiseFy.mWiseFySearch.findSSIDsMatchingRegex(TEST_SSID));
+    }
+
+    @Test
+    public void findSSIDsMatchingRegex_success() {
+        List<ScanResult> accessPoints = new ArrayList<>();
+        List<String> expectedResults = new ArrayList<>();
+
+        ScanResult accessPoint = mock(ScanResult.class);
+        accessPoint.SSID = TEST_SSID;
+        accessPoints.add(accessPoint);
+        expectedResults.add(TEST_SSID);
+
+        when(mMockWiFiManager.getScanResults()).thenReturn(accessPoints);
+        assertEquals(expectedResults, mWiseFy.mWiseFySearch.findSSIDsMatchingRegex(TEST_SSID));
+    }
+
+    @Test
+    public void findSSIDsMatchingRegex_success_multipleSSIDs() {
+        List<ScanResult> accessPoints = new ArrayList<>();
+        List<String> expectedResults = new ArrayList<>();
+
+        ScanResult accessPoint1 = mock(ScanResult.class);
+        accessPoint1.SSID = TEST_SSID;
+        accessPoints.add(accessPoint1);
+        expectedResults.add(TEST_SSID);
+
+        ScanResult accessPoint2 = mock(ScanResult.class);
+        accessPoint2.SSID = TEST_SSID;
+        accessPoints.add(accessPoint2);
+        expectedResults.add(TEST_SSID);
+
+        when(mMockWiFiManager.getScanResults()).thenReturn(accessPoints);
+        assertEquals(expectedResults, mWiseFy.mWiseFySearch.findSSIDsMatchingRegex(".*Test.*"));
+    }
+
+    /*
+     *  isNetworkASavedConfiguration tests
+     */
+
+    @Test
+    public void isNetworkASavedConfiguration_failure() {
+        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(new ArrayList<WifiConfiguration>());
+        assertEquals(false, mWiseFy.mWiseFySearch.isNetworkASavedConfiguration(TEST_SSID));
+    }
+
+    @Test
+    public void isNetworkASavedConfiguration_success() {
+        List<WifiConfiguration> wifiList = new ArrayList<>();
+
+        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
+        mWiFiConfiguration.SSID = TEST_SSID;
+        wifiList.add(mWiFiConfiguration);
+
+        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
+        assertEquals(true, mWiseFy.mWiseFySearch.isNetworkASavedConfiguration(TEST_SSID));
+    }
+
+    /*
+     *  removeEntriesWithLowerSignalStrength tests
+     */
+
+    @Test
+    public void removeEntriesWithLowerSignalStrength_differentSSIDs() {
+        List<ScanResult> accessPoints = new ArrayList<>();
+        List<ScanResult> expectedResults = new ArrayList<>();
+
+        ScanResult accessPoint1 = mock(ScanResult.class);
+        accessPoint1.SSID = TEST_SSID;
+        accessPoint1.level = -70;
+        accessPoints.add(accessPoint1);
+        expectedResults.add(accessPoint1);
+
+        ScanResult accessPoint2 = mock(ScanResult.class);
+        accessPoint2.SSID = TEST_SSID2;
+        accessPoint2.level = -50;
+        accessPoints.add(accessPoint2);
+        expectedResults.add(accessPoint2);
+
+        assertEquals(expectedResults, mWiseFy.mWiseFySearch.removeEntriesWithLowerSignalStrength(accessPoints));
+    }
+
+    @Test
+    public void removeEntriesWithLowerSignalStrength_sameSignalLevels() {
+        List<ScanResult> accessPoints = new ArrayList<>();
+        List<ScanResult> expectedResults = new ArrayList<>();
+
+        ScanResult accessPoint1 = mock(ScanResult.class);
+        accessPoint1.SSID = TEST_SSID;
+        accessPoint1.level = -70;
+        accessPoints.add(accessPoint1);
+        expectedResults.add(accessPoint1);
+
+        ScanResult accessPoint2 = mock(ScanResult.class);
+        accessPoint2.SSID = TEST_SSID;
+        accessPoint2.level = -70;
+        accessPoints.add(accessPoint2);
+
+        assertEquals(expectedResults, mWiseFy.mWiseFySearch.removeEntriesWithLowerSignalStrength(accessPoints));
+    }
+
+    @Test
+    public void removeEntriesWithLowerSignalStrength_accessPoint1Higher() {
+        List<ScanResult> accessPoints = new ArrayList<>();
+        List<ScanResult> expectedResults = new ArrayList<>();
+
+        ScanResult accessPoint1 = mock(ScanResult.class);
+        accessPoint1.SSID = TEST_SSID;
+        accessPoint1.level = -50;
+        accessPoints.add(accessPoint1);
+        expectedResults.add(accessPoint1);
+
+        ScanResult accessPoint2 = mock(ScanResult.class);
+        accessPoint2.SSID = TEST_SSID;
+        accessPoint2.level = -70;
+        accessPoints.add(accessPoint2);
+
+        assertEquals(expectedResults , mWiseFy.mWiseFySearch.removeEntriesWithLowerSignalStrength(accessPoints));
+    }
+
+    @Test
+    public void removeEntriesWithLowerSignalStrength_accessPoint2Higher() {
+        List<ScanResult> accessPoints = new ArrayList<>();
+        List<ScanResult> expectedResults = new ArrayList<>();
+
+        ScanResult accessPoint1 = mock(ScanResult.class);
+        accessPoint1.SSID = TEST_SSID;
+        accessPoints.add(accessPoint1);
+        accessPoint1.level = -70;
+
+        ScanResult accessPoint2 = mock(ScanResult.class);
+        accessPoint2.SSID = TEST_SSID;
+        accessPoint2.level = -50;
+        accessPoints.add(accessPoint2);
+        expectedResults.add(accessPoint2);
+
+        assertEquals(expectedResults , mWiseFy.mWiseFySearch.removeEntriesWithLowerSignalStrength(accessPoints));
+    }
+}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/WiseFyTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/WiseFyTests.java
similarity index 68%
rename from wisefy/src/androidTest/java/com/isupatches/wisefy/test/WiseFyTests.java
rename to wisefy/src/androidTest/java/com/isupatches/wisefy/WiseFyTests.java
index ab19caac..c435d876 100644
--- a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/WiseFyTests.java
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/WiseFyTests.java
@@ -1,10 +1,8 @@
-package com.isupatches.wisefy.test;
+package com.isupatches.wisefy;
 
 
 import com.google.android.gms.iid.InstanceID;
-import com.isupatches.wisefy.WiseFy;
-import com.isupatches.wisefy.test.base.BaseTestClass;
-import com.isupatches.wisefy.test.base.TestActivity;
+import com.isupatches.wisefy.base.TestActivity;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
@@ -17,13 +15,15 @@ public WiseFyTests() {
 
     @Test
     public void builder_loggingFalse() {
-        WiseFy wiseFy = new WiseFy.withContext(mActivityTestRule.getActivity()).logging(false).getSmarts();
+        WiseFy wiseFy = new WiseFy.brains(mActivityTestRule.getActivity()).logging(false).getSmarts();
+        assertEquals(false, wiseFy.mWiseFyConfiguration.isLoggingEnabled());
         assertEquals(false, wiseFy.isLoggingEnabled());
     }
 
     @Test
     public void builder_loggingTrue() {
-        WiseFy wiseFy = new WiseFy.withContext(mActivityTestRule.getActivity()).logging(true).getSmarts();
+        WiseFy wiseFy = new WiseFy.brains(mActivityTestRule.getActivity()).logging(true).getSmarts();
+        assertEquals(true, wiseFy.mWiseFyConfiguration.isLoggingEnabled());
         assertEquals(true, wiseFy.isLoggingEnabled());
     }
 
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/base/TestActivity.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/base/TestActivity.java
new file mode 100644
index 00000000..813c4c5e
--- /dev/null
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/base/TestActivity.java
@@ -0,0 +1,8 @@
+package com.isupatches.wisefy.base;
+
+
+import android.app.Activity;
+
+
+public class TestActivity extends Activity {
+}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/base/TestUtils.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/base/TestUtils.java
similarity index 66%
rename from wisefy/src/androidTest/java/com/isupatches/wisefy/test/base/TestUtils.java
rename to wisefy/src/androidTest/java/com/isupatches/wisefy/base/TestUtils.java
index 65eab433..9295e18f 100644
--- a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/base/TestUtils.java
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/base/TestUtils.java
@@ -1,10 +1,7 @@
-package com.isupatches.wisefy.test.base;
+package com.isupatches.wisefy.base;
 
 
-import android.net.wifi.WifiConfiguration;
 import com.isupatches.wisefy.WiseFy;
-import java.util.ArrayList;
-import java.util.List;
 
 
 public class TestUtils {
@@ -33,11 +30,5 @@ public class TestUtils {
 
     public static final int TEST_NETWORK_FREQUENCY_5GHZ = 5000;
 
-    public static List<WifiConfiguration> getTestWifiConfiguration() {
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
-        mWiFiConfiguration.SSID = TEST_SSID;
-        wifiList.add(mWiFiConfiguration);
-        return wifiList;
-    }
+    public static final int TEST_RSSI_LEVEL = -60;
 }
\ No newline at end of file
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/AddOpenNetworkTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/test/AddOpenNetworkTests.java
deleted file mode 100644
index 423e036f..00000000
--- a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/AddOpenNetworkTests.java
+++ /dev/null
@@ -1,186 +0,0 @@
-package com.isupatches.wisefy.test;
-
-
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiInfo;
-import com.isupatches.wisefy.WiseFy;
-import com.isupatches.wisefy.callbacks.AddOpenNetworkCallbacks;
-import com.isupatches.wisefy.constants.WiseFyCodes;
-import com.isupatches.wisefy.test.base.BaseTestClass;
-import com.isupatches.wisefy.test.base.TestActivity;
-import org.junit.Test;
-import java.util.ArrayList;
-import java.util.List;
-import static com.isupatches.wisefy.test.base.TestUtils.OPEN_NETWORK_SSID;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.timeout;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-
-public class AddOpenNetworkTests extends BaseTestClass<TestActivity> {
-
-    public AddOpenNetworkTests() {
-        super(TestActivity.class);
-    }
-
-    @Test
-    public void noCallbacks_failure() {
-        setManagers();
-        when(mMockWiFiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(WiseFy.WIFI_MANAGER_FAILURE);
-        int result = mWiseFy.addOpenNetwork(OPEN_NETWORK_SSID);
-        assertEquals(WiseFy.WIFI_MANAGER_FAILURE, result);
-    }
-
-    @Test
-    public void noCallbacks_failure_nullSSID() {
-        int result = mWiseFy.addOpenNetwork(null);
-        assertEquals(WiseFyCodes.MISSING_PARAMETER, result);
-    }
-
-    @Test
-    public void noCallbacks_failure_nullWifiManager() {
-        setManagersToNull();
-        int result = mWiseFy.addOpenNetwork(OPEN_NETWORK_SSID);
-        assertEquals(WiseFyCodes.NULL_MANAGER, result);
-    }
-
-    @Test
-    public void noCallbacks_success() {
-        setManagers();
-        when(mMockWiFiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(0);
-        int result = mWiseFy.addOpenNetwork(OPEN_NETWORK_SSID);
-        assertNotEquals(WiseFy.WIFI_MANAGER_FAILURE, result);
-    }
-
-    @Test
-    public void noCallbacks_success_alreadyConfigured() {
-        setManagers();
-
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
-        mWiFiConfiguration.SSID = OPEN_NETWORK_SSID;
-        wifiList.add(mWiFiConfiguration);
-
-        WifiInfo mockWiFiInfo = mock(WifiInfo.class);
-        when(mockWiFiInfo.getSSID()).thenReturn(OPEN_NETWORK_SSID);
-
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-        when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWiFiInfo);
-
-        int result = mWiseFy.addOpenNetwork(OPEN_NETWORK_SSID);
-        assertEquals(WiseFyCodes.NETWORK_ALREADY_CONFIGURED, result);
-    }
-
-    @Test
-    public void callbacks_failure() {
-        setManagers();
-        when(mMockWiFiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(WiseFy.WIFI_MANAGER_FAILURE);
-        AddOpenNetworkCallbacks mockAddNetworkCallbacks = mock(AddOpenNetworkCallbacks.class);
-        mWiseFy.addOpenNetwork(OPEN_NETWORK_SSID, mockAddNetworkCallbacks);
-        verify(mockAddNetworkCallbacks, timeout(3000)).failureAddingOpenNetwork(WiseFy.WIFI_MANAGER_FAILURE);
-    }
-
-    @Test
-    public void callbacks_failure_nullCallback() {
-        setManagers();
-        when(mMockWiFiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(WiseFy.WIFI_MANAGER_FAILURE);
-        AddOpenNetworkCallbacks mockAddNetworkCallbacks = mock(AddOpenNetworkCallbacks.class);
-        mWiseFy.addOpenNetwork(OPEN_NETWORK_SSID, null);
-        verify(mockAddNetworkCallbacks, never()).failureAddingOpenNetwork(WiseFy.WIFI_MANAGER_FAILURE);
-    }
-
-    @Test
-    public void callbacks_failure_nullSSID() {
-        setManagers();
-        AddOpenNetworkCallbacks mockAddNetworkCallbacks = mock(AddOpenNetworkCallbacks.class);
-        mWiseFy.addOpenNetwork(null, mockAddNetworkCallbacks);
-        verify(mockAddNetworkCallbacks, timeout(3000)).addOpenNetworkWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
-    }
-
-    @Test
-    public void callbacks_failure_nullSSID_nullCallback() {
-        setManagers();
-        AddOpenNetworkCallbacks mockAddNetworkCallbacks = mock(AddOpenNetworkCallbacks.class);
-        mWiseFy.addOpenNetwork(null, null);
-        verify(mockAddNetworkCallbacks, never()).addOpenNetworkWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
-    }
-
-    @Test
-    public void callbacks_failure_nullWifiManager() {
-        setManagersToNull();
-        AddOpenNetworkCallbacks mockAddNetworkCallbacks = mock(AddOpenNetworkCallbacks.class);
-        mWiseFy.addOpenNetwork(OPEN_NETWORK_SSID, mockAddNetworkCallbacks);
-        verify(mockAddNetworkCallbacks, timeout(3000)).addOpenNetworkWiseFyFailure(WiseFyCodes.NULL_MANAGER);
-    }
-
-    @Test
-    public void callbacks_failure_nullWifiManager_nullCallback() {
-        setManagersToNull();
-        AddOpenNetworkCallbacks mockAddNetworkCallbacks = mock(AddOpenNetworkCallbacks.class);
-        mWiseFy.addOpenNetwork(OPEN_NETWORK_SSID, null);
-        verify(mockAddNetworkCallbacks, never()).addOpenNetworkWiseFyFailure(WiseFyCodes.NULL_MANAGER);
-    }
-
-    @Test
-    public void callbacks_success() {
-        setManagers();
-        when(mMockWiFiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(0);
-        AddOpenNetworkCallbacks mockAddNetworkCallbacks = mock(AddOpenNetworkCallbacks.class);
-        mWiseFy.addOpenNetwork(OPEN_NETWORK_SSID, mockAddNetworkCallbacks);
-        verify(mockAddNetworkCallbacks, timeout(3000)).openNetworkAdded(any(WifiConfiguration.class));
-    }
-
-    @Test
-    public void callbacks_success_nullCallback() {
-        setManagers();
-        when(mMockWiFiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(0);
-        AddOpenNetworkCallbacks mockAddNetworkCallbacks = mock(AddOpenNetworkCallbacks.class);
-        mWiseFy.addOpenNetwork(OPEN_NETWORK_SSID, null);
-        verify(mockAddNetworkCallbacks, never()).openNetworkAdded(any(WifiConfiguration.class));
-    }
-
-    @Test
-    public void callbacks_success_alreadyConfigured() {
-        setManagers();
-
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
-        mWiFiConfiguration.SSID = OPEN_NETWORK_SSID;
-        wifiList.add(mWiFiConfiguration);
-
-        WifiInfo mockWiFiInfo = mock(WifiInfo.class);
-        when(mockWiFiInfo.getSSID()).thenReturn(OPEN_NETWORK_SSID);
-
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-        when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWiFiInfo);
-
-        AddOpenNetworkCallbacks mockAddNetworkCallbacks = mock(AddOpenNetworkCallbacks.class);
-        mWiseFy.addOpenNetwork(OPEN_NETWORK_SSID, mockAddNetworkCallbacks);
-        verify(mockAddNetworkCallbacks, timeout(3000)).addOpenNetworkWiseFyFailure(WiseFyCodes.NETWORK_ALREADY_CONFIGURED);
-    }
-
-    @Test
-    public void callbacks_success_alreadyConfigured_nullCallback() {
-        setManagers();
-
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
-        mWiFiConfiguration.SSID = OPEN_NETWORK_SSID;
-        wifiList.add(mWiFiConfiguration);
-
-        WifiInfo mockWiFiInfo = mock(WifiInfo.class);
-        when(mockWiFiInfo.getSSID()).thenReturn(OPEN_NETWORK_SSID);
-
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-        when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWiFiInfo);
-
-        AddOpenNetworkCallbacks mockAddNetworkCallbacks = mock(AddOpenNetworkCallbacks.class);
-        mWiseFy.addOpenNetwork(OPEN_NETWORK_SSID, null);
-        verify(mockAddNetworkCallbacks, never()).addOpenNetworkWiseFyFailure(WiseFyCodes.NETWORK_ALREADY_CONFIGURED);
-    }
-}
\ No newline at end of file
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/AddWEPNetworkTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/test/AddWEPNetworkTests.java
deleted file mode 100644
index 0886ef7b..00000000
--- a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/AddWEPNetworkTests.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package com.isupatches.wisefy.test;
-
-
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiInfo;
-import com.isupatches.wisefy.WiseFy;
-import com.isupatches.wisefy.callbacks.AddWEPNetworkCallbacks;
-import com.isupatches.wisefy.constants.WiseFyCodes;
-import com.isupatches.wisefy.test.base.BaseTestClass;
-import com.isupatches.wisefy.test.base.TestActivity;
-import org.junit.Test;
-import java.util.ArrayList;
-import java.util.List;
-import static com.isupatches.wisefy.test.base.TestUtils.WEP_NETWORK_PASSWORD;
-import static com.isupatches.wisefy.test.base.TestUtils.WEP_NETWORK_SSID;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.timeout;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-
-public class AddWEPNetworkTests extends BaseTestClass<TestActivity> {
-
-    public AddWEPNetworkTests() {
-        super(TestActivity.class);
-    }
-
-    @Test
-    public void noCallbacks_failure() {
-        setManagers();
-        when(mMockWiFiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(WiseFy.WIFI_MANAGER_FAILURE);
-        int result = mWiseFy.addWEPNetwork(WEP_NETWORK_SSID, WEP_NETWORK_PASSWORD);
-        assertEquals(WiseFy.WIFI_MANAGER_FAILURE, result);
-    }
-
-    @Test
-    public void noCallbacks_failure_nullPassword() {
-        int result = mWiseFy.addWEPNetwork(WEP_NETWORK_SSID, null);
-        assertEquals(WiseFyCodes.MISSING_PARAMETER, result);
-    }
-
-    @Test
-    public void noCallbacks_failure_nullSSID() {
-        int result = mWiseFy.addWEPNetwork(null, WEP_NETWORK_PASSWORD);
-        assertEquals(WiseFyCodes.MISSING_PARAMETER, result);
-    }
-
-    @Test
-    public void noCallbacks_failure_nullWifiManager() {
-        setManagersToNull();
-        int result = mWiseFy.addWEPNetwork(WEP_NETWORK_SSID, WEP_NETWORK_PASSWORD);
-        assertEquals(WiseFyCodes.NULL_MANAGER, result);
-    }
-
-    @Test
-    public void noCallbacks_success() {
-        setManagers();
-        when(mMockWiFiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(0);
-        int result = mWiseFy.addWEPNetwork(WEP_NETWORK_SSID, WEP_NETWORK_PASSWORD);
-        assertNotEquals(WiseFy.WIFI_MANAGER_FAILURE, result);
-    }
-
-    @Test
-    public void noCallbacks_success_alreadyConfigured() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
-        mWiFiConfiguration.SSID = WEP_NETWORK_SSID;
-        wifiList.add(mWiFiConfiguration);
-
-        WifiInfo mockWiFiInfo = mock(WifiInfo.class);
-        when(mockWiFiInfo.getSSID()).thenReturn(WEP_NETWORK_SSID);
-
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-        when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWiFiInfo);
-
-        int result = mWiseFy.addWEPNetwork(WEP_NETWORK_SSID, WEP_NETWORK_PASSWORD);
-        assertEquals(WiseFyCodes.NETWORK_ALREADY_CONFIGURED, result);
-    }
-
-    @Test
-    public void callbacks_failure() {
-        setManagers();
-        when(mMockWiFiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(WiseFy.WIFI_MANAGER_FAILURE);
-        AddWEPNetworkCallbacks mockAddNetworkCallbacks = mock(AddWEPNetworkCallbacks.class);
-        mWiseFy.addWEPNetwork(WEP_NETWORK_SSID, WEP_NETWORK_PASSWORD, mockAddNetworkCallbacks);
-        verify(mockAddNetworkCallbacks, timeout(3000)).failureAddingWEPNetwork(WiseFy.WIFI_MANAGER_FAILURE);
-    }
-
-    @Test
-    public void callbacks_failure_nullCallback() {
-        setManagers();
-        when(mMockWiFiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(WiseFy.WIFI_MANAGER_FAILURE);
-        AddWEPNetworkCallbacks mockAddNetworkCallbacks = mock(AddWEPNetworkCallbacks.class);
-        mWiseFy.addWEPNetwork(WEP_NETWORK_SSID, WEP_NETWORK_PASSWORD, null);
-        verify(mockAddNetworkCallbacks, never()).failureAddingWEPNetwork(WiseFy.WIFI_MANAGER_FAILURE);
-    }
-
-    @Test
-    public void callbacks_failure_nullPassword() {
-        AddWEPNetworkCallbacks mockAddNetworkCallbacks = mock(AddWEPNetworkCallbacks.class);
-        mWiseFy.addWEPNetwork(WEP_NETWORK_SSID, null, mockAddNetworkCallbacks);
-        verify(mockAddNetworkCallbacks, timeout(2000)).addWEPNetworkWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
-    }
-
-    @Test
-    public void callbacks_failure_nullPassword_nullCallback() {
-        AddWEPNetworkCallbacks mockAddNetworkCallbacks = mock(AddWEPNetworkCallbacks.class);
-        mWiseFy.addWEPNetwork(WEP_NETWORK_SSID, null, null);
-        verify(mockAddNetworkCallbacks, never()).addWEPNetworkWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
-    }
-
-    @Test
-    public void callbacks_failure_nullSSID() {
-        AddWEPNetworkCallbacks mockAddNetworkCallbacks = mock(AddWEPNetworkCallbacks.class);
-        mWiseFy.addWEPNetwork(null, WEP_NETWORK_PASSWORD, mockAddNetworkCallbacks);
-        verify(mockAddNetworkCallbacks, timeout(2000)).addWEPNetworkWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
-    }
-
-    @Test
-    public void callbacks_failure_nullSSID_nullCallback() {
-        AddWEPNetworkCallbacks mockAddNetworkCallbacks = mock(AddWEPNetworkCallbacks.class);
-        mWiseFy.addWEPNetwork(null, WEP_NETWORK_PASSWORD, null);
-        verify(mockAddNetworkCallbacks, never()).addWEPNetworkWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
-    }
-
-    @Test
-    public void callbacks_failure_nullWifiManager() {
-        setManagersToNull();
-        AddWEPNetworkCallbacks mockAddNetworkCallbacks = mock(AddWEPNetworkCallbacks.class);
-        mWiseFy.addWEPNetwork(WEP_NETWORK_SSID, WEP_NETWORK_PASSWORD, mockAddNetworkCallbacks);
-        verify(mockAddNetworkCallbacks, timeout(2000)).addWEPNetworkWiseFyFailure(WiseFyCodes.NULL_MANAGER);
-    }
-
-    @Test
-    public void callbacks_failure_nullWifiManager_nullCallback() {
-        setManagersToNull();
-        AddWEPNetworkCallbacks mockAddNetworkCallbacks = mock(AddWEPNetworkCallbacks.class);
-        mWiseFy.addWEPNetwork(WEP_NETWORK_SSID, WEP_NETWORK_PASSWORD, null);
-        verify(mockAddNetworkCallbacks, never()).addWEPNetworkWiseFyFailure(WiseFyCodes.NULL_MANAGER);
-    }
-
-    @Test
-    public void callbacks_success() {
-        setManagers();
-        when(mMockWiFiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(0);
-        AddWEPNetworkCallbacks mockAddNetworkCallbacks = mock(AddWEPNetworkCallbacks.class);
-        mWiseFy.addWEPNetwork(WEP_NETWORK_SSID, WEP_NETWORK_PASSWORD, mockAddNetworkCallbacks);
-        verify(mockAddNetworkCallbacks, timeout(2000)).wepNetworkAdded(any(WifiConfiguration.class));
-    }
-
-    @Test
-    public void callbacks_success_nullCallback() {
-        setManagers();
-        when(mMockWiFiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(0);
-        AddWEPNetworkCallbacks mockAddNetworkCallbacks = mock(AddWEPNetworkCallbacks.class);
-        mWiseFy.addWEPNetwork(WEP_NETWORK_SSID, WEP_NETWORK_PASSWORD, null);
-        verify(mockAddNetworkCallbacks, never()).wepNetworkAdded(any(WifiConfiguration.class));
-    }
-
-    @Test
-    public void callbacks_success_alreadyConfigured() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
-        mWiFiConfiguration.SSID = WEP_NETWORK_SSID;
-        wifiList.add(mWiFiConfiguration);
-
-        WifiInfo mockWiFiInfo = mock(WifiInfo.class);
-        when(mockWiFiInfo.getSSID()).thenReturn(WEP_NETWORK_SSID);
-
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-        when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWiFiInfo);
-
-        AddWEPNetworkCallbacks mockAddNetworkCallbacks = mock(AddWEPNetworkCallbacks.class);
-        mWiseFy.addWEPNetwork(WEP_NETWORK_SSID, WEP_NETWORK_PASSWORD, mockAddNetworkCallbacks);
-        verify(mockAddNetworkCallbacks, timeout(2000)).addWEPNetworkWiseFyFailure(WiseFyCodes.NETWORK_ALREADY_CONFIGURED);
-    }
-
-    @Test
-    public void callbacks_success_alreadyConfigured_nullCallback() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
-        mWiFiConfiguration.SSID = WEP_NETWORK_SSID;
-        wifiList.add(mWiFiConfiguration);
-
-        WifiInfo mockWiFiInfo = mock(WifiInfo.class);
-        when(mockWiFiInfo.getSSID()).thenReturn(WEP_NETWORK_SSID);
-
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-        when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWiFiInfo);
-
-        AddWEPNetworkCallbacks mockAddNetworkCallbacks = mock(AddWEPNetworkCallbacks.class);
-        mWiseFy.addWEPNetwork(WEP_NETWORK_SSID, WEP_NETWORK_PASSWORD, null);
-        verify(mockAddNetworkCallbacks, never()).addWEPNetworkWiseFyFailure(WiseFyCodes.NETWORK_ALREADY_CONFIGURED);
-    }
-}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/AddWPA2NetworkTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/test/AddWPA2NetworkTests.java
deleted file mode 100644
index 77c683f8..00000000
--- a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/AddWPA2NetworkTests.java
+++ /dev/null
@@ -1,205 +0,0 @@
-package com.isupatches.wisefy.test;
-
-
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiInfo;
-import com.isupatches.wisefy.WiseFy;
-import com.isupatches.wisefy.callbacks.AddWPA2NetworkCallbacks;
-import com.isupatches.wisefy.constants.WiseFyCodes;
-import com.isupatches.wisefy.test.base.BaseTestClass;
-import com.isupatches.wisefy.test.base.TestActivity;
-import org.junit.Test;
-import java.util.ArrayList;
-import java.util.List;
-import static com.isupatches.wisefy.test.base.TestUtils.WPA2_NETWORK_PASSWORD;
-import static com.isupatches.wisefy.test.base.TestUtils.WPA2_NETWORK_SSID;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.timeout;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-
-public class AddWPA2NetworkTests extends BaseTestClass<TestActivity> {
-
-    public AddWPA2NetworkTests() {
-        super(TestActivity.class);
-    }
-
-    @Test
-    public void noCallbacks_failure() {
-        when(mMockWiFiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(WiseFy.WIFI_MANAGER_FAILURE);
-        int result = mWiseFy.addWPA2Network(WPA2_NETWORK_SSID, WPA2_NETWORK_PASSWORD);
-        assertEquals(WiseFy.WIFI_MANAGER_FAILURE, result);
-    }
-
-    @Test
-    public void noCallbacks_failure_nullPassword() {
-        int result = mWiseFy.addWPA2Network(WPA2_NETWORK_SSID, null);
-        assertEquals(WiseFyCodes.MISSING_PARAMETER, result);
-    }
-
-    @Test
-    public void anoCallbacks_failure_nullSSID() {
-        int result = mWiseFy.addWPA2Network(null, WPA2_NETWORK_PASSWORD);
-        assertEquals(WiseFyCodes.MISSING_PARAMETER, result);
-    }
-
-    @Test
-    public void noCallbacks_failure_nullWifiManager() {
-        setManagersToNull();
-        int result = mWiseFy.addWPA2Network(WPA2_NETWORK_SSID, WPA2_NETWORK_PASSWORD);
-        assertEquals(WiseFyCodes.NULL_MANAGER, result);
-    }
-
-    @Test
-    public void noCallbacks_success() {
-        setManagers();
-        when(mMockWiFiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(0);
-        int result = mWiseFy.addWPA2Network(WPA2_NETWORK_SSID, WPA2_NETWORK_PASSWORD);
-        assertNotEquals(WiseFy.WIFI_MANAGER_FAILURE, result);
-    }
-
-    @Test
-    public void noCallbacks_success_alreadyConfigured() {
-        setManagers();
-
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
-        mWiFiConfiguration.SSID = WPA2_NETWORK_SSID;
-        wifiList.add(mWiFiConfiguration);
-
-        WifiInfo mockWiFiInfo = mock(WifiInfo.class);
-        when(mockWiFiInfo.getSSID()).thenReturn(WPA2_NETWORK_SSID);
-
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-        when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWiFiInfo);
-
-        int result = mWiseFy.addWPA2Network(WPA2_NETWORK_SSID, WPA2_NETWORK_PASSWORD);
-        assertEquals(WiseFyCodes.NETWORK_ALREADY_CONFIGURED, result);
-    }
-
-    @Test
-    public void callbacks_failure() {
-        when(mMockWiFiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(WiseFy.WIFI_MANAGER_FAILURE);
-        AddWPA2NetworkCallbacks mockAddNetworkCallbacks = mock(AddWPA2NetworkCallbacks.class);
-        mWiseFy.addWPA2Network(WPA2_NETWORK_SSID, WPA2_NETWORK_PASSWORD, mockAddNetworkCallbacks);
-        verify(mockAddNetworkCallbacks, timeout(2000)).failureAddingWPA2Network(WiseFy.WIFI_MANAGER_FAILURE);
-    }
-
-    @Test
-    public void callbacks_failure_nullCallback() {
-        when(mMockWiFiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(WiseFy.WIFI_MANAGER_FAILURE);
-        AddWPA2NetworkCallbacks mockAddNetworkCallbacks = mock(AddWPA2NetworkCallbacks.class);
-        mWiseFy.addWPA2Network(WPA2_NETWORK_SSID, WPA2_NETWORK_PASSWORD, null);
-        verify(mockAddNetworkCallbacks, never()).failureAddingWPA2Network(WiseFy.WIFI_MANAGER_FAILURE);
-    }
-
-    @Test
-    public void callbacks_failure_nullPassword() {
-        AddWPA2NetworkCallbacks mockAddNetworkCallbacks = mock(AddWPA2NetworkCallbacks.class);
-        mWiseFy.addWPA2Network(WPA2_NETWORK_SSID, null, mockAddNetworkCallbacks);
-        verify(mockAddNetworkCallbacks, timeout(2000)).addWPA2NetworkWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
-    }
-
-    @Test
-    public void callbacks_failure_nullPassword_nullCallback() {
-        AddWPA2NetworkCallbacks mockAddNetworkCallbacks = mock(AddWPA2NetworkCallbacks.class);
-        mWiseFy.addWPA2Network(WPA2_NETWORK_SSID, null, null);
-        verify(mockAddNetworkCallbacks, never()).addWPA2NetworkWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
-    }
-
-    @Test
-    public void callbacks_failure_nullSSID() {
-        AddWPA2NetworkCallbacks mockAddNetworkCallbacks = mock(AddWPA2NetworkCallbacks.class);
-        mWiseFy.addWPA2Network(null, WPA2_NETWORK_PASSWORD, mockAddNetworkCallbacks);
-        verify(mockAddNetworkCallbacks, timeout(2000)).addWPA2NetworkWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
-    }
-
-    @Test
-    public void callbacks_failure_nullSSID_nullCallback() {
-        AddWPA2NetworkCallbacks mockAddNetworkCallbacks = mock(AddWPA2NetworkCallbacks.class);
-        mWiseFy.addWPA2Network(null, WPA2_NETWORK_PASSWORD, null);
-        verify(mockAddNetworkCallbacks, never()).addWPA2NetworkWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
-    }
-
-    @Test
-    public void callbacks_failure_nullWifiManager() {
-        setManagersToNull();
-        AddWPA2NetworkCallbacks mockAddNetworkCallbacks = mock(AddWPA2NetworkCallbacks.class);
-        mWiseFy.addWPA2Network(WPA2_NETWORK_SSID, WPA2_NETWORK_PASSWORD, mockAddNetworkCallbacks);
-        verify(mockAddNetworkCallbacks, timeout(2000)).addWPA2NetworkWiseFyFailure(WiseFyCodes.NULL_MANAGER);
-    }
-
-    @Test
-    public void callbacks_failure_nullWifiManager_nullCallback() {
-        setManagersToNull();
-        AddWPA2NetworkCallbacks mockAddNetworkCallbacks = mock(AddWPA2NetworkCallbacks.class);
-        mWiseFy.addWPA2Network(WPA2_NETWORK_SSID, WPA2_NETWORK_PASSWORD, null);
-        verify(mockAddNetworkCallbacks, never()).addWPA2NetworkWiseFyFailure(WiseFyCodes.NULL_MANAGER);
-    }
-
-    @Test
-    public void callbacks_success() {
-        setManagers();
-        when(mMockWiFiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(0);
-        AddWPA2NetworkCallbacks mockAddNetworkCallbacks = mock(AddWPA2NetworkCallbacks.class);
-        mWiseFy.addWPA2Network(WPA2_NETWORK_SSID, WPA2_NETWORK_PASSWORD, mockAddNetworkCallbacks);
-        verify(mockAddNetworkCallbacks, timeout(2000)).wpa2NetworkAdded(any(WifiConfiguration.class));
-    }
-
-    @Test
-    public void callbacks_success_nullCallback() {
-        setManagers();
-        when(mMockWiFiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(0);
-        AddWPA2NetworkCallbacks mockAddNetworkCallbacks = mock(AddWPA2NetworkCallbacks.class);
-        mWiseFy.addWPA2Network(WPA2_NETWORK_SSID, WPA2_NETWORK_PASSWORD, null);
-        verify(mockAddNetworkCallbacks, never()).wpa2NetworkAdded(any(WifiConfiguration.class));
-    }
-
-    @Test
-    public void callbacks_success_alreadyConfigured() {
-        setManagers();
-
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
-        mWiFiConfiguration.SSID = WPA2_NETWORK_SSID;
-        wifiList.add(mWiFiConfiguration);
-
-        WifiInfo mockWiFiInfo = mock(WifiInfo.class);
-        when(mockWiFiInfo.getSSID()).thenReturn(WPA2_NETWORK_SSID);
-
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-        when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWiFiInfo);
-
-        AddWPA2NetworkCallbacks mockAddNetworkCallbacks = mock(AddWPA2NetworkCallbacks.class);
-        mWiseFy.addWPA2Network(WPA2_NETWORK_SSID, WPA2_NETWORK_PASSWORD, mockAddNetworkCallbacks);
-        verify(mockAddNetworkCallbacks, timeout(2000)).addWPA2NetworkWiseFyFailure(WiseFyCodes.NETWORK_ALREADY_CONFIGURED);
-    }
-
-    @Test
-    public void callbacks_success_alreadyConfigured_nullCallback() {
-        setManagers();
-
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
-        mWiFiConfiguration.SSID = WPA2_NETWORK_SSID;
-        wifiList.add(mWiFiConfiguration);
-
-        WifiInfo mockWiFiInfo = mock(WifiInfo.class);
-        when(mockWiFiInfo.getSSID()).thenReturn(WPA2_NETWORK_SSID);
-
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-        when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWiFiInfo);
-
-        AddWPA2NetworkCallbacks mockAddNetworkCallbacks = mock(AddWPA2NetworkCallbacks.class);
-        mWiseFy.addWPA2Network(WPA2_NETWORK_SSID, WPA2_NETWORK_PASSWORD, null);
-        verify(mockAddNetworkCallbacks,never()).addWPA2NetworkWiseFyFailure(WiseFyCodes.NETWORK_ALREADY_CONFIGURED);
-    }
-}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/BuilderTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/test/BuilderTests.java
new file mode 100644
index 00000000..d90be9cb
--- /dev/null
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/test/BuilderTests.java
@@ -0,0 +1,32 @@
+package com.isupatches.wisefy.test;
+
+
+import android.support.test.rule.ActivityTestRule;
+import com.isupatches.wisefy.WiseFy;
+import com.isupatches.wisefy.base.TestActivity;
+import org.junit.Rule;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
+
+public class BuilderTests extends ActivityTestRule<TestActivity> {
+
+    @Rule
+    public ActivityTestRule<TestActivity> mActivityTestRule = new ActivityTestRule<>(TestActivity.class);
+
+    public BuilderTests() {
+        super(TestActivity.class);
+    }
+
+    @Test
+    public void builder_loggingFalse() {
+        WiseFy wiseFy = new WiseFy.brains(mActivityTestRule.getActivity()).logging(false).getSmarts();
+        assertEquals(false, wiseFy.isLoggingEnabled());
+    }
+
+    @Test
+    public void builder_loggingTrue() {
+        WiseFy wiseFy = new WiseFy.brains(mActivityTestRule.getActivity()).logging(true).getSmarts();
+        assertEquals(true, wiseFy.isLoggingEnabled());
+    }
+}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/ConnectToNetworkTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/test/ConnectToNetworkTests.java
deleted file mode 100644
index 366c2a5e..00000000
--- a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/ConnectToNetworkTests.java
+++ /dev/null
@@ -1,593 +0,0 @@
-package com.isupatches.wisefy.test;
-
-
-import android.net.NetworkInfo;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiInfo;
-import com.isupatches.wisefy.callbacks.ConnectToNetworkCallbacks;
-import com.isupatches.wisefy.constants.WiseFyCodes;
-import com.isupatches.wisefy.test.base.BaseTestClass;
-import com.isupatches.wisefy.test.base.TestActivity;
-import org.junit.Test;
-import java.util.ArrayList;
-import java.util.List;
-import static com.isupatches.wisefy.test.base.TestUtils.TEST_SSID;
-import static com.isupatches.wisefy.test.base.TestUtils.TEST_SSID2;
-import static com.isupatches.wisefy.test.base.TestUtils.TEST_SSID3;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.timeout;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-
-public class ConnectToNetworkTests extends BaseTestClass<TestActivity> {
-
-    public ConnectToNetworkTests() {
-        super(TestActivity.class);
-    }
-
-    @Test
-    public void noCallbacks_failure_emptyList() {
-        setManagers();
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(new ArrayList<WifiConfiguration>());
-        boolean result = mWiseFy.connectToNetwork(TEST_SSID, 1);
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void noCallbacks_failure_multipleNetworks() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-
-        WifiConfiguration mWiFiConfiguration1 = new WifiConfiguration();
-        mWiFiConfiguration1.SSID = TEST_SSID2;
-        wifiList.add(mWiFiConfiguration1);
-
-        WifiConfiguration mWiFiConfiguration2 = new WifiConfiguration();
-        mWiFiConfiguration2.SSID = TEST_SSID3;
-        wifiList.add(mWiFiConfiguration2);
-
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-
-        boolean result = mWiseFy.connectToNetwork(TEST_SSID, 1);
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void noCallbacks_failure_notAvailable() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
-        mWiFiConfiguration.SSID = TEST_SSID;
-        wifiList.add(mWiFiConfiguration);
-
-        WifiInfo mockWiFiInfo = mock(WifiInfo.class);
-        when(mockWiFiInfo.getSSID()).thenReturn(TEST_SSID);
-
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-        when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWiFiInfo);
-
-        NetworkInfo mockNetworkInfo = mock(NetworkInfo.class);
-
-        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(mockNetworkInfo);
-        when(mockNetworkInfo.isAvailable()).thenReturn(false);
-        when(mockNetworkInfo.isConnected()).thenReturn(true);
-
-        boolean result = mWiseFy.connectToNetwork(TEST_SSID, 1);
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void noCallbacks_failure_notConnected() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
-        mWiFiConfiguration.SSID = TEST_SSID;
-        wifiList.add(mWiFiConfiguration);
-
-        WifiInfo mockWiFiInfo = mock(WifiInfo.class);
-        when(mockWiFiInfo.getSSID()).thenReturn(TEST_SSID);
-
-        when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWiFiInfo);
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-
-        NetworkInfo mockNetworkInfo = mock(NetworkInfo.class);
-
-        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(mockNetworkInfo);
-        when(mockNetworkInfo.isAvailable()).thenReturn(true);
-        when(mockNetworkInfo.isConnected()).thenReturn(false);
-
-        boolean result = mWiseFy.connectToNetwork(TEST_SSID, 1);
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void noCallbacks_failure_nullList() {
-        setManagers();
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(null);
-        boolean result = mWiseFy.connectToNetwork(TEST_SSID, 1);
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void noCallbacks_failure_nullSSIDParam() {
-        setManagers();
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(new ArrayList<WifiConfiguration>());
-        boolean result = mWiseFy.connectToNetwork(null, 1);
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void noCallbacks_failure_nullSSID() {
-        setManagers();
-
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
-        mWiFiConfiguration.SSID = null;
-        wifiList.add(mWiFiConfiguration);
-
-        WifiInfo mockWiFiInfo = mock(WifiInfo.class);
-        when(mockWiFiInfo.getSSID()).thenReturn(TEST_SSID);
-
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-        when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWiFiInfo);
-
-        boolean result = mWiseFy.connectToNetwork(TEST_SSID, 1);
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void noCallbacks_failure_nullWifiConfiguration() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        wifiList.add(0, null);
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-        boolean result = mWiseFy.connectToNetwork(TEST_SSID, 1);
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void noCallbacks_failure_nullWifiManager() {
-        setManagersToNull();
-        boolean result = mWiseFy.connectToNetwork(TEST_SSID, 1);
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void noCallbacks_success() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
-        mWiFiConfiguration.SSID = TEST_SSID;
-        wifiList.add(mWiFiConfiguration);
-
-        WifiInfo mockWiFiInfo = mock(WifiInfo.class);
-        when(mockWiFiInfo.getSSID()).thenReturn(TEST_SSID);
-
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-        when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWiFiInfo);
-
-        NetworkInfo mockNetworkInfo = mock(NetworkInfo.class);
-
-        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(mockNetworkInfo);
-        when(mockNetworkInfo.isAvailable()).thenReturn(true);
-        when(mockNetworkInfo.isConnected()).thenReturn(true);
-
-        boolean result = mWiseFy.connectToNetwork(TEST_SSID, 1);
-        assertEquals(true, result);
-    }
-
-    @Test
-    public void noCallbacks_success_multipleNetworks() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-
-        WifiConfiguration mWiFiConfiguration1 = new WifiConfiguration();
-        mWiFiConfiguration1.SSID = TEST_SSID;
-        wifiList.add(mWiFiConfiguration1);
-
-        WifiConfiguration mWiFiConfiguration2 = new WifiConfiguration();
-        mWiFiConfiguration2.SSID = TEST_SSID2;
-        wifiList.add(mWiFiConfiguration2);
-
-        WifiInfo mockWiFiInfo = mock(WifiInfo.class);
-        when(mockWiFiInfo.getSSID()).thenReturn(TEST_SSID);
-
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-        when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWiFiInfo);
-
-        NetworkInfo mockNetworkInfo = mock(NetworkInfo.class);
-
-        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(mockNetworkInfo);
-        when(mockNetworkInfo.isAvailable()).thenReturn(true);
-        when(mockNetworkInfo.isConnected()).thenReturn(true);
-
-        boolean result = mWiseFy.connectToNetwork(TEST_SSID, 1);
-        assertEquals(true, result);
-    }
-
-    @Test
-    public void callbacks_failure_emptyList() {
-        setManagers();
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(new ArrayList<WifiConfiguration>());
-        ConnectToNetworkCallbacks connectToNetworkCallbacks = mock(ConnectToNetworkCallbacks.class);
-        mWiseFy.connectToNetwork(TEST_SSID, 1, connectToNetworkCallbacks);
-        verify(connectToNetworkCallbacks, timeout(2000)).networkNotFoundToConnectTo();
-    }
-
-    @Test
-    public void callbacks_failure_emptyList_nullCallback() {
-        setManagers();
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(new ArrayList<WifiConfiguration>());
-        ConnectToNetworkCallbacks connectToNetworkCallbacks = mock(ConnectToNetworkCallbacks.class);
-        mWiseFy.connectToNetwork(TEST_SSID, 1, null);
-        verify(connectToNetworkCallbacks, never()).networkNotFoundToConnectTo();
-    }
-
-    @Test
-    public void callbacks_failure_multipleNetworks() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-
-        WifiConfiguration mWiFiConfiguration1 = new WifiConfiguration();
-        mWiFiConfiguration1.SSID = TEST_SSID2;
-        wifiList.add(mWiFiConfiguration1);
-
-        WifiConfiguration mWiFiConfiguration2 = new WifiConfiguration();
-        mWiFiConfiguration2.SSID = TEST_SSID3;
-        wifiList.add(mWiFiConfiguration2);
-
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-
-        ConnectToNetworkCallbacks connectToNetworkCallbacks = mock(ConnectToNetworkCallbacks.class);
-        mWiseFy.connectToNetwork(TEST_SSID, 1, connectToNetworkCallbacks);
-        verify(connectToNetworkCallbacks, timeout(2000)).networkNotFoundToConnectTo();
-    }
-
-    @Test
-    public void callbacks_failure_multipleNetworks_nullCallback() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-
-        WifiConfiguration mWiFiConfiguration1 = new WifiConfiguration();
-        mWiFiConfiguration1.SSID = TEST_SSID2;
-        wifiList.add(mWiFiConfiguration1);
-
-        WifiConfiguration mWiFiConfiguration2 = new WifiConfiguration();
-        mWiFiConfiguration2.SSID = TEST_SSID3;
-        wifiList.add(mWiFiConfiguration2);
-
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-
-        ConnectToNetworkCallbacks connectToNetworkCallbacks = mock(ConnectToNetworkCallbacks.class);
-        mWiseFy.connectToNetwork(TEST_SSID, 1, null);
-        verify(connectToNetworkCallbacks, never()).networkNotFoundToConnectTo();
-    }
-
-    @Test
-    public void callbacks_failure_notAvailable() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
-        mWiFiConfiguration.SSID = TEST_SSID;
-        wifiList.add(mWiFiConfiguration);
-
-        WifiInfo mockWiFiInfo = mock(WifiInfo.class);
-        when(mockWiFiInfo.getSSID()).thenReturn(TEST_SSID);
-
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-        when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWiFiInfo);
-
-        NetworkInfo mockNetworkInfo = mock(NetworkInfo.class);
-
-        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(mockNetworkInfo);
-        when(mockNetworkInfo.isAvailable()).thenReturn(false);
-        when(mockNetworkInfo.isConnected()).thenReturn(true);
-
-        ConnectToNetworkCallbacks connectToNetworkCallbacks = mock(ConnectToNetworkCallbacks.class);
-        mWiseFy.connectToNetwork(TEST_SSID, 1, connectToNetworkCallbacks);
-        verify(connectToNetworkCallbacks, timeout(2000)).failureConnectingToNetwork();
-    }
-
-    @Test
-    public void callbacks_failure_notAvailable_nullCallback() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
-        mWiFiConfiguration.SSID = TEST_SSID;
-        wifiList.add(mWiFiConfiguration);
-
-        WifiInfo mockWiFiInfo = mock(WifiInfo.class);
-        when(mockWiFiInfo.getSSID()).thenReturn(TEST_SSID);
-
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-        when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWiFiInfo);
-
-        NetworkInfo mockNetworkInfo = mock(NetworkInfo.class);
-
-        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(mockNetworkInfo);
-        when(mockNetworkInfo.isAvailable()).thenReturn(false);
-        when(mockNetworkInfo.isConnected()).thenReturn(true);
-
-        ConnectToNetworkCallbacks connectToNetworkCallbacks = mock(ConnectToNetworkCallbacks.class);
-        mWiseFy.connectToNetwork(TEST_SSID, 1, null);
-        verify(connectToNetworkCallbacks, never()).failureConnectingToNetwork();
-    }
-
-    @Test
-    public void callbacks_failure_notConnected() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
-        mWiFiConfiguration.SSID = TEST_SSID;
-        wifiList.add(mWiFiConfiguration);
-
-        WifiInfo mockWiFiInfo = mock(WifiInfo.class);
-        when(mockWiFiInfo.getSSID()).thenReturn(TEST_SSID);
-
-        when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWiFiInfo);
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-
-        NetworkInfo mockNetworkInfo = mock(NetworkInfo.class);
-
-        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(mockNetworkInfo);
-        when(mockNetworkInfo.isAvailable()).thenReturn(true);
-        when(mockNetworkInfo.isConnected()).thenReturn(false);
-
-        ConnectToNetworkCallbacks connectToNetworkCallbacks = mock(ConnectToNetworkCallbacks.class);
-        mWiseFy.connectToNetwork(TEST_SSID, 1, connectToNetworkCallbacks);
-        verify(connectToNetworkCallbacks, timeout(2000)).failureConnectingToNetwork();
-    }
-
-    @Test
-    public void callbacks_failure_notConnected_nullCallback() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
-        mWiFiConfiguration.SSID = TEST_SSID;
-        wifiList.add(mWiFiConfiguration);
-
-        WifiInfo mockWiFiInfo = mock(WifiInfo.class);
-        when(mockWiFiInfo.getSSID()).thenReturn(TEST_SSID);
-
-        when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWiFiInfo);
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-
-        NetworkInfo mockNetworkInfo = mock(NetworkInfo.class);
-
-        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(mockNetworkInfo);
-        when(mockNetworkInfo.isAvailable()).thenReturn(true);
-        when(mockNetworkInfo.isConnected()).thenReturn(false);
-
-        ConnectToNetworkCallbacks connectToNetworkCallbacks = mock(ConnectToNetworkCallbacks.class);
-        mWiseFy.connectToNetwork(TEST_SSID, 1, null);
-        verify(connectToNetworkCallbacks, never()).failureConnectingToNetwork();
-    }
-
-    @Test
-    public void callbacks_failure_nullList() {
-        setManagers();
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(null);
-        ConnectToNetworkCallbacks connectToNetworkCallbacks = mock(ConnectToNetworkCallbacks.class);
-        mWiseFy.connectToNetwork(TEST_SSID, 1, connectToNetworkCallbacks);
-        verify(connectToNetworkCallbacks, timeout(2000)).networkNotFoundToConnectTo();
-    }
-
-    @Test
-    public void callbacks_failure_nullList_nullCallback() {
-        setManagers();
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(null);
-        ConnectToNetworkCallbacks connectToNetworkCallbacks = mock(ConnectToNetworkCallbacks.class);
-        mWiseFy.connectToNetwork(TEST_SSID, 1, null);
-        verify(connectToNetworkCallbacks, never()).networkNotFoundToConnectTo();
-    }
-
-    @Test
-    public void callbacks_failure_nullSSIDParam() {
-        setManagers();
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(new ArrayList<WifiConfiguration>());
-        ConnectToNetworkCallbacks connectToNetworkCallbacks = mock(ConnectToNetworkCallbacks.class);
-        mWiseFy.connectToNetwork(null, 1, connectToNetworkCallbacks);
-        verify(connectToNetworkCallbacks, timeout(2000)).connectToNetworkWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
-    }
-
-    @Test
-    public void callbacks_failure_nullSSIDParam_nullCallback() {
-        setManagers();
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(new ArrayList<WifiConfiguration>());
-        ConnectToNetworkCallbacks connectToNetworkCallbacks = mock(ConnectToNetworkCallbacks.class);
-        mWiseFy.connectToNetwork(null, 1, null);
-        verify(connectToNetworkCallbacks, never()).connectToNetworkWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
-    }
-
-    @Test
-    public void callbacks_failure_nullSSID() {
-        setManagers();
-
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
-        mWiFiConfiguration.SSID = null;
-        wifiList.add(mWiFiConfiguration);
-
-        WifiInfo mockWiFiInfo = mock(WifiInfo.class);
-        when(mockWiFiInfo.getSSID()).thenReturn(TEST_SSID);
-
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-        when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWiFiInfo);
-
-        ConnectToNetworkCallbacks connectToNetworkCallbacks = mock(ConnectToNetworkCallbacks.class);
-        mWiseFy.connectToNetwork(TEST_SSID, 1, connectToNetworkCallbacks);
-        verify(connectToNetworkCallbacks, timeout(2000)).networkNotFoundToConnectTo();
-    }
-
-    @Test
-    public void callbacks_failure_nullSSID_nullCallback() {
-        setManagers();
-
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
-        mWiFiConfiguration.SSID = null;
-        wifiList.add(mWiFiConfiguration);
-
-        WifiInfo mockWiFiInfo = mock(WifiInfo.class);
-        when(mockWiFiInfo.getSSID()).thenReturn(TEST_SSID);
-
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-        when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWiFiInfo);
-
-        ConnectToNetworkCallbacks connectToNetworkCallbacks = mock(ConnectToNetworkCallbacks.class);
-        mWiseFy.connectToNetwork(TEST_SSID, 1, null);
-        verify(connectToNetworkCallbacks,never()).networkNotFoundToConnectTo();
-    }
-
-    @Test
-    public void callbacks_failure_nullWifiConfiguration() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        wifiList.add(0, null);
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-        ConnectToNetworkCallbacks connectToNetworkCallbacks = mock(ConnectToNetworkCallbacks.class);
-        mWiseFy.connectToNetwork(TEST_SSID, 1, connectToNetworkCallbacks);
-        verify(connectToNetworkCallbacks,timeout(2000)).networkNotFoundToConnectTo();
-    }
-
-    @Test
-    public void callbacks_failure_nullWifiConfiguration_nullCallback() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        wifiList.add(0, null);
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-        ConnectToNetworkCallbacks connectToNetworkCallbacks = mock(ConnectToNetworkCallbacks.class);
-        mWiseFy.connectToNetwork(TEST_SSID, 1, null);
-        verify(connectToNetworkCallbacks,never()).networkNotFoundToConnectTo();
-    }
-
-
-    @Test
-    public void callbacks_failure_nullWifiManager() {
-        setManagersToNull();
-        ConnectToNetworkCallbacks connectToNetworkCallbacks = mock(ConnectToNetworkCallbacks.class);
-        mWiseFy.connectToNetwork(TEST_SSID, 1, connectToNetworkCallbacks);
-        verify(connectToNetworkCallbacks, timeout(2000)).connectToNetworkWiseFyFailure(WiseFyCodes.NULL_MANAGER);
-    }
-
-    @Test
-    public void callbacks_failure_nullWifiManager_nullCallback() {
-        setManagersToNull();
-        ConnectToNetworkCallbacks connectToNetworkCallbacks = mock(ConnectToNetworkCallbacks.class);
-        mWiseFy.connectToNetwork(TEST_SSID, 1, null);
-        verify(connectToNetworkCallbacks, never()).connectToNetworkWiseFyFailure(WiseFyCodes.NULL_MANAGER);
-    }
-
-    @Test
-    public void callbacks_success() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
-        mWiFiConfiguration.SSID = TEST_SSID;
-        wifiList.add(mWiFiConfiguration);
-
-        WifiInfo mockWiFiInfo = mock(WifiInfo.class);
-        when(mockWiFiInfo.getSSID()).thenReturn(TEST_SSID);
-
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-        when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWiFiInfo);
-
-        NetworkInfo mockNetworkInfo = mock(NetworkInfo.class);
-
-        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(mockNetworkInfo);
-        when(mockNetworkInfo.isAvailable()).thenReturn(true);
-        when(mockNetworkInfo.isConnected()).thenReturn(true);
-
-        ConnectToNetworkCallbacks connectToNetworkCallbacks = mock(ConnectToNetworkCallbacks.class);
-        mWiseFy.connectToNetwork(TEST_SSID, 1, connectToNetworkCallbacks);
-        verify(connectToNetworkCallbacks, timeout(2000)).connectedToNetwork();
-    }
-
-    @Test
-    public void callbacks_success_nullCallback() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
-        mWiFiConfiguration.SSID = TEST_SSID;
-        wifiList.add(mWiFiConfiguration);
-
-        WifiInfo mockWiFiInfo = mock(WifiInfo.class);
-        when(mockWiFiInfo.getSSID()).thenReturn(TEST_SSID);
-
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-        when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWiFiInfo);
-
-        NetworkInfo mockNetworkInfo = mock(NetworkInfo.class);
-
-        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(mockNetworkInfo);
-        when(mockNetworkInfo.isAvailable()).thenReturn(true);
-        when(mockNetworkInfo.isConnected()).thenReturn(true);
-
-        ConnectToNetworkCallbacks connectToNetworkCallbacks = mock(ConnectToNetworkCallbacks.class);
-        mWiseFy.connectToNetwork(TEST_SSID, 1, null);
-        verify(connectToNetworkCallbacks, never()).connectedToNetwork();
-    }
-
-    @Test
-    public void callbacks_success_multipleNetworks() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-
-        WifiConfiguration mWiFiConfiguration1 = new WifiConfiguration();
-        mWiFiConfiguration1.SSID = TEST_SSID;
-        wifiList.add(mWiFiConfiguration1);
-
-        WifiConfiguration mWiFiConfiguration2 = new WifiConfiguration();
-        mWiFiConfiguration2.SSID = TEST_SSID2;
-        wifiList.add(mWiFiConfiguration2);
-
-        WifiInfo mockWiFiInfo = mock(WifiInfo.class);
-        when(mockWiFiInfo.getSSID()).thenReturn(TEST_SSID);
-
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-        when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWiFiInfo);
-
-        NetworkInfo mockNetworkInfo = mock(NetworkInfo.class);
-
-        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(mockNetworkInfo);
-        when(mockNetworkInfo.isAvailable()).thenReturn(true);
-        when(mockNetworkInfo.isConnected()).thenReturn(true);
-
-        ConnectToNetworkCallbacks connectToNetworkCallbacks = mock(ConnectToNetworkCallbacks.class);
-        mWiseFy.connectToNetwork(TEST_SSID, 1, connectToNetworkCallbacks);
-        verify(connectToNetworkCallbacks, timeout(2000)).connectedToNetwork();
-    }
-
-    @Test
-    public void callbacks_success_multipleNetworks_nullCallback() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-
-        WifiConfiguration mWiFiConfiguration1 = new WifiConfiguration();
-        mWiFiConfiguration1.SSID = TEST_SSID;
-        wifiList.add(mWiFiConfiguration1);
-
-        WifiConfiguration mWiFiConfiguration2 = new WifiConfiguration();
-        mWiFiConfiguration2.SSID = TEST_SSID2;
-        wifiList.add(mWiFiConfiguration2);
-
-        WifiInfo mockWiFiInfo = mock(WifiInfo.class);
-        when(mockWiFiInfo.getSSID()).thenReturn(TEST_SSID);
-
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-        when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWiFiInfo);
-
-        NetworkInfo mockNetworkInfo = mock(NetworkInfo.class);
-
-        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(mockNetworkInfo);
-        when(mockNetworkInfo.isAvailable()).thenReturn(true);
-        when(mockNetworkInfo.isConnected()).thenReturn(true);
-
-        ConnectToNetworkCallbacks connectToNetworkCallbacks = mock(ConnectToNetworkCallbacks.class);
-        mWiseFy.connectToNetwork(TEST_SSID, 1, null);
-        verify(connectToNetworkCallbacks, never()).connectedToNetwork();
-    }
-}
\ No newline at end of file
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/DisableWifiTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/test/DisableWifiTests.java
deleted file mode 100644
index cb9cbf93..00000000
--- a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/DisableWifiTests.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.isupatches.wisefy.test;
-
-
-import com.isupatches.wisefy.callbacks.DisableWifiCallbacks;
-import com.isupatches.wisefy.constants.WiseFyCodes;
-import com.isupatches.wisefy.test.base.BaseTestClass;
-import com.isupatches.wisefy.test.base.TestActivity;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.timeout;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-
-public class DisableWifiTests extends BaseTestClass<TestActivity> {
-
-    public DisableWifiTests() {
-        super(TestActivity.class);
-    }
-
-    @Test
-    public void noCallbacks_failure() {
-        setManagers();
-        when(mMockWiFiManager.setWifiEnabled(anyBoolean())).thenReturn(false);
-        boolean result = mWiseFy.disableWifi();
-        verify(mMockWiFiManager, timeout(2000)).setWifiEnabled(false);
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void noCallbacks_failure_nullWifiManager() {
-        setManagersToNull();
-        boolean result = mWiseFy.disableWifi();
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void noCallbacks_success() {
-        setManagers();
-        when(mMockWiFiManager.setWifiEnabled(anyBoolean())).thenReturn(true);
-        boolean result = mWiseFy.disableWifi();
-        verify(mMockWiFiManager, timeout(2000)).setWifiEnabled(false);
-        assertEquals(true, result);
-    }
-
-    @Test
-    public void callbacks_failure() {
-        setManagers();
-        when(mMockWiFiManager.setWifiEnabled(anyBoolean())).thenReturn(false);
-        DisableWifiCallbacks mockDisableWifiCallbacks = mock(DisableWifiCallbacks.class);
-        mWiseFy.disableWifi(mockDisableWifiCallbacks);
-        verify(mMockWiFiManager, timeout(2000)).setWifiEnabled(false);
-        verify(mockDisableWifiCallbacks, timeout(2000)).failureDisablingWifi();
-    }
-
-    @Test
-    public void callbacks_failure_nullCallback() {
-        setManagers();
-        when(mMockWiFiManager.setWifiEnabled(anyBoolean())).thenReturn(false);
-        DisableWifiCallbacks mockDisableWifiCallbacks = mock(DisableWifiCallbacks.class);
-        mWiseFy.disableWifi(null);
-        verify(mMockWiFiManager, timeout(2000)).setWifiEnabled(false);
-        verify(mockDisableWifiCallbacks, never()).failureDisablingWifi();
-    }
-
-    @Test
-    public void callbacks_failure_nullWifiManager() {
-        setManagersToNull();
-        DisableWifiCallbacks mockDisableWifiCallbacks = mock(DisableWifiCallbacks.class);
-        mWiseFy.disableWifi(mockDisableWifiCallbacks);
-        verify(mMockWiFiManager, never()).setWifiEnabled(false);
-        verify(mockDisableWifiCallbacks, timeout(2000)).disableWifiWiseFyFailure(WiseFyCodes.NULL_MANAGER);
-    }
-
-    @Test
-    public void callbacks_failure_nullWifiManager_nullCallback() {
-        setManagersToNull();
-        DisableWifiCallbacks mockDisableWifiCallbacks = mock(DisableWifiCallbacks.class);
-        mWiseFy.disableWifi(null);
-        verify(mMockWiFiManager, never()).setWifiEnabled(false);
-        verify(mockDisableWifiCallbacks, never()).disableWifiWiseFyFailure(WiseFyCodes.NULL_MANAGER);
-    }
-
-    @Test
-    public void callbacks_success() {
-        setManagers();
-        when(mMockWiFiManager.setWifiEnabled(anyBoolean())).thenReturn(true);
-        DisableWifiCallbacks mockDisableWifiCallbacks = mock(DisableWifiCallbacks.class);
-        mWiseFy.disableWifi(mockDisableWifiCallbacks);
-        verify(mMockWiFiManager, timeout(2000)).setWifiEnabled(false);
-        verify(mockDisableWifiCallbacks, timeout(2000)).wifiDisabled();
-    }
-
-    @Test
-    public void callbacks_success_nullCallback() {
-        setManagers();
-        when(mMockWiFiManager.setWifiEnabled(anyBoolean())).thenReturn(true);
-        DisableWifiCallbacks mockDisableWifiCallbacks = mock(DisableWifiCallbacks.class);
-        mWiseFy.disableWifi(null);
-        verify(mMockWiFiManager, timeout(2000)).setWifiEnabled(false);
-        verify(mockDisableWifiCallbacks, never()).wifiDisabled();
-    }
-}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/DisconnectFromCurrentNetworkTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/test/DisconnectFromCurrentNetworkTests.java
deleted file mode 100644
index 647393df..00000000
--- a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/DisconnectFromCurrentNetworkTests.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.isupatches.wisefy.test;
-
-
-import com.isupatches.wisefy.callbacks.DisconnectFromCurrentNetworkCallbacks;
-import com.isupatches.wisefy.constants.WiseFyCodes;
-import com.isupatches.wisefy.test.base.BaseTestClass;
-import com.isupatches.wisefy.test.base.TestActivity;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.timeout;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-
-public class DisconnectFromCurrentNetworkTests extends BaseTestClass<TestActivity> {
-
-    public DisconnectFromCurrentNetworkTests() {
-        super(TestActivity.class);
-    }
-
-    @Test
-    public void noCallbacks_failure() {
-        setManagers();
-        when(mMockWiFiManager.disconnect()).thenReturn(false);
-        boolean result = mWiseFy.disconnectFromCurrentNetwork();
-        verify(mMockWiFiManager, timeout(2000)).disconnect();
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void noCallbacks_failure_nullWifiManager() {
-        setManagersToNull();
-        boolean result = mWiseFy.disconnectFromCurrentNetwork();
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void noCallbacks_success() {
-        setManagers();
-        when(mMockWiFiManager.disconnect()).thenReturn(true);
-        boolean result = mWiseFy.disconnectFromCurrentNetwork();
-        verify(mMockWiFiManager, timeout(2000)).disconnect();
-        assertEquals(true, result);
-    }
-
-    @Test
-    public void callbacks_failure() {
-        setManagers();
-        when(mMockWiFiManager.disconnect()).thenReturn(false);
-        DisconnectFromCurrentNetworkCallbacks disconnectFromCurrentNetworkCallbacks = mock(DisconnectFromCurrentNetworkCallbacks.class);
-        mWiseFy.disconnectFromCurrentNetwork(disconnectFromCurrentNetworkCallbacks);
-        verify(mMockWiFiManager, timeout(2000)).disconnect();
-        verify(disconnectFromCurrentNetworkCallbacks, timeout(2000)).failureDisconnectingFromCurrentNetwork();
-    }
-
-    @Test
-    public void callbacks_failure_nullCallback() {
-        setManagers();
-        when(mMockWiFiManager.disconnect()).thenReturn(false);
-        DisconnectFromCurrentNetworkCallbacks disconnectFromCurrentNetworkCallbacks = mock(DisconnectFromCurrentNetworkCallbacks.class);
-        mWiseFy.disconnectFromCurrentNetwork(null);
-        verify(mMockWiFiManager, timeout(2000)).disconnect();
-        verify(disconnectFromCurrentNetworkCallbacks, never()).failureDisconnectingFromCurrentNetwork();
-    }
-
-    @Test
-    public void callbacks_failure_nullWifiManager() {
-        setManagersToNull();
-        DisconnectFromCurrentNetworkCallbacks disconnectFromCurrentNetworkCallbacks = mock(DisconnectFromCurrentNetworkCallbacks.class);
-        mWiseFy.disconnectFromCurrentNetwork(disconnectFromCurrentNetworkCallbacks);
-        verify(mMockWiFiManager, never()).disconnect();
-        verify(disconnectFromCurrentNetworkCallbacks, timeout(2000)).disconnectFromCurrentNetworkWiseFyFailure(WiseFyCodes.NULL_MANAGER);
-    }
-
-    @Test
-    public void callbacks_failure_nullWifiManager_nullCallback() {
-        setManagersToNull();
-        DisconnectFromCurrentNetworkCallbacks disconnectFromCurrentNetworkCallbacks = mock(DisconnectFromCurrentNetworkCallbacks.class);
-        mWiseFy.disconnectFromCurrentNetwork(null);
-        verify(mMockWiFiManager, never()).disconnect();
-        verify(disconnectFromCurrentNetworkCallbacks, never()).disconnectFromCurrentNetworkWiseFyFailure(WiseFyCodes.NULL_MANAGER);
-    }
-
-    @Test
-    public void callbacks_success() {
-        setManagers();
-        when(mMockWiFiManager.disconnect()).thenReturn(true);
-        DisconnectFromCurrentNetworkCallbacks disconnectFromCurrentNetworkCallbacks = mock(DisconnectFromCurrentNetworkCallbacks.class);
-        mWiseFy.disconnectFromCurrentNetwork(disconnectFromCurrentNetworkCallbacks);
-        verify(mMockWiFiManager, timeout(2000)).disconnect();
-        verify(disconnectFromCurrentNetworkCallbacks, timeout(2000)).disconnectedFromCurrentNetwork();
-    }
-
-    @Test
-    public void callbacks_success_nullCallback() {
-        setManagers();
-        when(mMockWiFiManager.disconnect()).thenReturn(true);
-        DisconnectFromCurrentNetworkCallbacks disconnectFromCurrentNetworkCallbacks = mock(DisconnectFromCurrentNetworkCallbacks.class);
-        mWiseFy.disconnectFromCurrentNetwork(null);
-        verify(mMockWiFiManager, timeout(2000)).disconnect();
-        verify(disconnectFromCurrentNetworkCallbacks, never()).disconnectedFromCurrentNetwork();
-    }
-}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/EnableWifiTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/test/EnableWifiTests.java
deleted file mode 100644
index ee6a7638..00000000
--- a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/EnableWifiTests.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.isupatches.wisefy.test;
-
-
-import com.isupatches.wisefy.callbacks.EnableWifiCallbacks;
-import com.isupatches.wisefy.constants.WiseFyCodes;
-import com.isupatches.wisefy.test.base.BaseTestClass;
-import com.isupatches.wisefy.test.base.TestActivity;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.timeout;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-
-public class EnableWifiTests extends BaseTestClass<TestActivity> {
-
-    public EnableWifiTests() {
-        super(TestActivity.class);
-    }
-
-    @Test
-    public void noCallbacks_failure() {
-        setManagers();
-        when(mMockWiFiManager.setWifiEnabled(anyBoolean())).thenReturn(false);
-        boolean result = mWiseFy.enableWifi();
-        verify(mMockWiFiManager, timeout(2000)).setWifiEnabled(true);
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void noCallbacks_failure_nullWifiManager() {
-        setManagersToNull();
-        boolean result = mWiseFy.enableWifi();
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void noCallbacks_success() {
-        setManagers();
-        when(mMockWiFiManager.setWifiEnabled(anyBoolean())).thenReturn(true);
-        boolean result = mWiseFy.enableWifi();
-        verify(mMockWiFiManager, timeout(2000)).setWifiEnabled(true);
-        assertEquals(true, result);
-    }
-
-    @Test
-    public void callbacks_failure() {
-        setManagers();
-        when(mMockWiFiManager.setWifiEnabled(anyBoolean())).thenReturn(false);
-        EnableWifiCallbacks enableWifiCallbacks = mock(EnableWifiCallbacks.class);
-        mWiseFy.enableWifi(enableWifiCallbacks);
-        verify(mMockWiFiManager, timeout(2000)).setWifiEnabled(true);
-        verify(enableWifiCallbacks, timeout(2000)).failureEnablingWifi();
-    }
-
-    @Test
-    public void callbacks_failure_nullCallback() {
-        setManagers();
-        when(mMockWiFiManager.setWifiEnabled(anyBoolean())).thenReturn(false);
-        EnableWifiCallbacks enableWifiCallbacks = mock(EnableWifiCallbacks.class);
-        mWiseFy.enableWifi(null);
-        verify(mMockWiFiManager, timeout(2000)).setWifiEnabled(true);
-        verify(enableWifiCallbacks, never()).failureEnablingWifi();
-    }
-
-    @Test
-    public void callbacks_failure_nullWifiManager() {
-        setManagersToNull();
-        EnableWifiCallbacks enableWifiCallbacks = mock(EnableWifiCallbacks.class);
-        mWiseFy.enableWifi(enableWifiCallbacks);
-        verify(mMockWiFiManager, never()).setWifiEnabled(true);
-        verify(enableWifiCallbacks, timeout(2000)).enableWifiWiseFyFailure(WiseFyCodes.NULL_MANAGER);
-    }
-
-    @Test
-    public void callbacks_failure_nullWifiManager_nullCallback() {
-        setManagersToNull();
-        EnableWifiCallbacks enableWifiCallbacks = mock(EnableWifiCallbacks.class);
-        mWiseFy.enableWifi(null);
-        verify(mMockWiFiManager, never()).setWifiEnabled(true);
-        verify(enableWifiCallbacks, never()).enableWifiWiseFyFailure(WiseFyCodes.NULL_MANAGER);
-    }
-
-    @Test
-    public void callbacks_success() {
-        setManagers();
-        when(mMockWiFiManager.setWifiEnabled(anyBoolean())).thenReturn(true);
-        EnableWifiCallbacks enableWifiCallbacks = mock(EnableWifiCallbacks.class);
-        mWiseFy.enableWifi(enableWifiCallbacks);
-        verify(mMockWiFiManager, timeout(2000)).setWifiEnabled(true);
-        verify(enableWifiCallbacks, timeout(2000)).wifiEnabled();
-    }
-
-    @Test
-    public void callbacks_success_nullCallback() {
-        setManagers();
-        when(mMockWiFiManager.setWifiEnabled(anyBoolean())).thenReturn(true);
-        EnableWifiCallbacks enableWifiCallbacks = mock(EnableWifiCallbacks.class);
-        mWiseFy.enableWifi(null);
-        verify(mMockWiFiManager, timeout(2000)).setWifiEnabled(true);
-        verify(enableWifiCallbacks, never()).wifiEnabled();
-    }
-}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/GetCurrentNetworkTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/test/GetCurrentNetworkTests.java
deleted file mode 100644
index a5e0fc7b..00000000
--- a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/GetCurrentNetworkTests.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.isupatches.wisefy.test;
-
-
-import android.net.wifi.WifiInfo;
-import com.isupatches.wisefy.callbacks.GetCurrentNetworkCallbacks;
-import com.isupatches.wisefy.constants.WiseFyCodes;
-import com.isupatches.wisefy.test.base.BaseTestClass;
-import com.isupatches.wisefy.test.base.TestActivity;
-import org.junit.Test;
-import static com.isupatches.wisefy.test.base.TestUtils.TEST_SSID;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.timeout;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-
-public class GetCurrentNetworkTests extends BaseTestClass<TestActivity> {
-
-    public GetCurrentNetworkTests() {
-        super(TestActivity.class);
-    }
-
-    @Test
-    public void noCallbacks_failure_nullWifiManager() {
-        setManagersToNull();
-        assertEquals(null, mWiseFy.getCurrentNetwork());
-    }
-
-    @Test
-    public void noCallbacks_success() {
-        setManagers();
-        WifiInfo mockWifiInfo = mock(WifiInfo.class);
-        when(mockWifiInfo.getSSID()).thenReturn(TEST_SSID);
-        when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWifiInfo);
-
-        assertEquals(TEST_SSID, mWiseFy.getCurrentNetwork().getSSID());
-    }
-
-    @Test
-    public void callbacks_failure_nullWifiManager() {
-        setManagersToNull();
-        GetCurrentNetworkCallbacks getCurrentNetworkCallbacks = mock(GetCurrentNetworkCallbacks.class);
-        mWiseFy.getCurrentNetwork(getCurrentNetworkCallbacks);
-        verify(getCurrentNetworkCallbacks, timeout(2000)).getCurrentNetworkWiseFyFailure(WiseFyCodes.NULL_MANAGER);
-    }
-
-    @Test
-    public void callbacks_failure_nullWifiManager_nullCallbacks() {
-        setManagersToNull();
-        GetCurrentNetworkCallbacks getCurrentNetworkCallbacks = mock(GetCurrentNetworkCallbacks.class);
-        mWiseFy.getCurrentNetwork(null);
-        verify(getCurrentNetworkCallbacks, never()).getCurrentNetworkWiseFyFailure(WiseFyCodes.NULL_MANAGER);
-    }
-
-    @Test
-    public void callbacks_success() {
-        setManagers();
-        WifiInfo mockWifiInfo = mock(WifiInfo.class);
-        when(mockWifiInfo.getSSID()).thenReturn(TEST_SSID);
-        when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWifiInfo);
-
-        GetCurrentNetworkCallbacks getCurrentNetworkCallbacks = mock(GetCurrentNetworkCallbacks.class);
-        mWiseFy.getCurrentNetwork(getCurrentNetworkCallbacks);
-        verify(getCurrentNetworkCallbacks, timeout(2000)).retrievedCurrentNetwork(mockWifiInfo);
-    }
-
-    @Test
-    public void callbacks_success_nullCallback() {
-        setManagers();
-        WifiInfo mockWifiInfo = mock(WifiInfo.class);
-        when(mockWifiInfo.getSSID()).thenReturn(TEST_SSID);
-        when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWifiInfo);
-
-        GetCurrentNetworkCallbacks getCurrentNetworkCallbacks = mock(GetCurrentNetworkCallbacks.class);
-        mWiseFy.getCurrentNetwork(null);
-        verify(getCurrentNetworkCallbacks, never()).retrievedCurrentNetwork(mockWifiInfo);
-    }
-}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/GetNearbyAccessPointsTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/test/GetNearbyAccessPointsTests.java
deleted file mode 100644
index 1330a23e..00000000
--- a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/GetNearbyAccessPointsTests.java
+++ /dev/null
@@ -1,323 +0,0 @@
-package com.isupatches.wisefy.test;
-
-
-import android.net.wifi.ScanResult;
-import com.isupatches.wisefy.callbacks.GetNearbyAccessPointsCallbacks;
-import com.isupatches.wisefy.constants.WiseFyCodes;
-import com.isupatches.wisefy.test.base.BaseTestClass;
-import com.isupatches.wisefy.test.base.TestActivity;
-import org.junit.Test;
-import java.util.ArrayList;
-import java.util.List;
-import static com.isupatches.wisefy.test.base.TestUtils.TEST_SSID;
-import static com.isupatches.wisefy.test.base.TestUtils.TEST_SSID2;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.timeout;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-
-public class GetNearbyAccessPointsTests extends BaseTestClass<TestActivity> {
-
-    public GetNearbyAccessPointsTests() {
-        super(TestActivity.class);
-    }
-
-    @Test
-    public void noCallbacks_success_filterDuplicates_false() {
-        setManagers();
-        List<ScanResult> scanResults = new ArrayList<>();
-        ScanResult scanResult1 = mock(ScanResult.class);
-        scanResult1.SSID = TEST_SSID;
-        scanResults.add(scanResult1);
-        ScanResult scanResult2 = mock(ScanResult.class);
-        scanResult2.SSID = TEST_SSID2;
-        scanResults.add(scanResult2);
-
-        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
-
-        List<ScanResult> results = mWiseFy.getNearbyAccessPoints(false);
-
-        assertEquals(scanResults, results);
-        assertEquals(2, results.size());
-    }
-
-    @Test
-    public void noCallbacks_success_filterDuplicates_true_differentSSIDs() {
-        setManagers();
-        List<ScanResult> scanResults = new ArrayList<>();
-        ScanResult scanResult1 = mock(ScanResult.class);
-        scanResult1.SSID = TEST_SSID;
-        scanResults.add(scanResult1);
-        ScanResult scanResult2 = mock(ScanResult.class);
-        scanResult2.SSID = TEST_SSID2;
-        scanResults.add(scanResult2);
-
-        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
-
-        List<ScanResult> results = mWiseFy.getNearbyAccessPoints(true);
-
-        assertEquals(scanResults, results);
-        assertEquals(2, results.size());
-    }
-
-    @Test
-    public void noCallbacks_success_filterDuplicates_true_sameSSIDs_higherFrequency() {
-        setManagers();
-        List<ScanResult> scanResults = new ArrayList<>();
-        ScanResult scanResult1 = mock(ScanResult.class);
-        scanResult1.SSID = TEST_SSID;
-        scanResult1.level = -35;
-        scanResults.add(scanResult1);
-        ScanResult scanResult2 = mock(ScanResult.class);
-        scanResult2.SSID = TEST_SSID;
-        scanResult2.level = -70;
-        scanResults.add(scanResult2);
-
-        List<ScanResult> expectedScanResults = new ArrayList<>();
-        expectedScanResults.add(scanResult1);
-
-        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
-
-        List<ScanResult> results = mWiseFy.getNearbyAccessPoints(true);
-
-        assertEquals(expectedScanResults, results);
-        assertEquals(1, results.size());
-    }
-
-    @Test
-    public void noCallbacks_filterDuplicates_true_sameSSIDs_lowerFrequency() {
-        setManagers();
-        List<ScanResult> scanResults = new ArrayList<>();
-        ScanResult scanResult1 = mock(ScanResult.class);
-        scanResult1.SSID = TEST_SSID;
-        scanResult1.level = -70;
-        scanResults.add(scanResult1);
-        ScanResult scanResult2 = mock(ScanResult.class);
-        scanResult2.SSID = TEST_SSID;
-        scanResult2.level = -35;
-        scanResults.add(scanResult2);
-
-        List<ScanResult> expectedScanResults = new ArrayList<>();
-        expectedScanResults.add(scanResult2);
-
-        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
-
-        List<ScanResult> results = mWiseFy.getNearbyAccessPoints(true);
-
-        assertEquals(expectedScanResults, results);
-        assertEquals(1, results.size());
-    }
-
-    @Test
-    public void noCallbacks_failure_filterDuplicates_false_nullWifiManager() {
-        setManagersToNull();
-        List<ScanResult> results = mWiseFy.getNearbyAccessPoints(false);
-        assertEquals(null, results);
-    }
-
-    @Test
-    public void noCallbacks_failure_filterDuplicates_true_nullWifiManager() {
-        setManagersToNull();
-        List<ScanResult> results = mWiseFy.getNearbyAccessPoints(true);
-        assertEquals(null, results);
-    }
-
-    @Test
-    public void callbacks_success_filterDuplicates_false() {
-        setManagers();
-        List<ScanResult> scanResults = new ArrayList<>();
-        ScanResult scanResult1 = mock(ScanResult.class);
-        scanResult1.SSID = TEST_SSID;
-        scanResults.add(scanResult1);
-        ScanResult scanResult2 = mock(ScanResult.class);
-        scanResult2.SSID = TEST_SSID2;
-        scanResults.add(scanResult2);
-
-        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
-
-        GetNearbyAccessPointsCallbacks getNearbyAccessPointsCallbacks = mock(GetNearbyAccessPointsCallbacks.class);
-        mWiseFy.getNearbyAccessPoints(false, getNearbyAccessPointsCallbacks);
-        verify(getNearbyAccessPointsCallbacks, timeout(2000)).retrievedNearbyAccessPoints(scanResults);
-    }
-
-    @Test
-    public void callbacks_success_filterDuplicates_false_nullCallback() {
-        setManagers();
-        List<ScanResult> scanResults = new ArrayList<>();
-        ScanResult scanResult1 = mock(ScanResult.class);
-        scanResult1.SSID = TEST_SSID;
-        scanResults.add(scanResult1);
-        ScanResult scanResult2 = mock(ScanResult.class);
-        scanResult2.SSID = TEST_SSID2;
-        scanResults.add(scanResult2);
-
-        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
-
-        GetNearbyAccessPointsCallbacks getNearbyAccessPointsCallbacks = mock(GetNearbyAccessPointsCallbacks.class);
-        mWiseFy.getNearbyAccessPoints(false, null);
-        verify(getNearbyAccessPointsCallbacks, never()).retrievedNearbyAccessPoints(scanResults);
-    }
-
-    @Test
-    public void callbacks_success_filterDuplicates_true_differentSSIDs() {
-        setManagers();
-        List<ScanResult> scanResults = new ArrayList<>();
-        ScanResult scanResult1 = mock(ScanResult.class);
-        scanResult1.SSID = TEST_SSID;
-        scanResults.add(scanResult1);
-        ScanResult scanResult2 = mock(ScanResult.class);
-        scanResult2.SSID = TEST_SSID2;
-        scanResults.add(scanResult2);
-
-        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
-
-        GetNearbyAccessPointsCallbacks getNearbyAccessPointsCallbacks = mock(GetNearbyAccessPointsCallbacks.class);
-        mWiseFy.getNearbyAccessPoints(true, getNearbyAccessPointsCallbacks);
-        verify(getNearbyAccessPointsCallbacks, timeout(2000)).retrievedNearbyAccessPoints(scanResults);
-    }
-
-    @Test
-    public void callbacks_success_filterDuplicates_true_differentSSIDs_nullCallback() {
-        setManagers();
-        List<ScanResult> scanResults = new ArrayList<>();
-        ScanResult scanResult1 = mock(ScanResult.class);
-        scanResult1.SSID = TEST_SSID;
-        scanResults.add(scanResult1);
-        ScanResult scanResult2 = mock(ScanResult.class);
-        scanResult2.SSID = TEST_SSID2;
-        scanResults.add(scanResult2);
-
-        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
-
-        GetNearbyAccessPointsCallbacks getNearbyAccessPointsCallbacks = mock(GetNearbyAccessPointsCallbacks.class);
-        mWiseFy.getNearbyAccessPoints(true, null);
-        verify(getNearbyAccessPointsCallbacks, never()).retrievedNearbyAccessPoints(scanResults);
-    }
-
-    @Test
-    public void callbacks_success_filterDuplicates_true_sameSSIDs_higherFrequency() {
-        setManagers();
-        List<ScanResult> scanResults = new ArrayList<>();
-        ScanResult scanResult1 = mock(ScanResult.class);
-        scanResult1.SSID = TEST_SSID;
-        scanResult1.level = -35;
-        scanResults.add(scanResult1);
-        ScanResult scanResult2 = mock(ScanResult.class);
-        scanResult2.SSID = TEST_SSID;
-        scanResult2.level = -70;
-        scanResults.add(scanResult2);
-
-        List<ScanResult> expectedScanResults = new ArrayList<>();
-        expectedScanResults.add(scanResult1);
-
-        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
-
-        GetNearbyAccessPointsCallbacks getNearbyAccessPointsCallbacks = mock(GetNearbyAccessPointsCallbacks.class);
-        mWiseFy.getNearbyAccessPoints(true, getNearbyAccessPointsCallbacks);
-        verify(getNearbyAccessPointsCallbacks, timeout(2000)).retrievedNearbyAccessPoints(expectedScanResults);
-    }
-
-    @Test
-    public void callbacks_success_filterDuplicates_true_sameSSIDs_higherFrequency_nullCallback() {
-        setManagers();
-        List<ScanResult> scanResults = new ArrayList<>();
-        ScanResult scanResult1 = mock(ScanResult.class);
-        scanResult1.SSID = TEST_SSID;
-        scanResult1.level = -35;
-        scanResults.add(scanResult1);
-        ScanResult scanResult2 = mock(ScanResult.class);
-        scanResult2.SSID = TEST_SSID;
-        scanResult2.level = -70;
-        scanResults.add(scanResult2);
-
-        List<ScanResult> expectedScanResults = new ArrayList<>();
-        expectedScanResults.add(scanResult1);
-
-        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
-
-        GetNearbyAccessPointsCallbacks getNearbyAccessPointsCallbacks = mock(GetNearbyAccessPointsCallbacks.class);
-        mWiseFy.getNearbyAccessPoints(true, null);
-        verify(getNearbyAccessPointsCallbacks, never()).retrievedNearbyAccessPoints(expectedScanResults);
-    }
-
-    @Test
-    public void callbacks_filterDuplicates_true_sameSSIDs_lowerFrequency() {
-        setManagers();
-        List<ScanResult> scanResults = new ArrayList<>();
-        ScanResult scanResult1 = mock(ScanResult.class);
-        scanResult1.SSID = TEST_SSID;
-        scanResult1.level = -70;
-        scanResults.add(scanResult1);
-        ScanResult scanResult2 = mock(ScanResult.class);
-        scanResult2.SSID = TEST_SSID;
-        scanResult2.level = -35;
-        scanResults.add(scanResult2);
-
-        List<ScanResult> expectedScanResults = new ArrayList<>();
-        expectedScanResults.add(scanResult2);
-
-        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
-
-        GetNearbyAccessPointsCallbacks getNearbyAccessPointsCallbacks = mock(GetNearbyAccessPointsCallbacks.class);
-        mWiseFy.getNearbyAccessPoints(true, getNearbyAccessPointsCallbacks);
-        verify(getNearbyAccessPointsCallbacks, timeout(2000)).retrievedNearbyAccessPoints(expectedScanResults);
-    }
-
-    @Test
-    public void callbacks_filterDuplicates_true_sameSSIDs_lowerFrequency_nullCallback() {
-        setManagers();
-        List<ScanResult> scanResults = new ArrayList<>();
-        ScanResult scanResult1 = mock(ScanResult.class);
-        scanResult1.SSID = TEST_SSID;
-        scanResult1.level = -70;
-        scanResults.add(scanResult1);
-        ScanResult scanResult2 = mock(ScanResult.class);
-        scanResult2.SSID = TEST_SSID;
-        scanResult2.level = -35;
-        scanResults.add(scanResult2);
-
-        List<ScanResult> expectedScanResults = new ArrayList<>();
-        expectedScanResults.add(scanResult2);
-
-        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
-
-        GetNearbyAccessPointsCallbacks getNearbyAccessPointsCallbacks = mock(GetNearbyAccessPointsCallbacks.class);
-        mWiseFy.getNearbyAccessPoints(true, null);
-        verify(getNearbyAccessPointsCallbacks, never()).retrievedNearbyAccessPoints(expectedScanResults);
-    }
-
-    @Test
-    public void callbacks_failure_filterDuplicates_false_nullWifiManager() {
-        setManagersToNull();
-        GetNearbyAccessPointsCallbacks getNearbyAccessPointsCallbacks = mock(GetNearbyAccessPointsCallbacks.class);
-        mWiseFy.getNearbyAccessPoints(false, getNearbyAccessPointsCallbacks);
-        verify(getNearbyAccessPointsCallbacks, timeout(2000)).getNearbyAccessPointsWiseFyFailure(WiseFyCodes.NULL_MANAGER);
-    }
-
-    @Test
-    public void callbacks_failure_filterDuplicates_false_nullWifiManager_nullCallback() {
-        setManagersToNull();
-        GetNearbyAccessPointsCallbacks getNearbyAccessPointsCallbacks = mock(GetNearbyAccessPointsCallbacks.class);
-        mWiseFy.getNearbyAccessPoints(false, null);
-        verify(getNearbyAccessPointsCallbacks, never()).getNearbyAccessPointsWiseFyFailure(WiseFyCodes.NULL_MANAGER);
-    }
-
-    @Test
-    public void callbacks_failure_filterDuplicates_true_nullWifiManager() {
-        setManagersToNull();
-        GetNearbyAccessPointsCallbacks getNearbyAccessPointsCallbacks = mock(GetNearbyAccessPointsCallbacks.class);
-        mWiseFy.getNearbyAccessPoints(true, getNearbyAccessPointsCallbacks);
-        verify(getNearbyAccessPointsCallbacks, timeout(2000)).getNearbyAccessPointsWiseFyFailure(WiseFyCodes.NULL_MANAGER);
-    }
-
-    @Test
-    public void callbacks_failure_filterDuplicates_true_nullWifiManager_nullCallback() {
-        setManagersToNull();
-        GetNearbyAccessPointsCallbacks getNearbyAccessPointsCallbacks = mock(GetNearbyAccessPointsCallbacks.class);
-        mWiseFy.getNearbyAccessPoints(true, null);
-        verify(getNearbyAccessPointsCallbacks, never()).getNearbyAccessPointsWiseFyFailure(WiseFyCodes.NULL_MANAGER);
-    }
-}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/GetSavedNetworkTest.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/test/GetSavedNetworkTest.java
deleted file mode 100644
index c1e41091..00000000
--- a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/GetSavedNetworkTest.java
+++ /dev/null
@@ -1,307 +0,0 @@
-package com.isupatches.wisefy.test;
-
-
-import android.net.wifi.WifiConfiguration;
-import com.isupatches.wisefy.callbacks.GetSavedNetworkCallbacks;
-import com.isupatches.wisefy.constants.WiseFyCodes;
-import com.isupatches.wisefy.test.base.BaseTestClass;
-import com.isupatches.wisefy.test.base.TestActivity;
-import org.junit.Test;
-import java.util.ArrayList;
-import java.util.List;
-import static com.isupatches.wisefy.test.base.TestUtils.TEST_SSID;
-import static com.isupatches.wisefy.test.base.TestUtils.TEST_SSID2;
-import static com.isupatches.wisefy.test.base.TestUtils.TEST_SSID3;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.timeout;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-
-public class GetSavedNetworkTest extends BaseTestClass<TestActivity> {
-
-    public GetSavedNetworkTest() {
-        super(TestActivity.class);
-    }
-
-    @Test
-    public void noCallbacks_failure_nullWifiManager() {
-        setManagersToNull();
-        assertEquals(null, mWiseFy.getSavedNetwork(TEST_SSID));
-    }
-
-    @Test
-    public void noCallbacks_failure_nullSSIDParam() {
-        setManagers();
-        assertEquals(null, mWiseFy.getSavedNetwork(null));
-    }
-
-    @Test
-    public void noCallbacks_failure_differentSSID() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration wifiConfiguration = new WifiConfiguration();
-        wifiConfiguration.SSID = TEST_SSID2;
-        wifiList.add(wifiConfiguration);
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-
-        assertEquals(null, mWiseFy.getSavedNetwork(TEST_SSID));
-    }
-
-    @Test
-    public void noCallbacks_failure_nullSSID() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration wifiConfiguration = new WifiConfiguration();
-        wifiConfiguration.SSID = null;
-        wifiList.add(wifiConfiguration);
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-
-        assertEquals(null, mWiseFy.getSavedNetwork(TEST_SSID));
-    }
-
-    @Test
-    public void noCallbacks_failure_multipleNetworks() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-
-        WifiConfiguration wifiConfiguration1 = new WifiConfiguration();
-        wifiConfiguration1.SSID = TEST_SSID2;
-        wifiList.add(wifiConfiguration1);
-
-        WifiConfiguration wifiConfiguration2 = new WifiConfiguration();
-        wifiConfiguration2.SSID = TEST_SSID3;
-        wifiList.add(wifiConfiguration2);
-
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-
-        assertEquals(null, mWiseFy.getSavedNetwork(TEST_SSID));
-    }
-
-    @Test
-    public void noCallbacks_success() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration wifiConfiguration = new WifiConfiguration();
-        wifiConfiguration.SSID = TEST_SSID;
-        wifiList.add(wifiConfiguration);
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-
-        assertEquals(wifiConfiguration, mWiseFy.getSavedNetwork(TEST_SSID));
-    }
-
-    @Test
-    public void noCallbacks_success_multipleNetworks() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-
-        WifiConfiguration wifiConfiguration1 = new WifiConfiguration();
-        wifiConfiguration1.SSID = TEST_SSID;
-        wifiList.add(wifiConfiguration1);
-
-        WifiConfiguration wifiConfiguration2 = new WifiConfiguration();
-        wifiConfiguration2.SSID = TEST_SSID2;
-        wifiList.add(wifiConfiguration2);
-
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-
-        assertEquals(wifiConfiguration1, mWiseFy.getSavedNetwork(TEST_SSID));
-    }
-
-    @Test
-    public void callbacks_failure_nullWifiManager() {
-        setManagersToNull();
-        GetSavedNetworkCallbacks getSavedNetworkCallbacks = mock(GetSavedNetworkCallbacks.class);
-        mWiseFy.getSavedNetwork(TEST_SSID, getSavedNetworkCallbacks);
-        verify(getSavedNetworkCallbacks, timeout(2000)).getSavedNetworkWiseFyFailure(WiseFyCodes.NULL_MANAGER);
-    }
-
-    @Test
-    public void callbacks_failure_nullWifiManager_nullCallback() {
-        setManagersToNull();
-        GetSavedNetworkCallbacks getSavedNetworkCallbacks = mock(GetSavedNetworkCallbacks.class);
-        mWiseFy.getSavedNetwork(TEST_SSID, null);
-        verify(getSavedNetworkCallbacks, never()).getSavedNetworkWiseFyFailure(WiseFyCodes.NULL_MANAGER);
-    }
-
-    @Test
-    public void callbacks_failure_nullSSIDParam() {
-        setManagers();
-        GetSavedNetworkCallbacks getSavedNetworkCallbacks = mock(GetSavedNetworkCallbacks.class);
-        mWiseFy.getSavedNetwork(null, getSavedNetworkCallbacks);
-        verify(getSavedNetworkCallbacks, timeout(2000)).getSavedNetworkWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
-    }
-
-    @Test
-    public void callbacks_failure_nullSSIDParam_nullCallback() {
-        setManagers();
-        GetSavedNetworkCallbacks getSavedNetworkCallbacks = mock(GetSavedNetworkCallbacks.class);
-        mWiseFy.getSavedNetwork(null, null);
-        verify(getSavedNetworkCallbacks, never()).getSavedNetworkWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
-    }
-
-    @Test
-    public void callbacks_failure_differentSSID() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration wifiConfiguration = new WifiConfiguration();
-        wifiConfiguration.SSID = TEST_SSID2;
-        wifiList.add(wifiConfiguration);
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-
-        GetSavedNetworkCallbacks getSavedNetworkCallbacks = mock(GetSavedNetworkCallbacks.class);
-        mWiseFy.getSavedNetwork(TEST_SSID, getSavedNetworkCallbacks);
-        verify(getSavedNetworkCallbacks, timeout(2000)).networkNotFound();
-    }
-
-    @Test
-    public void callbacks_failure_differentSSID_nullCallback() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration wifiConfiguration = new WifiConfiguration();
-        wifiConfiguration.SSID = TEST_SSID2;
-        wifiList.add(wifiConfiguration);
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-
-        GetSavedNetworkCallbacks getSavedNetworkCallbacks = mock(GetSavedNetworkCallbacks.class);
-        mWiseFy.getSavedNetwork(TEST_SSID, null);
-        verify(getSavedNetworkCallbacks, never()).networkNotFound();
-    }
-
-    @Test
-    public void callbacks_failure_nullSSID() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration wifiConfiguration = new WifiConfiguration();
-        wifiConfiguration.SSID = null;
-        wifiList.add(wifiConfiguration);
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-
-        GetSavedNetworkCallbacks getSavedNetworkCallbacks = mock(GetSavedNetworkCallbacks.class);
-        mWiseFy.getSavedNetwork(TEST_SSID, getSavedNetworkCallbacks);
-        verify(getSavedNetworkCallbacks, timeout(2000)).networkNotFound();
-    }
-
-    @Test
-    public void callbacks_failure_nullSSID_nullCallback() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration wifiConfiguration = new WifiConfiguration();
-        wifiConfiguration.SSID = null;
-        wifiList.add(wifiConfiguration);
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-
-        GetSavedNetworkCallbacks getSavedNetworkCallbacks = mock(GetSavedNetworkCallbacks.class);
-        mWiseFy.getSavedNetwork(TEST_SSID, null);
-        verify(getSavedNetworkCallbacks, never()).networkNotFound();
-    }
-
-    @Test
-    public void callbacks_failure_multipleNetworks() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-
-        WifiConfiguration wifiConfiguration1 = new WifiConfiguration();
-        wifiConfiguration1.SSID = TEST_SSID2;
-        wifiList.add(wifiConfiguration1);
-
-        WifiConfiguration wifiConfiguration2 = new WifiConfiguration();
-        wifiConfiguration2.SSID = TEST_SSID3;
-        wifiList.add(wifiConfiguration2);
-
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-
-        GetSavedNetworkCallbacks getSavedNetworkCallbacks = mock(GetSavedNetworkCallbacks.class);
-        mWiseFy.getSavedNetwork(TEST_SSID, getSavedNetworkCallbacks);
-        verify(getSavedNetworkCallbacks, timeout(2000)).networkNotFound();
-    }
-
-    @Test
-    public void callbacks_failure_multipleNetworks_nullCallback() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-
-        WifiConfiguration wifiConfiguration1 = new WifiConfiguration();
-        wifiConfiguration1.SSID = TEST_SSID2;
-        wifiList.add(wifiConfiguration1);
-
-        WifiConfiguration wifiConfiguration2 = new WifiConfiguration();
-        wifiConfiguration2.SSID = TEST_SSID3;
-        wifiList.add(wifiConfiguration2);
-
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-
-        GetSavedNetworkCallbacks getSavedNetworkCallbacks = mock(GetSavedNetworkCallbacks.class);
-        mWiseFy.getSavedNetwork(TEST_SSID, null);
-        verify(getSavedNetworkCallbacks, never()).networkNotFound();
-    }
-
-    @Test
-    public void callbacks_success() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration wifiConfiguration = new WifiConfiguration();
-        wifiConfiguration.SSID = TEST_SSID;
-        wifiList.add(wifiConfiguration);
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-
-        GetSavedNetworkCallbacks getSavedNetworkCallbacks = mock(GetSavedNetworkCallbacks.class);
-        mWiseFy.getSavedNetwork(TEST_SSID, getSavedNetworkCallbacks);
-        verify(getSavedNetworkCallbacks, timeout(2000)).retrievedSavedNetwork(wifiConfiguration);
-    }
-
-    @Test
-    public void callbacks_success_nullCallback() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration wifiConfiguration = new WifiConfiguration();
-        wifiConfiguration.SSID = TEST_SSID;
-        wifiList.add(wifiConfiguration);
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-
-        GetSavedNetworkCallbacks getSavedNetworkCallbacks = mock(GetSavedNetworkCallbacks.class);
-        mWiseFy.getSavedNetwork(TEST_SSID, null);
-        verify(getSavedNetworkCallbacks, never()).retrievedSavedNetwork(wifiConfiguration);
-    }
-
-    @Test
-    public void callbacks_success_multipleNetworks() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-
-        WifiConfiguration wifiConfiguration1 = new WifiConfiguration();
-        wifiConfiguration1.SSID = TEST_SSID;
-        wifiList.add(wifiConfiguration1);
-
-        WifiConfiguration wifiConfiguration2 = new WifiConfiguration();
-        wifiConfiguration2.SSID = TEST_SSID2;
-        wifiList.add(wifiConfiguration2);
-
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-
-        GetSavedNetworkCallbacks getSavedNetworkCallbacks = mock(GetSavedNetworkCallbacks.class);
-        mWiseFy.getSavedNetwork(TEST_SSID, getSavedNetworkCallbacks);
-        verify(getSavedNetworkCallbacks, timeout(2000)).retrievedSavedNetwork(wifiConfiguration1);    }
-
-    @Test
-    public void callbacks_success_multipleNetworks_nullCallback() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-
-        WifiConfiguration wifiConfiguration1 = new WifiConfiguration();
-        wifiConfiguration1.SSID = TEST_SSID;
-        wifiList.add(wifiConfiguration1);
-
-        WifiConfiguration wifiConfiguration2 = new WifiConfiguration();
-        wifiConfiguration2.SSID = TEST_SSID2;
-        wifiList.add(wifiConfiguration2);
-
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-
-        GetSavedNetworkCallbacks getSavedNetworkCallbacks = mock(GetSavedNetworkCallbacks.class);
-        mWiseFy.getSavedNetwork(TEST_SSID, null);
-        verify(getSavedNetworkCallbacks, never()).retrievedSavedNetwork(wifiConfiguration1);
-    }
-}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/GetSavedNetworkTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/test/GetSavedNetworkTests.java
deleted file mode 100644
index 14e0a794..00000000
--- a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/GetSavedNetworkTests.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.isupatches.wisefy.test;
-
-
-import android.net.wifi.WifiConfiguration;
-import com.isupatches.wisefy.callbacks.GetSavedNetworksCallbacks;
-import com.isupatches.wisefy.constants.WiseFyCodes;
-import com.isupatches.wisefy.test.base.BaseTestClass;
-import com.isupatches.wisefy.test.base.TestActivity;
-import org.junit.Test;
-import java.util.ArrayList;
-import java.util.List;
-import static com.isupatches.wisefy.test.base.TestUtils.TEST_SSID;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.timeout;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-
-public class GetSavedNetworkTests extends BaseTestClass<TestActivity> {
-
-    public GetSavedNetworkTests() {
-        super(TestActivity.class);
-    }
-
-    @Test
-    public void noCallbacks_failure_nullWifiManager() {
-        setManagersToNull();
-        assertEquals(null, mWiseFy.getSavedNetworks());
-    }
-
-    @Test
-    public void noCallbacks_success() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
-        mWiFiConfiguration.SSID = TEST_SSID;
-        wifiList.add(mWiFiConfiguration);
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-
-        assertEquals(wifiList, mWiseFy.getSavedNetworks());
-    }
-
-    @Test
-    public void callbacks_failure_nullWifiManager() {
-        setManagersToNull();
-        GetSavedNetworksCallbacks getSavedNetworksCallbacks = mock(GetSavedNetworksCallbacks.class);
-        mWiseFy.getSavedNetworks(getSavedNetworksCallbacks);
-        verify(getSavedNetworksCallbacks, timeout(2000)).getSavedNetworksWiseFyFailure(WiseFyCodes.NULL_MANAGER);
-    }
-
-    @Test
-    public void callbacks_failure_nullWifiManager_nullCallback() {
-        setManagersToNull();
-        GetSavedNetworksCallbacks getSavedNetworksCallbacks = mock(GetSavedNetworksCallbacks.class);
-        mWiseFy.getSavedNetworks(null);
-        verify(getSavedNetworksCallbacks, never()).getSavedNetworksWiseFyFailure(WiseFyCodes.NULL_MANAGER);
-    }
-
-    @Test
-    public void callbacks_success() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
-        mWiFiConfiguration.SSID = TEST_SSID;
-        wifiList.add(mWiFiConfiguration);
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-
-        GetSavedNetworksCallbacks getSavedNetworksCallbacks = mock(GetSavedNetworksCallbacks.class);
-        mWiseFy.getSavedNetworks(getSavedNetworksCallbacks);
-        verify(getSavedNetworksCallbacks, timeout(2000)).retrievedSavedNetworks(wifiList);
-    }
-
-    @Test
-    public void callbacks_success_nullCallback() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
-        mWiFiConfiguration.SSID = TEST_SSID;
-        wifiList.add(mWiFiConfiguration);
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-
-        GetSavedNetworksCallbacks getSavedNetworksCallbacks = mock(GetSavedNetworksCallbacks.class);
-        mWiseFy.getSavedNetworks(null);
-        verify(getSavedNetworksCallbacks, never()).retrievedSavedNetworks(wifiList);
-    }
-}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/IsDeviceConnectedToMobileNetworkTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/test/IsDeviceConnectedToMobileNetworkTests.java
deleted file mode 100644
index aea7a393..00000000
--- a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/IsDeviceConnectedToMobileNetworkTests.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package com.isupatches.wisefy.test;
-
-
-import android.net.NetworkInfo;
-import com.isupatches.wisefy.constants.NetworkTypes;
-import com.isupatches.wisefy.test.base.BaseTestClass;
-import com.isupatches.wisefy.test.base.TestActivity;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-
-public class IsDeviceConnectedToMobileNetworkTests extends BaseTestClass<TestActivity> {
-
-    public IsDeviceConnectedToMobileNetworkTests() {
-        super(TestActivity.class);
-    }
-
-    @Test
-    public void failure_notAvailable() {
-        setManagers();
-        NetworkInfo mockNetworkInfo = mock(NetworkInfo.class);
-        when(mockNetworkInfo.getTypeName()).thenReturn(NetworkTypes.MOBILE);
-
-        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(mockNetworkInfo);
-        when(mockNetworkInfo.isAvailable()).thenReturn(false);
-        when(mockNetworkInfo.isConnected()).thenReturn(true);
-
-        boolean result = mWiseFy.isDeviceConnectedToMobileNetwork();
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void failure_notConnected() {
-        setManagers();
-        NetworkInfo mockNetworkInfo = mock(NetworkInfo.class);
-        when(mockNetworkInfo.getTypeName()).thenReturn(NetworkTypes.MOBILE);
-
-        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(mockNetworkInfo);
-        when(mockNetworkInfo.isAvailable()).thenReturn(true);
-        when(mockNetworkInfo.isConnected()).thenReturn(false);
-
-        boolean result = mWiseFy.isDeviceConnectedToMobileNetwork();
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void failure_nullActiveNetworkInfo() {
-        setManagers();
-        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(null);
-        boolean result = mWiseFy.isDeviceConnectedToMobileNetwork();
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void failure_nullConfigurationManager() {
-        setManagers();
-        setConnectivityManagerToNull();
-        boolean result = mWiseFy.isDeviceConnectedToMobileNetwork();
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void failure_nullTypeName() {
-        setManagers();
-        NetworkInfo mockNetworkInfo = mock(NetworkInfo.class);
-        when(mockNetworkInfo.getTypeName()).thenReturn(null);
-
-        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(mockNetworkInfo);
-
-        boolean result = mWiseFy.isDeviceConnectedToMobileNetwork();
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void failure_wrongType() {
-        setManagers();
-        NetworkInfo mockNetworkInfo = mock(NetworkInfo.class);
-        when(mockNetworkInfo.getTypeName()).thenReturn("WRONG TYPE");
-
-        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(mockNetworkInfo);
-        when(mockNetworkInfo.isAvailable()).thenReturn(true);
-        when(mockNetworkInfo.isConnected()).thenReturn(true);
-
-        boolean result = mWiseFy.isDeviceConnectedToMobileNetwork();
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void success() {
-        setManagers();
-        NetworkInfo mockNetworkInfo = mock(NetworkInfo.class);
-        when(mockNetworkInfo.getTypeName()).thenReturn(NetworkTypes.MOBILE);
-
-        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(mockNetworkInfo);
-        when(mockNetworkInfo.isAvailable()).thenReturn(true);
-        when(mockNetworkInfo.isConnected()).thenReturn(true);
-
-        boolean result = mWiseFy.isDeviceConnectedToMobileNetwork();
-        assertEquals(true, result);
-    }
-}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/IsDeviceConnectedToMobileOrWifiNetworkTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/test/IsDeviceConnectedToMobileOrWifiNetworkTests.java
deleted file mode 100644
index 1aa08933..00000000
--- a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/IsDeviceConnectedToMobileOrWifiNetworkTests.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package com.isupatches.wisefy.test;
-
-
-import android.net.NetworkInfo;
-import com.isupatches.wisefy.constants.NetworkTypes;
-import com.isupatches.wisefy.test.base.BaseTestClass;
-import com.isupatches.wisefy.test.base.TestActivity;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-
-public class IsDeviceConnectedToMobileOrWifiNetworkTests extends BaseTestClass<TestActivity> {
-
-    public IsDeviceConnectedToMobileOrWifiNetworkTests() {
-        super(TestActivity.class);
-    }
-
-    @Test
-    public void failure_mobile_notAvailable() {
-        setManagers();
-        NetworkInfo mockNetworkInfo = mock(NetworkInfo.class);
-        when(mockNetworkInfo.getTypeName()).thenReturn(NetworkTypes.MOBILE);
-
-        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(mockNetworkInfo);
-        when(mockNetworkInfo.isAvailable()).thenReturn(false);
-        when(mockNetworkInfo.isConnected()).thenReturn(true);
-
-        boolean result = mWiseFy.isDeviceConnectedToMobileOrWifiNetwork();
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void failure_mobile_notConnected() {
-        setManagers();
-        NetworkInfo mockNetworkInfo = mock(NetworkInfo.class);
-        when(mockNetworkInfo.getTypeName()).thenReturn(NetworkTypes.MOBILE);
-
-        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(mockNetworkInfo);
-        when(mockNetworkInfo.isAvailable()).thenReturn(true);
-        when(mockNetworkInfo.isConnected()).thenReturn(false);
-
-        boolean result = mWiseFy.isDeviceConnectedToMobileOrWifiNetwork();
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void failure_nullActiveNetworkInfo() {
-        setManagers();
-        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(null);
-        boolean result = mWiseFy.isDeviceConnectedToMobileOrWifiNetwork();
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void failure_nullConfigurationManager() {
-        setManagersToNull();
-        boolean result = mWiseFy.isDeviceConnectedToMobileOrWifiNetwork();
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void failure_wifi_notAvailable() {
-        setManagers();
-        NetworkInfo mockNetworkInfo = mock(NetworkInfo.class);
-        when(mockNetworkInfo.getTypeName()).thenReturn(NetworkTypes.WIFI);
-
-        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(mockNetworkInfo);
-        when(mockNetworkInfo.isAvailable()).thenReturn(false);
-        when(mockNetworkInfo.isConnected()).thenReturn(true);
-
-        boolean result = mWiseFy.isDeviceConnectedToMobileOrWifiNetwork();
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void failure_wifi_notConnected() {
-        setManagers();
-        NetworkInfo mockNetworkInfo = mock(NetworkInfo.class);
-        when(mockNetworkInfo.getTypeName()).thenReturn(NetworkTypes.WIFI);
-
-        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(mockNetworkInfo);
-        when(mockNetworkInfo.isAvailable()).thenReturn(true);
-        when(mockNetworkInfo.isConnected()).thenReturn(false);
-
-        boolean result = mWiseFy.isDeviceConnectedToMobileOrWifiNetwork();
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void success_mobile() {
-        setManagers();
-        NetworkInfo mockNetworkInfo = mock(NetworkInfo.class);
-        when(mockNetworkInfo.getTypeName()).thenReturn(NetworkTypes.MOBILE);
-
-        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(mockNetworkInfo);
-        when(mockNetworkInfo.isAvailable()).thenReturn(true);
-        when(mockNetworkInfo.isConnected()).thenReturn(true);
-
-        boolean result = mWiseFy.isDeviceConnectedToMobileOrWifiNetwork();
-        assertEquals(true, result);
-    }
-
-    @Test
-    public void success_wifi() {
-        setManagers();
-        NetworkInfo mockNetworkInfo = mock(NetworkInfo.class);
-        when(mockNetworkInfo.getTypeName()).thenReturn(NetworkTypes.WIFI);
-
-        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(mockNetworkInfo);
-        when(mockNetworkInfo.isAvailable()).thenReturn(true);
-        when(mockNetworkInfo.isConnected()).thenReturn(true);
-
-        boolean result = mWiseFy.isDeviceConnectedToMobileOrWifiNetwork();
-        assertEquals(true, result);
-    }
-}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/IsDeviceConnectedToSSIDTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/test/IsDeviceConnectedToSSIDTests.java
deleted file mode 100644
index 927b3737..00000000
--- a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/IsDeviceConnectedToSSIDTests.java
+++ /dev/null
@@ -1,206 +0,0 @@
-package com.isupatches.wisefy.test;
-
-
-import android.net.NetworkInfo;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiInfo;
-import com.isupatches.wisefy.test.base.BaseTestClass;
-import com.isupatches.wisefy.test.base.TestActivity;
-import org.junit.Test;
-import java.util.ArrayList;
-import java.util.List;
-import static com.isupatches.wisefy.test.base.TestUtils.TEST_SSID;
-import static com.isupatches.wisefy.test.base.TestUtils.TEST_SSID2;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-
-public class IsDeviceConnectedToSSIDTests extends BaseTestClass<TestActivity> {
-
-    public IsDeviceConnectedToSSIDTests() {
-        super(TestActivity.class);
-    }
-
-    @Test
-    public void failure_differentSSID() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
-        mWiFiConfiguration.SSID = TEST_SSID2;
-        wifiList.add(mWiFiConfiguration);
-
-        WifiInfo mockWiFiInfo = mock(WifiInfo.class);
-        when(mockWiFiInfo.getSSID()).thenReturn(TEST_SSID2);
-
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-        when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWiFiInfo);
-
-        NetworkInfo mockNetworkInfo = mock(NetworkInfo.class);
-
-        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(mockNetworkInfo);
-        when(mockNetworkInfo.isAvailable()).thenReturn(true);
-        when(mockNetworkInfo.isConnected()).thenReturn(true);
-
-        boolean result = mWiseFy.isDeviceConnectedToSSID(TEST_SSID);
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void failure_notAvailable() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
-        mWiFiConfiguration.SSID = TEST_SSID;
-        wifiList.add(mWiFiConfiguration);
-
-        WifiInfo mockWiFiInfo = mock(WifiInfo.class);
-        when(mockWiFiInfo.getSSID()).thenReturn(TEST_SSID);
-
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-        when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWiFiInfo);
-
-        NetworkInfo mockNetworkInfo = mock(NetworkInfo.class);
-
-        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(mockNetworkInfo);
-        when(mockNetworkInfo.isAvailable()).thenReturn(false);
-        when(mockNetworkInfo.isConnected()).thenReturn(true);
-
-        boolean result = mWiseFy.isDeviceConnectedToSSID(TEST_SSID);
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void failure_notConnected() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
-        mWiFiConfiguration.SSID = TEST_SSID;
-        wifiList.add(mWiFiConfiguration);
-
-        WifiInfo mockWiFiInfo = mock(WifiInfo.class);
-        when(mockWiFiInfo.getSSID()).thenReturn(TEST_SSID);
-
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-        when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWiFiInfo);
-
-        NetworkInfo mockNetworkInfo = mock(NetworkInfo.class);
-
-        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(mockNetworkInfo);
-        when(mockNetworkInfo.isAvailable()).thenReturn(true);
-        when(mockNetworkInfo.isConnected()).thenReturn(false);
-
-        boolean result = mWiseFy.isDeviceConnectedToSSID(TEST_SSID);
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void failure_nullActiveNetworkInfo() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
-        mWiFiConfiguration.SSID = TEST_SSID;
-        wifiList.add(mWiFiConfiguration);
-
-        WifiInfo mockWiFiInfo = mock(WifiInfo.class);
-        when(mockWiFiInfo.getSSID()).thenReturn(TEST_SSID);
-
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-        when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWiFiInfo);
-        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(null);
-
-        boolean result = mWiseFy.isDeviceConnectedToSSID(TEST_SSID);
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void failure_nullConnectionInfo() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
-        mWiFiConfiguration.SSID = TEST_SSID;
-        wifiList.add(mWiFiConfiguration);
-
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-        when(mMockWiFiManager.getConnectionInfo()).thenReturn(null);
-
-        boolean result = mWiseFy.isDeviceConnectedToSSID(TEST_SSID);
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void failure_nullConnectionInfoSSID() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
-        mWiFiConfiguration.SSID = TEST_SSID;
-        wifiList.add(mWiFiConfiguration);
-
-        WifiInfo mockWiFiInfo = mock(WifiInfo.class);
-        when(mockWiFiInfo.getSSID()).thenReturn(null);
-
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-        when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWiFiInfo);
-
-        boolean result = mWiseFy.isDeviceConnectedToSSID(TEST_SSID);
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void failure_nullConnectivityManagerManager() {
-        setManagers();
-        setConnectivityManagerToNull();
-
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
-        mWiFiConfiguration.SSID = TEST_SSID;
-        wifiList.add(mWiFiConfiguration);
-
-        WifiInfo mockWiFiInfo = mock(WifiInfo.class);
-        when(mockWiFiInfo.getSSID()).thenReturn(TEST_SSID);
-
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-        when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWiFiInfo);
-
-        boolean result = mWiseFy.isDeviceConnectedToSSID(TEST_SSID);
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void failure_nullSSIDParam() {
-        setManagers();
-        boolean result = mWiseFy.isDeviceConnectedToSSID(null);
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void failure_nullWifiManager() {
-        setManagersToNull();
-        boolean result = mWiseFy.isDeviceConnectedToSSID(TEST_SSID);
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void success() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
-        mWiFiConfiguration.SSID = TEST_SSID;
-        wifiList.add(mWiFiConfiguration);
-
-        WifiInfo mockWiFiInfo = mock(WifiInfo.class);
-        when(mockWiFiInfo.getSSID()).thenReturn(TEST_SSID);
-
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-        when(mMockWiFiManager.getConnectionInfo()).thenReturn(mockWiFiInfo);
-
-        NetworkInfo mockNetworkInfo = mock(NetworkInfo.class);
-
-        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(mockNetworkInfo);
-        when(mockNetworkInfo.isAvailable()).thenReturn(true);
-        when(mockNetworkInfo.isConnected()).thenReturn(true);
-
-        boolean result = mWiseFy.isDeviceConnectedToSSID(TEST_SSID);
-        assertEquals(true, result);
-    }
-}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/IsDeviceConnectedToWifiNetworkTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/test/IsDeviceConnectedToWifiNetworkTests.java
deleted file mode 100644
index 4bc8049a..00000000
--- a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/IsDeviceConnectedToWifiNetworkTests.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.isupatches.wisefy.test;
-
-
-import android.net.NetworkInfo;
-import com.isupatches.wisefy.constants.NetworkTypes;
-import com.isupatches.wisefy.test.base.BaseTestClass;
-import com.isupatches.wisefy.test.base.TestActivity;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-
-public class IsDeviceConnectedToWifiNetworkTests extends BaseTestClass<TestActivity> {
-
-    public IsDeviceConnectedToWifiNetworkTests() {
-        super(TestActivity.class);
-    }
-
-    @Test
-    public void failure_notAvailable() {
-        setManagers();
-        NetworkInfo mockNetworkInfo = mock(NetworkInfo.class);
-        when(mockNetworkInfo.getTypeName()).thenReturn(NetworkTypes.WIFI);
-
-        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(mockNetworkInfo);
-        when(mockNetworkInfo.isAvailable()).thenReturn(false);
-        when(mockNetworkInfo.isConnected()).thenReturn(true);
-
-        boolean result = mWiseFy.isDeviceConnectedToWifiNetwork();
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void failure_notConnected() {
-        setManagers();
-        NetworkInfo mockNetworkInfo = mock(NetworkInfo.class);
-        when(mockNetworkInfo.getTypeName()).thenReturn(NetworkTypes.WIFI);
-
-        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(mockNetworkInfo);
-        when(mockNetworkInfo.isAvailable()).thenReturn(true);
-        when(mockNetworkInfo.isConnected()).thenReturn(false);
-
-        boolean result = mWiseFy.isDeviceConnectedToWifiNetwork();
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void failure_nullActiveNetworkInfo() {
-        setManagers();
-        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(null);
-        boolean result = mWiseFy.isDeviceConnectedToWifiNetwork();
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void failure_nullConfigurationManager() {
-        setManagers();
-        setConnectivityManagerToNull();
-        boolean result = mWiseFy.isDeviceConnectedToWifiNetwork();
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void failure_nullTypeName() {
-        setManagers();
-        NetworkInfo mockNetworkInfo = mock(NetworkInfo.class);
-        when(mockNetworkInfo.getTypeName()).thenReturn(null);
-        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(mockNetworkInfo);
-        boolean result = mWiseFy.isDeviceConnectedToWifiNetwork();
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void failure_wrongType() {
-        setManagers();
-        NetworkInfo mockNetworkInfo = mock(NetworkInfo.class);
-        when(mockNetworkInfo.getTypeName()).thenReturn("WRONG TYPE");
-
-        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(mockNetworkInfo);
-        when(mockNetworkInfo.isAvailable()).thenReturn(true);
-        when(mockNetworkInfo.isConnected()).thenReturn(true);
-
-        boolean result = mWiseFy.isDeviceConnectedToWifiNetwork();
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void success() {
-        setManagers();
-        NetworkInfo mockNetworkInfo = mock(NetworkInfo.class);
-        when(mockNetworkInfo.getTypeName()).thenReturn(NetworkTypes.WIFI);
-
-        when(mMockConnectivityManager.getActiveNetworkInfo()).thenReturn(mockNetworkInfo);
-        when(mockNetworkInfo.isAvailable()).thenReturn(true);
-        when(mockNetworkInfo.isConnected()).thenReturn(true);
-
-        boolean result = mWiseFy.isDeviceConnectedToWifiNetwork();
-        assertEquals(true, result);
-    }
-}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/PublicApiVisibilityTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/test/PublicApiVisibilityTests.java
new file mode 100644
index 00000000..d8ce5136
--- /dev/null
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/test/PublicApiVisibilityTests.java
@@ -0,0 +1,617 @@
+package com.isupatches.wisefy.test;
+
+
+import android.content.Intent;
+import android.net.wifi.ScanResult;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiInfo;
+import android.support.test.rule.ActivityTestRule;
+import com.isupatches.wisefy.WiseFy;
+import com.isupatches.wisefy.base.TestActivity;
+import com.isupatches.wisefy.callbacks.AddOpenNetworkCallbacks;
+import com.isupatches.wisefy.callbacks.AddWEPNetworkCallbacks;
+import com.isupatches.wisefy.callbacks.AddWPA2NetworkCallbacks;
+import com.isupatches.wisefy.callbacks.ConnectToNetworkCallbacks;
+import com.isupatches.wisefy.callbacks.DisableWifiCallbacks;
+import com.isupatches.wisefy.callbacks.DisconnectFromCurrentNetworkCallbacks;
+import com.isupatches.wisefy.callbacks.EnableWifiCallbacks;
+import com.isupatches.wisefy.callbacks.GetCurrentNetworkCallbacks;
+import com.isupatches.wisefy.callbacks.GetFrequencyCallbacks;
+import com.isupatches.wisefy.callbacks.GetNearbyAccessPointsCallbacks;
+import com.isupatches.wisefy.callbacks.GetRSSICallbacks;
+import com.isupatches.wisefy.callbacks.GetSavedNetworkCallbacks;
+import com.isupatches.wisefy.callbacks.GetSavedNetworksCallbacks;
+import com.isupatches.wisefy.callbacks.RemoveNetworkCallbacks;
+import com.isupatches.wisefy.callbacks.SearchForAccessPointCallbacks;
+import com.isupatches.wisefy.callbacks.SearchForAccessPointsCallbacks;
+import com.isupatches.wisefy.callbacks.SearchForSSIDCallbacks;
+import com.isupatches.wisefy.callbacks.SearchForSSIDsCallbacks;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import java.util.List;
+import static junit.framework.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+
+public class PublicApiVisibilityTests extends ActivityTestRule<TestActivity> {
+
+    @Rule
+    public ActivityTestRule<TestActivity> mActivityTestRule = new ActivityTestRule<>(TestActivity.class);
+
+    private WiseFy mWiseFy;
+
+    public PublicApiVisibilityTests() {
+        super(TestActivity.class);
+    }
+
+    @Before
+    public void setUp() {
+        mActivityTestRule.launchActivity(new Intent());
+
+        mWiseFy = mock(WiseFy.class);
+    }
+
+    @Test
+    public void addOpenNetwork_apis() {
+        mWiseFy.addOpenNetwork("TEST");
+        verify(mWiseFy).addOpenNetwork(anyString());
+        mWiseFy.addOpenNetwork("TEST", new AddOpenNetworkCallbacks() {
+            @Override
+            public void addOpenNetworkWiseFyFailure(Integer wisefyReturnCode) {
+
+            }
+
+            @Override
+            public void failureAddingOpenNetwork(Integer wifiManagerReturnCode) {
+
+            }
+
+            @Override
+            public void openNetworkAdded(WifiConfiguration wifiConfiguration) {
+
+            }
+        });
+        verify(mWiseFy).addOpenNetwork(anyString(), any(AddOpenNetworkCallbacks.class));
+    }
+
+    @Test
+    public void addWEPNetwork_apis() {
+        mWiseFy.addWEPNetwork("WEP Network", "123456");
+        verify(mWiseFy).addWEPNetwork(anyString(), anyString());
+        mWiseFy.addWEPNetwork("WEP Network", "123456", new AddWEPNetworkCallbacks() {
+            @Override
+            public void addWEPNetworkWiseFyFailure(Integer wisefyReturnCode) {
+
+            }
+
+            @Override
+            public void failureAddingWEPNetwork(Integer wifiManagerReturnCode) {
+
+            }
+
+            @Override
+            public void wepNetworkAdded(WifiConfiguration wifiConfiguration) {
+
+            }
+        });
+        verify(mWiseFy).addWEPNetwork(anyString(), anyString(), any(AddWEPNetworkCallbacks.class));
+    }
+
+    @Test
+    public void addWPA2Network_apis() {
+        mWiseFy.addWPA2Network("WPA2 Network", "12345678");
+        verify(mWiseFy).addWPA2Network(anyString(), anyString());
+        mWiseFy.addWPA2Network("WPA2 Network", "12345678", new AddWPA2NetworkCallbacks() {
+            @Override
+            public void addWPA2NetworkWiseFyFailure(Integer wisefyReturnCode) {
+
+            }
+
+            @Override
+            public void failureAddingWPA2Network(Integer wifiManagerReturnCode) {
+
+            }
+
+            @Override
+            public void wpa2NetworkAdded(WifiConfiguration wifiConfiguration) {
+
+            }
+        });
+        verify(mWiseFy).addWPA2Network(anyString(), anyString(), any(AddWPA2NetworkCallbacks.class));
+    }
+
+    @Test
+    public void compareSignalLevel_api() {
+        mWiseFy.compareSignalLevel(-50, -65);
+        verify(mWiseFy).compareSignalLevel(anyInt(), anyInt());
+    }
+
+    @Test
+    public void calculateBars_api() {
+        mWiseFy.calculateBars(-50, 5);
+        verify(mWiseFy).calculateBars(anyInt(), anyInt());
+    }
+
+    @Test
+    public void connectToNetwork_apis() {
+        mWiseFy.connectToNetwork("SSID to connect to", 3000);
+        verify(mWiseFy).connectToNetwork(anyString(), anyInt());
+        mWiseFy.connectToNetwork("SSID to connect", 3000, new ConnectToNetworkCallbacks() {
+            @Override
+            public void connectedToNetwork() {
+
+            }
+
+            @Override
+            public void connectToNetworkWiseFyFailure(Integer wisefyReturnCode) {
+
+            }
+
+            @Override
+            public void failureConnectingToNetwork() {
+
+            }
+
+            @Override
+            public void networkNotFoundToConnectTo() {
+
+            }
+        });
+        verify(mWiseFy).connectToNetwork(anyString(), anyInt(), any(ConnectToNetworkCallbacks.class));
+    }
+
+    @Test
+    public void disableWifi_apis() {
+        mWiseFy.disableWifi();
+        verify(mWiseFy).disableWifi();
+        mWiseFy.disableWifi(new DisableWifiCallbacks() {
+            @Override
+            public void disableWifiWiseFyFailure(Integer wisefyReturnCode) {
+
+            }
+
+            @Override
+            public void failureDisablingWifi() {
+
+            }
+
+            @Override
+            public void wifiDisabled() {
+
+            }
+        });
+        verify(mWiseFy).disableWifi(any(DisableWifiCallbacks.class));
+    }
+
+    @Test
+    public void disconnectFromCurrentNetwork_apis() {
+        mWiseFy.disconnectFromCurrentNetwork();
+        verify(mWiseFy).disconnectFromCurrentNetwork();
+        mWiseFy.disconnectFromCurrentNetwork(new DisconnectFromCurrentNetworkCallbacks() {
+            @Override
+            public void disconnectedFromCurrentNetwork() {
+
+            }
+
+            @Override
+            public void disconnectFromCurrentNetworkWiseFyFailure(Integer wisefyReturnCode) {
+
+            }
+
+            @Override
+            public void failureDisconnectingFromCurrentNetwork() {
+
+            }
+        });
+        verify(mWiseFy).disconnectFromCurrentNetwork(any(DisconnectFromCurrentNetworkCallbacks.class));
+    }
+
+    @Test
+    public void enableWifi_apis() {
+        mWiseFy.enableWifi();
+        verify(mWiseFy).enableWifi();
+        mWiseFy.enableWifi(new EnableWifiCallbacks() {
+            @Override
+            public void enableWifiWiseFyFailure(Integer wisefyReturnCode) {
+
+            }
+
+            @Override
+            public void failureEnablingWifi() {
+
+            }
+
+            @Override
+            public void wifiEnabled() {
+
+            }
+        });
+        verify(mWiseFy).enableWifi(any(EnableWifiCallbacks.class));
+    }
+
+    @Test
+    public void getCurrentNetwork_apis() {
+        mWiseFy.getCurrentNetwork();
+        verify(mWiseFy).getCurrentNetwork();
+        mWiseFy.getCurrentNetwork(new GetCurrentNetworkCallbacks() {
+            @Override
+            public void getCurrentNetworkWiseFyFailure(Integer wisefyReturnCode) {
+
+            }
+
+            @Override
+            public void retrievedCurrentNetwork(WifiInfo currentNetwork) {
+
+            }
+        });
+        verify(mWiseFy).getCurrentNetwork(any(GetCurrentNetworkCallbacks.class));
+    }
+
+    @Test
+    public void getFrequency_apis() {
+        mWiseFy.getFrequency();
+        verify(mWiseFy).getFrequency();
+        mWiseFy.getFrequency(new GetFrequencyCallbacks() {
+            @Override
+            public void failureGettingFrequency() {
+
+            }
+
+            @Override
+            public void getFrequencyWiseFyFailure(Integer wisefyReturnCode) {
+
+            }
+
+            @Override
+            public void retrievedFrequency(int frequency) {
+
+            }
+        });
+        verify(mWiseFy).getFrequency(any(GetFrequencyCallbacks.class));
+
+        mWiseFy.getFrequency(mock(WifiInfo.class));
+        verify(mWiseFy).getFrequency(any(WifiInfo.class));
+        mWiseFy.getFrequency(mock(WifiInfo.class), new GetFrequencyCallbacks() {
+            @Override
+            public void failureGettingFrequency() {
+
+            }
+
+            @Override
+            public void getFrequencyWiseFyFailure(Integer wisefyReturnCode) {
+
+            }
+
+            @Override
+            public void retrievedFrequency(int frequency) {
+
+            }
+        });
+        verify(mWiseFy).getFrequency(any(WifiInfo.class), any(GetFrequencyCallbacks.class));
+    }
+
+    @Test
+    public void getNearbyAccessPoints_apis() {
+        mWiseFy.getNearbyAccessPoints(true);
+        verify(mWiseFy).getNearbyAccessPoints(anyBoolean());
+        mWiseFy.getNearbyAccessPoints(true, new GetNearbyAccessPointsCallbacks() {
+            @Override
+            public void getNearbyAccessPointsWiseFyFailure(Integer wisefyReturnCode) {
+
+            }
+
+            @Override
+            public void retrievedNearbyAccessPoints(List<ScanResult> nearbyAccessPoints) {
+
+            }
+        });
+        verify(mWiseFy).getNearbyAccessPoints(anyBoolean(), any(GetNearbyAccessPointsCallbacks.class));
+    }
+
+    @Test
+    public void getRSSI_apis() {
+        mWiseFy.getRSSI("SSID", true, 1000);
+        verify(mWiseFy).getRSSI(anyString(), anyBoolean(), anyInt());
+        mWiseFy.getRSSI("SSID", true, 1000, new GetRSSICallbacks() {
+            @Override
+            public void retrievedRSSI(Integer rssi) {
+
+            }
+
+            @Override
+            public void networkNotFoundToRetrieveRSSI() {
+
+            }
+
+            @Override
+            public void getRSSIWiseFyFailure(Integer wisefyReturnCode) {
+
+            }
+        });
+        verify(mWiseFy).getRSSI(anyString(), anyBoolean(), anyInt(), any(GetRSSICallbacks.class));
+    }
+
+    @Test
+    public void getSavedNetwork_apis() {
+        mWiseFy.getSavedNetwork("SSID");
+        verify(mWiseFy).getSavedNetwork(anyString());
+        mWiseFy.getSavedNetwork("SSID", new GetSavedNetworkCallbacks() {
+            @Override
+            public void getSavedNetworkWiseFyFailure(Integer wisefyReturnCode) {
+
+            }
+
+            @Override
+            public void savedNetworkNotFound() {
+
+            }
+
+            @Override
+            public void retrievedSavedNetwork(WifiConfiguration savedNetwork) {
+
+            }
+        });
+        verify(mWiseFy).getSavedNetwork(anyString(), any(GetSavedNetworkCallbacks.class));
+    }
+
+    @Test
+    public void getSavedNetworks_apis() {
+        mWiseFy.getSavedNetworks();
+        verify(mWiseFy).getSavedNetworks();
+        mWiseFy.getSavedNetworks(new GetSavedNetworksCallbacks() {
+            @Override
+            public void getSavedNetworksWiseFyFailure(Integer wisefyReturnCode) {
+
+            }
+
+            @Override
+            public void noSavedNetworksFound() {
+
+            }
+
+            @Override
+            public void retrievedSavedNetworks(List<WifiConfiguration> savedNetworks) {
+
+            }
+        });
+        verify(mWiseFy).getSavedNetworks(any(GetSavedNetworksCallbacks.class));
+
+        mWiseFy.getSavedNetworks("SSID");
+        verify(mWiseFy).getSavedNetworks(anyString());
+        mWiseFy.getSavedNetworks("SSID", new GetSavedNetworksCallbacks() {
+            @Override
+            public void getSavedNetworksWiseFyFailure(Integer wisefyReturnCode) {
+
+            }
+
+            @Override
+            public void noSavedNetworksFound() {
+
+            }
+
+            @Override
+            public void retrievedSavedNetworks(List<WifiConfiguration> savedNetworks) {
+
+            }
+        });
+        verify(mWiseFy).getSavedNetworks(anyString(), any(GetSavedNetworksCallbacks.class));
+    }
+
+    @Test
+    public void isDeviceConnectedToMobileNetwork_apis() {
+        mWiseFy.isDeviceConnectedToMobileNetwork();
+        verify(mWiseFy).isDeviceConnectedToMobileNetwork();
+    }
+
+    @Test
+    public void isDeviceConnectedToMobileOrWifiNetwork_apis() {
+        mWiseFy.isDeviceConnectedToMobileOrWifiNetwork();
+        verify(mWiseFy).isDeviceConnectedToMobileOrWifiNetwork();
+    }
+
+    @Test
+    public void isDeviceConnectedToSSID_apis() {
+        mWiseFy.isDeviceConnectedToSSID("SSID");
+        verify(mWiseFy).isDeviceConnectedToSSID(anyString());
+    }
+
+    @Test
+    public void isDeviceConnectedToWifiNetwork_apis() {
+        mWiseFy.isDeviceConnectedToWifiNetwork();
+        verify(mWiseFy).isDeviceConnectedToWifiNetwork();
+    }
+
+    @Test
+    public void isNetwork5gHz_apis() {
+        mWiseFy.isNetwork5gHz();
+        verify(mWiseFy).isNetwork5gHz();
+
+        mWiseFy.isNetwork5gHz(mock(WifiInfo.class));
+        verify(mWiseFy).isNetwork5gHz(any(WifiInfo.class));
+    }
+
+    @Test
+    public void isNetworkInConfigurationList_api() {
+        mWiseFy.isNetworkInConfigurationList("SSID");
+        verify(mWiseFy).isNetworkInConfigurationList(anyString());
+    }
+
+    @Test
+    public void isNetworkEAP_api() {
+        mWiseFy.isNetworkEAP(mock(ScanResult.class));
+        verify(mWiseFy).isNetworkEAP(any(ScanResult.class));
+    }
+
+    @Test
+    public void isNetworkPSK_api() {
+        mWiseFy.isNetworkPSK(mock(ScanResult.class));
+        verify(mWiseFy).isNetworkPSK(any(ScanResult.class));
+    }
+
+    @Test
+    public void iisNetworkSecure_api() {
+        mWiseFy.isNetworkSecure(mock(ScanResult.class));
+        verify(mWiseFy).isNetworkSecure(any(ScanResult.class));
+    }
+
+    @Test
+    public void isNetworkWEP_api() {
+        mWiseFy.isNetworkWEP(mock(ScanResult.class));
+        verify(mWiseFy).isNetworkWEP(any(ScanResult.class));
+    }
+
+    @Test
+    public void isNetworkWPA_api() {
+        mWiseFy.isNetworkWPA(mock(ScanResult.class));
+        verify(mWiseFy).isNetworkWPA(any(ScanResult.class));
+    }
+
+    @Test
+    public void isNetworkWPA2_api() {
+        mWiseFy.isNetworkWPA2(mock(ScanResult.class));
+        verify(mWiseFy).isNetworkWPA2(any(ScanResult.class));
+    }
+
+    @Test
+    public void isWifiEnabled_api() {
+        mWiseFy.isWifiEnabled();
+        verify(mWiseFy).isWifiEnabled();
+    }
+
+    @Test
+    public void removeNetwork_api() {
+        mWiseFy.removeNetwork("SSID");
+        verify(mWiseFy).removeNetwork(anyString());
+
+        mWiseFy.removeNetwork("SSID", new RemoveNetworkCallbacks() {
+            @Override
+            public void failureRemovingNetwork() {
+
+            }
+
+            @Override
+            public void networkNotFoundToRemove() {
+
+            }
+
+            @Override
+            public void networkRemoved() {
+
+            }
+
+            @Override
+            public void removeNetworkWiseFyFailure(Integer wisefyReturnCode) {
+
+            }
+        });
+        verify(mWiseFy).removeNetwork(anyString(), any(RemoveNetworkCallbacks.class));
+    }
+
+
+    @Test
+    public void searchForAccessPoint_api() {
+        mWiseFy.searchForAccessPoint("SSID", 1000, true);
+        verify(mWiseFy).searchForAccessPoint(anyString(), anyInt(), anyBoolean());
+
+        mWiseFy.searchForAccessPoint("SSID", 1000, true, new SearchForAccessPointCallbacks() {
+            @Override
+            public void searchForAccessPointWiseFyFailure(Integer wisefyReturnCode) {
+
+            }
+
+            @Override
+            public void accessPointFound(ScanResult network) {
+
+            }
+
+            @Override
+            public void accessPointNotFound() {
+
+            }
+        });
+        verify(mWiseFy).searchForAccessPoint(anyString(), anyInt(), anyBoolean(), any(SearchForAccessPointCallbacks.class));
+    }
+
+    @Test
+    public void searchForAccessPoints_api() {
+        mWiseFy.searchForAccessPoints("SSID", true);
+        verify(mWiseFy).searchForAccessPoints(anyString(), anyBoolean());
+
+        mWiseFy.searchForAccessPoints("SSID", true, new SearchForAccessPointsCallbacks() {
+            @Override
+            public void searchForAccessPointsWiseFyFailure(Integer wisefyReturnCode) {
+
+            }
+
+            @Override
+            public void foundNetworks(List<ScanResult> networks) {
+
+            }
+
+            @Override
+            public void noNetworksFound() {
+
+            }
+        });
+        verify(mWiseFy).searchForAccessPoints(anyString(), anyBoolean(), any(SearchForAccessPointsCallbacks.class));
+    }
+
+    @Test
+    public void searchForSSID_api() {
+        mWiseFy.searchForSSID("SSID", 1000);
+        verify(mWiseFy).searchForSSID(anyString(), anyInt());
+
+        mWiseFy.searchForSSID("SSID", 1000, new SearchForSSIDCallbacks() {
+            @Override
+            public void searchForSSIDWiseFyFailure(Integer wisefyReturnCode) {
+
+            }
+
+            @Override
+            public void ssidFound(String ssid) {
+
+            }
+
+            @Override
+            public void ssidNotFound() {
+
+            }
+        });
+        verify(mWiseFy).searchForSSID(anyString(), anyInt(), any(SearchForSSIDCallbacks.class));
+    }
+
+    @Test
+    public void searchForSSIDs_api() {
+        mWiseFy.searchForSSIDs("SSID");
+        verify(mWiseFy).searchForSSIDs(anyString());
+
+        mWiseFy.searchForSSIDs("SSID", new SearchForSSIDsCallbacks() {
+            @Override
+            public void searchForSSIDsWiseFyFailure(Integer wisefyReturnCode) {
+
+            }
+
+            @Override
+            public void retrievedSSIDs(List<String> ssids) {
+
+            }
+
+            @Override
+            public void noSSIDsFound() {
+
+            }
+        });
+        verify(mWiseFy).searchForSSIDs(anyString(), any(SearchForSSIDsCallbacks.class));
+    }
+
+    @Test
+    public void wifiManagerFailure_value() {
+        assertEquals(WiseFy.WIFI_MANAGER_FAILURE, -1);
+    }
+}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/RemoveNetworkTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/test/RemoveNetworkTests.java
deleted file mode 100644
index 6e2fde89..00000000
--- a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/RemoveNetworkTests.java
+++ /dev/null
@@ -1,185 +0,0 @@
-package com.isupatches.wisefy.test;
-
-
-import android.net.wifi.WifiConfiguration;
-import com.isupatches.wisefy.callbacks.RemoveNetworkCallbacks;
-import com.isupatches.wisefy.constants.WiseFyCodes;
-import com.isupatches.wisefy.test.base.BaseTestClass;
-import com.isupatches.wisefy.test.base.TestActivity;
-import org.junit.Test;
-import java.util.ArrayList;
-import java.util.List;
-import static com.isupatches.wisefy.test.base.TestUtils.TEST_SSID;
-import static com.isupatches.wisefy.test.base.TestUtils.getTestWifiConfiguration;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.timeout;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-
-public class RemoveNetworkTests extends BaseTestClass<TestActivity> {
-
-    public RemoveNetworkTests() {
-        super(TestActivity.class);
-    }
-
-    @Test
-    public void noCallbacks_failure() {
-        setManagers();
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(getTestWifiConfiguration());
-        when(mMockWiFiManager.removeNetwork(anyInt())).thenReturn(false);
-
-        boolean result = mWiseFy.removeNetwork(TEST_SSID);
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void noCallbacks_failure_notInList() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-        when(mMockWiFiManager.removeNetwork(anyInt())).thenReturn(false);
-
-        boolean result = mWiseFy.removeNetwork(TEST_SSID);
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void noCallbacks_failure_nullSSIDParam() {
-        setManagersToNull();
-        boolean result = mWiseFy.removeNetwork(null);
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void noCallbacks_failure_nullWifiManager() {
-        setManagersToNull();
-        boolean result = mWiseFy.removeNetwork(TEST_SSID);
-        assertEquals(false, result);
-    }
-
-    @Test
-    public void noCallbacks_success() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
-        mWiFiConfiguration.SSID = TEST_SSID;
-        wifiList.add(mWiFiConfiguration);
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-        when(mMockWiFiManager.removeNetwork(anyInt())).thenReturn(true);
-
-        boolean result = mWiseFy.removeNetwork(TEST_SSID);
-        assertEquals(true, result);
-    }
-
-    @Test
-    public void callbacks_failure() {
-        setManagers();
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(getTestWifiConfiguration());
-        when(mMockWiFiManager.removeNetwork(anyInt())).thenReturn(false);
-
-        RemoveNetworkCallbacks removeNetworkCallbacks = mock(RemoveNetworkCallbacks.class);
-        mWiseFy.removeNetwork(TEST_SSID, removeNetworkCallbacks);
-        verify(removeNetworkCallbacks, timeout(2000)).failureRemovingNetwork();
-    }
-
-    @Test
-    public void callbacks_failure_nullCallback() {
-        setManagers();
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(getTestWifiConfiguration());
-        when(mMockWiFiManager.removeNetwork(anyInt())).thenReturn(false);
-
-        RemoveNetworkCallbacks removeNetworkCallbacks = mock(RemoveNetworkCallbacks.class);
-        mWiseFy.removeNetwork(TEST_SSID, null);
-        verify(removeNetworkCallbacks, never()).failureRemovingNetwork();
-    }
-
-    @Test
-    public void callbacks_failure_notInList() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-        when(mMockWiFiManager.removeNetwork(anyInt())).thenReturn(false);
-
-        RemoveNetworkCallbacks removeNetworkCallbacks = mock(RemoveNetworkCallbacks.class);
-        mWiseFy.removeNetwork(TEST_SSID, removeNetworkCallbacks);
-        verify(removeNetworkCallbacks, timeout(2000)).networkNotFoundToRemove();
-    }
-
-    @Test
-    public void callbacks_failure_notInList_nullCallback() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-        when(mMockWiFiManager.removeNetwork(anyInt())).thenReturn(false);
-
-        RemoveNetworkCallbacks removeNetworkCallbacks = mock(RemoveNetworkCallbacks.class);
-        mWiseFy.removeNetwork(TEST_SSID, null);
-        verify(removeNetworkCallbacks, never()).networkNotFoundToRemove();
-    }
-
-    @Test
-    public void callbacks_failure_nullSSIDParam() {
-        setManagers();
-        RemoveNetworkCallbacks removeNetworkCallbacks = mock(RemoveNetworkCallbacks.class);
-        mWiseFy.removeNetwork(null, removeNetworkCallbacks);
-        verify(removeNetworkCallbacks, timeout(2000)).removeNetworkWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
-    }
-
-    @Test
-    public void callbacks_failure_nullSSIDParam_nullCallback() {
-        setManagers();
-        RemoveNetworkCallbacks removeNetworkCallbacks = mock(RemoveNetworkCallbacks.class);
-        mWiseFy.removeNetwork(null, null);
-        verify(removeNetworkCallbacks, never()).removeNetworkWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
-    }
-
-    @Test
-    public void callbacks_failure_nullWifiManager() {
-        setManagersToNull();
-        RemoveNetworkCallbacks removeNetworkCallbacks = mock(RemoveNetworkCallbacks.class);
-        mWiseFy.removeNetwork(TEST_SSID, removeNetworkCallbacks);
-        verify(removeNetworkCallbacks, timeout(2000)).removeNetworkWiseFyFailure(WiseFyCodes.NULL_MANAGER);
-    }
-
-    @Test
-    public void callbacks_failure_nullWifiManager_nullCallback() {
-        setManagersToNull();
-        RemoveNetworkCallbacks removeNetworkCallbacks = mock(RemoveNetworkCallbacks.class);
-        mWiseFy.removeNetwork(TEST_SSID, null);
-        verify(removeNetworkCallbacks, never()).removeNetworkWiseFyFailure(WiseFyCodes.NULL_MANAGER);
-    }
-
-    @Test
-    public void callbacks_success() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
-        mWiFiConfiguration.SSID = TEST_SSID;
-        wifiList.add(mWiFiConfiguration);
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-        when(mMockWiFiManager.removeNetwork(anyInt())).thenReturn(true);
-
-        RemoveNetworkCallbacks removeNetworkCallbacks = mock(RemoveNetworkCallbacks.class);
-        mWiseFy.removeNetwork(TEST_SSID, removeNetworkCallbacks);
-        verify(removeNetworkCallbacks, timeout(2000)).networkRemoved();
-    }
-
-    @Test
-    public void callbacks_success_nullCallback() {
-        setManagers();
-        List<WifiConfiguration> wifiList = new ArrayList<>();
-        WifiConfiguration mWiFiConfiguration = new WifiConfiguration();
-        mWiFiConfiguration.SSID = TEST_SSID;
-        wifiList.add(mWiFiConfiguration);
-        when(mMockWiFiManager.getConfiguredNetworks()).thenReturn(wifiList);
-        when(mMockWiFiManager.removeNetwork(anyInt())).thenReturn(true);
-
-        RemoveNetworkCallbacks removeNetworkCallbacks = mock(RemoveNetworkCallbacks.class);
-        mWiseFy.removeNetwork(TEST_SSID, null);
-        verify(removeNetworkCallbacks, never()).networkRemoved();
-    }
-}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/SearchForSSIDTests.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/test/SearchForSSIDTests.java
deleted file mode 100644
index 995480f6..00000000
--- a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/SearchForSSIDTests.java
+++ /dev/null
@@ -1,253 +0,0 @@
-package com.isupatches.wisefy.test;
-
-
-import android.net.wifi.ScanResult;
-import com.isupatches.wisefy.callbacks.SearchForSSIDCallbacks;
-import com.isupatches.wisefy.constants.WiseFyCodes;
-import com.isupatches.wisefy.test.base.BaseTestClass;
-import com.isupatches.wisefy.test.base.TestActivity;
-import org.junit.Test;
-import java.util.ArrayList;
-import java.util.List;
-import static com.isupatches.wisefy.test.base.TestUtils.TEST_SSID;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.timeout;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-
-public class SearchForSSIDTests extends BaseTestClass<TestActivity> {
-
-    public SearchForSSIDTests() {
-        super(TestActivity.class);
-    }
-
-    @Test
-    public void noCallbacks_failure() {
-        setManagers();
-        assertEquals(null, mWiseFy.searchForSSID(TEST_SSID, 1));
-    }
-
-    @Test
-    public void noCallbacks_failure_nullSSID() {
-        setManagers();
-
-        List<ScanResult> scanResults = new ArrayList<>();
-        ScanResult scanResult = mock(ScanResult.class);
-        scanResult.SSID = null;
-        scanResults.add(scanResult);
-
-        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
-
-        assertEquals(null, mWiseFy.searchForSSID(TEST_SSID, 1));
-    }
-
-    @Test
-    public void noCallbacks_failure_nullSSIDParam() {
-        setManagers();
-
-        List<ScanResult> scanResults = new ArrayList<>();
-        ScanResult scanResult = mock(ScanResult.class);
-        scanResult.SSID = null;
-        scanResults.add(scanResult);
-
-        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
-
-        assertEquals(null, mWiseFy.searchForSSID(null, 1));
-    }
-
-    @Test
-    public void noCallbacks_failure_differentSSID() {
-        setManagers();
-
-        List<ScanResult> scanResults = new ArrayList<>();
-        ScanResult scanResult = mock(ScanResult.class);
-        scanResult.SSID = "Another SSID";
-        scanResults.add(scanResult);
-
-        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
-
-        assertEquals(null, mWiseFy.searchForSSID(TEST_SSID, 1));
-    }
-
-    @Test
-    public void noCallbacks_failure_nullWifiManager() {
-        setManagersToNull();
-        assertEquals(null, mWiseFy.searchForSSID(TEST_SSID, 1));
-    }
-
-    @Test
-    public void noCallbacks_success() {
-        setManagers();
-
-        List<ScanResult> scanResults = new ArrayList<>();
-        ScanResult scanResult = mock(ScanResult.class);
-        scanResult.SSID = TEST_SSID;
-        scanResults.add(scanResult);
-
-        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
-
-        assertEquals(TEST_SSID, mWiseFy.searchForSSID(TEST_SSID, 1));
-    }
-
-    @Test
-    public void callbacks_failure() {
-        setManagers();
-        SearchForSSIDCallbacks mockSearchForSSIDCallbacks = mock(SearchForSSIDCallbacks.class);
-        mWiseFy.searchForSSID(TEST_SSID, 1, mockSearchForSSIDCallbacks);
-        verify(mockSearchForSSIDCallbacks, timeout(2000)).ssidNotFound();
-    }
-
-    @Test
-    public void callbacks_failure_nullCallback() {
-        setManagers();
-        SearchForSSIDCallbacks mockSearchForSSIDCallbacks = mock(SearchForSSIDCallbacks.class);
-        mWiseFy.searchForSSID(TEST_SSID, 1, null);
-        verify(mockSearchForSSIDCallbacks, never()).ssidNotFound();
-    }
-
-    @Test
-    public void callbacks_failure_nullSSID() {
-        setManagers();
-
-        List<ScanResult> scanResults = new ArrayList<>();
-        ScanResult scanResult = mock(ScanResult.class);
-        scanResult.SSID = null;
-        scanResults.add(scanResult);
-
-        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
-
-        SearchForSSIDCallbacks mockSearchForSSIDCallbacks = mock(SearchForSSIDCallbacks.class);
-        mWiseFy.searchForSSID(TEST_SSID, 1, mockSearchForSSIDCallbacks);
-        verify(mockSearchForSSIDCallbacks, timeout(2000)).ssidNotFound();
-    }
-
-    @Test
-    public void callbacks_failure_nullSSID_nullCallback() {
-        setManagers();
-
-        List<ScanResult> scanResults = new ArrayList<>();
-        ScanResult scanResult = mock(ScanResult.class);
-        scanResult.SSID = null;
-        scanResults.add(scanResult);
-
-        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
-
-        SearchForSSIDCallbacks mockSearchForSSIDCallbacks = mock(SearchForSSIDCallbacks.class);
-        mWiseFy.searchForSSID(TEST_SSID, 1, null);
-        verify(mockSearchForSSIDCallbacks, never()).ssidNotFound();
-    }
-
-    @Test
-    public void callbacks_failure_nullSSIDParam() {
-        setManagers();
-
-        List<ScanResult> scanResults = new ArrayList<>();
-        ScanResult scanResult = mock(ScanResult.class);
-        scanResult.SSID = null;
-        scanResults.add(scanResult);
-
-        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
-
-        SearchForSSIDCallbacks mockSearchForSSIDCallbacks = mock(SearchForSSIDCallbacks.class);
-        mWiseFy.searchForSSID(null, 1, mockSearchForSSIDCallbacks);
-        verify(mockSearchForSSIDCallbacks, timeout(2000)).searchForSSIDWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
-    }
-
-    @Test
-    public void callbacks_failure_nullSSIDParam_nullCallback() {
-        setManagers();
-
-        List<ScanResult> scanResults = new ArrayList<>();
-        ScanResult scanResult = mock(ScanResult.class);
-        scanResult.SSID = null;
-        scanResults.add(scanResult);
-
-        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
-
-        SearchForSSIDCallbacks mockSearchForSSIDCallbacks = mock(SearchForSSIDCallbacks.class);
-        mWiseFy.searchForSSID(null, 1, null);
-        verify(mockSearchForSSIDCallbacks, never()).searchForSSIDWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
-    }
-
-    @Test
-    public void callbacks_failure_differentSSID() {
-        setManagers();
-
-        List<ScanResult> scanResults = new ArrayList<>();
-        ScanResult scanResult = mock(ScanResult.class);
-        scanResult.SSID = "Another SSID";
-        scanResults.add(scanResult);
-
-        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
-
-        SearchForSSIDCallbacks mockSearchForSSIDCallbacks = mock(SearchForSSIDCallbacks.class);
-        mWiseFy.searchForSSID(TEST_SSID, 1, mockSearchForSSIDCallbacks);
-        verify(mockSearchForSSIDCallbacks, timeout(2000)).ssidNotFound();
-    }
-
-    @Test
-    public void callbacks_failure_differentSSID_nullCallback() {
-        setManagers();
-
-        List<ScanResult> scanResults = new ArrayList<>();
-        ScanResult scanResult = mock(ScanResult.class);
-        scanResult.SSID = "Another SSID";
-        scanResults.add(scanResult);
-
-        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
-
-        SearchForSSIDCallbacks mockSearchForSSIDCallbacks = mock(SearchForSSIDCallbacks.class);
-        mWiseFy.searchForSSID(TEST_SSID, 1, null);
-        verify(mockSearchForSSIDCallbacks, never()).ssidNotFound();
-    }
-
-    @Test
-    public void callbacks_failure_nullWifiManager() {
-        setManagersToNull();
-        SearchForSSIDCallbacks mockSearchForSSIDCallbacks = mock(SearchForSSIDCallbacks.class);
-        mWiseFy.searchForSSID(TEST_SSID, 1, mockSearchForSSIDCallbacks);
-        verify(mockSearchForSSIDCallbacks, timeout(2000)).searchForSSIDWiseFyFailure(WiseFyCodes.NULL_MANAGER);
-    }
-
-    @Test
-    public void callbacks_failure_nullWifiManager_nullCallback() {
-        setManagersToNull();
-        SearchForSSIDCallbacks mockSearchForSSIDCallbacks = mock(SearchForSSIDCallbacks.class);
-        mWiseFy.searchForSSID(TEST_SSID, 1, null);
-        verify(mockSearchForSSIDCallbacks, never()).searchForSSIDWiseFyFailure(WiseFyCodes.NULL_MANAGER);
-    }
-
-    @Test
-    public void callbacks_success() {
-        setManagers();
-
-        List<ScanResult> scanResults = new ArrayList<>();
-        ScanResult scanResult = mock(ScanResult.class);
-        scanResult.SSID = TEST_SSID;
-        scanResults.add(scanResult);
-
-        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
-
-        SearchForSSIDCallbacks mockSearchForSSIDCallbacks = mock(SearchForSSIDCallbacks.class);
-        mWiseFy.searchForSSID(TEST_SSID, 1, mockSearchForSSIDCallbacks);
-        verify(mockSearchForSSIDCallbacks, timeout(2000)).ssidFound(TEST_SSID);
-    }
-
-    @Test
-    public void callbacks_success_nullCallback() {
-        setManagers();
-        List<ScanResult> scanResults = new ArrayList<>();
-        ScanResult scanResult = mock(ScanResult.class);
-        scanResult.SSID = TEST_SSID;
-        scanResults.add(scanResult);
-
-        when(mMockWiFiManager.getScanResults()).thenReturn(scanResults);
-
-        SearchForSSIDCallbacks mockSearchForSSIDCallbacks = mock(SearchForSSIDCallbacks.class);
-        mWiseFy.searchForSSID(TEST_SSID, 1, null);
-        verify(mockSearchForSSIDCallbacks, never()).ssidFound(TEST_SSID);
-    }
-}
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/base/BaseTestClass.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/test/base/BaseTestClass.java
deleted file mode 100644
index fa530fe8..00000000
--- a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/base/BaseTestClass.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.isupatches.wisefy.test.base;
-
-
-import android.app.Activity;
-import android.content.Intent;
-import android.net.ConnectivityManager;
-import android.net.wifi.WifiManager;
-import android.support.test.rule.ActivityTestRule;
-import com.isupatches.wisefy.WiseFy;
-import org.junit.Before;
-import org.junit.Rule;
-
-import static org.mockito.Mockito.mock;
-
-
-public abstract class BaseTestClass<T extends Activity> extends ActivityTestRule<T> {
-
-    @Rule
-    public ActivityTestRule<TestActivity> mActivityTestRule = new ActivityTestRule<>(TestActivity.class);
-
-    protected ConnectivityManager mMockConnectivityManager;
-
-    protected WifiManager mMockWiFiManager;
-
-    protected WiseFy mWiseFy;
-
-    public BaseTestClass(Class<T> activityClass) {
-        super(activityClass);
-    }
-
-    @Before
-    public void setUp() {
-        mMockWiFiManager = mock(WifiManager.class);
-        mMockConnectivityManager = mock(ConnectivityManager.class);
-
-        mMockWiFiManager = mock(WifiManager.class);
-        mMockConnectivityManager = mock(ConnectivityManager.class);
-
-        mActivityTestRule.launchActivity(new Intent());
-
-        mWiseFy = new WiseFy.withContext(mActivityTestRule.getActivity()).logging(true).getSmarts();
-    }
-
-    /**
-     * HELPERS
-     */
-
-    protected void setManagers() {
-        mWiseFy.mWifiManager = mMockWiFiManager;
-        mWiseFy.mConnectivityManager = mMockConnectivityManager;
-    }
-
-    protected void setManagersToNull() {
-        mWiseFy.mWifiManager = null;
-        mWiseFy.mConnectivityManager = null;
-    }
-
-    protected void setConnectivityManagerToNull() {
-        mWiseFy.mConnectivityManager = null;
-    }
-}
\ No newline at end of file
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/base/TestActivity.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/test/base/TestActivity.java
deleted file mode 100644
index 717249c2..00000000
--- a/wisefy/src/androidTest/java/com/isupatches/wisefy/test/base/TestActivity.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.isupatches.wisefy.test.base;
-
-
-import android.app.Activity;
-
-import com.isupatches.wisefy.callbacks.DisableWifiCallbacks;
-import com.isupatches.wisefy.callbacks.EnableWifiCallbacks;
-import com.isupatches.wisefy.callbacks.GetFrequencyCallbacks;
-import com.isupatches.wisefy.callbacks.GetSavedNetworksCallbacks;
-import com.isupatches.wisefy.callbacks.RemoveNetworkCallbacks;
-
-
-public class TestActivity extends Activity {
-//        implements
-//        GetFrequencyCallbacks,
-//        GetSavedNetworksCallbacks,
-//        AddNetworkCallbacks,
-//        RemoveNetworkCallbacks,
-//        EnableWifiCallbacks,
-//        DisableWifiCallbacks {
-}
diff --git a/wisefy/src/main/AndroidManifest.xml b/wisefy/src/main/AndroidManifest.xml
index 1c00e85c..a338e68b 100644
--- a/wisefy/src/main/AndroidManifest.xml
+++ b/wisefy/src/main/AndroidManifest.xml
@@ -8,9 +8,10 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
 
-    <application android:allowBackup="true">
+    <application
+        android:allowBackup="true">
 
-        <activity android:name=".test.base.TestActivity" android:exported="false"/>
+        <activity android:name=".base.TestActivity" android:exported="false"/>
 
     </application>
 
diff --git a/wisefy/src/main/java/com/isupatches/wisefy/WiseFy.java b/wisefy/src/main/java/com/isupatches/wisefy/WiseFy.java
index e04e929b..b3a8ba91 100644
--- a/wisefy/src/main/java/com/isupatches/wisefy/WiseFy.java
+++ b/wisefy/src/main/java/com/isupatches/wisefy/WiseFy.java
@@ -18,7 +18,6 @@
 
 import android.annotation.TargetApi;
 import android.content.Context;
-import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.wifi.ScanResult;
 import android.net.wifi.WifiConfiguration;
@@ -26,8 +25,6 @@
 import android.net.wifi.WifiManager;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Log;
 import com.isupatches.wisefy.annotations.CallingThread;
@@ -45,25 +42,32 @@
 import com.isupatches.wisefy.callbacks.GetCurrentNetworkCallbacks;
 import com.isupatches.wisefy.callbacks.GetFrequencyCallbacks;
 import com.isupatches.wisefy.callbacks.GetNearbyAccessPointsCallbacks;
+import com.isupatches.wisefy.callbacks.GetRSSICallbacks;
 import com.isupatches.wisefy.callbacks.GetSavedNetworkCallbacks;
 import com.isupatches.wisefy.callbacks.GetSavedNetworksCallbacks;
 import com.isupatches.wisefy.callbacks.RemoveNetworkCallbacks;
+import com.isupatches.wisefy.callbacks.SearchForAccessPointCallbacks;
+import com.isupatches.wisefy.callbacks.SearchForAccessPointsCallbacks;
 import com.isupatches.wisefy.callbacks.SearchForSSIDCallbacks;
+import com.isupatches.wisefy.callbacks.SearchForSSIDsCallbacks;
 import com.isupatches.wisefy.constants.Capabilities;
 import com.isupatches.wisefy.constants.NetworkTypes;
 import com.isupatches.wisefy.constants.WiseFyCodes;
 import com.isupatches.wisefy.threads.WiseFyHandlerThread;
-import com.isupatches.wisefy.util.ManagerUtil;
 import com.isupatches.wisefy.util.LogUtil;
+import com.isupatches.wisefy.util.ManagerUtil;
 import com.isupatches.wisefy.util.WifiConfigurationUtil;
-import java.util.ArrayList;
 import java.util.List;
 
 
 /**
- * Main class to manipulate and query network settings on an Android device
+ * Main class for WiseFy that provides a synchronous and asynchronous API to manipulate and query
+ * for different parts of a device's wifi configuration and status.
  *
- * Uses the builder pattern for creation - {@link withContext}
+ * @author Patches
+ * @version 2.0
+ *
+ * Uses the builder pattern for creation - {@link brains}
  */
 public class WiseFy {
 
@@ -77,21 +81,27 @@ public class WiseFy {
 
     private WiseFyHandlerThread mWiseFyHandlerThread;
 
-    public ConnectivityManager mConnectivityManager;
+    private Handler mWiseFyHandler;
+
+    WiseFyConnection mWiseFyConnection;
 
-    public WifiManager mWifiManager;
+    WiseFyConfiguration mWiseFyConfiguration;
 
-    private boolean mLoggingEnabled;
+    WiseFyPrerequisites mWiseFyPrerequisites;
 
-    private Handler mWiseFyHandler;
+    WiseFySearch mWiseFySearch;
 
     /**
      * Private constructor that accepts builder input
      */
-    private WiseFy(withContext withContext) {
-        this.mLoggingEnabled = withContext.loggingEnabled;
-        this.mConnectivityManager = ManagerUtil.getInstance().getConnectivityManager(withContext.context);
-        this.mWifiManager = ManagerUtil.getInstance().getWiFiManager(withContext.context);
+    private WiseFy(brains brains) {
+        this.mWiseFyConfiguration = WiseFyConfiguration.getInstance();
+        this.mWiseFyConnection = WiseFyConnection.getInstance();
+        this.mWiseFyPrerequisites = WiseFyPrerequisites.getInstance();
+        this.mWiseFySearch = WiseFySearch.getInstance();
+        mWiseFyConfiguration.setLoggingEnabled(brains.loggingEnabled);
+        mWiseFyPrerequisites.setConnectivityManager(ManagerUtil.getInstance().getConnectivityManager(brains.context));
+        mWiseFyPrerequisites.setWifiManager(ManagerUtil.getInstance().getWiFiManager(brains.context));
     }
 
     /**
@@ -99,7 +109,7 @@ private WiseFy(withContext withContext) {
      *
      * Implements builder interfaces #{@link Logging} #{@link GetSmarts}
      */
-    public static class withContext implements Logging, GetSmarts {
+    public static class brains implements Logging, GetSmarts {
 
         private Context context;
 
@@ -108,18 +118,19 @@ public static class withContext implements Logging, GetSmarts {
         /**
          * Mandatory - The public constructor for the builder that requires a context
          *
-         * @param context - The activity or application context to get a WifiConfiguration and
+         * @param context The activity or application context to get a WifiConfiguration and
          * ConnectivityManager instance
          */
-        public withContext(Context context) {
+        public brains(Context context) {
             this.context = context;
         }
 
         /**
          * Mandatory - To build and return a WiseFy instance
          *
-         * Must be called after withContext
-         * {@link withContext}
+         * *NOTE* Must be called after brains
+         *
+         * @see brains
          *
          * @return WiseFy - The instance created by the builder
          */
@@ -131,13 +142,14 @@ public WiseFy getSmarts() {
         /**
          * Optional - Builder method that enables/disables logging for a WiseWy instance
          *
-         * @param loggingEnabled - If logging is enabled or disabled for an instance
-         * {@link Logging}
+         * @param loggingEnabled If logging is enabled or disabled for an instance
+         *
+         * @see Logging
          *
-         * @return withContext - The builder with updated logging setting
+         * @return brains - The builder with updated logging setting
          */
         @Override
-        public withContext logging(boolean loggingEnabled) {
+        public brains logging(boolean loggingEnabled) {
             this.loggingEnabled = loggingEnabled;
             return this;
         }
@@ -147,7 +159,7 @@ public withContext logging(boolean loggingEnabled) {
      * An interface that enables/disables logging for a WiseFy instance
      */
     interface Logging {
-        withContext logging(boolean loggingEnabled);
+        brains logging(boolean loggingEnabled);
     }
 
     /**
@@ -158,311 +170,289 @@ interface GetSmarts {
     }
 
     /**
-     * To add an open network to the user's configured network list
+     * To add an open network to the user's configured network list (synchronously)
      *
-     * @param ssid - The ssid of the open network you want to add
+     * @param ssid The ssid of the open network you want to add
      *
-     * Uses
-     *   {@link #addNetwork(WifiConfiguration)}
-     *   {@link #checkIfNetworkInConfigurationList(String)}
-     *   {@link WifiConfigurationUtil#generateOpenNetworkConfiguration(String)}
-     *   {@link WiseFyCodes
+     * @see #addNetworkConfiguration(WifiConfiguration)
+     * @see WifiConfigurationUtil#generateOpenNetworkConfiguration(String)
+     * @see WiseFyCodes
+     * @see WiseFyConfiguration#isLoggingEnabled()
+     * @see WiseFyPrerequisites#hasPrerequisites()
+     * @see WiseFySearch#isNetworkASavedConfiguration(String)
      *
      * @return int - The return code from WifiManager for network creation (-1 for failure)
      */
     @Sync
     @CallingThread
-    public int addOpenNetwork(@Nullable String ssid) {
+    public int addOpenNetwork(String ssid) {
         if (TextUtils.isEmpty(ssid)) {
-            if (LogUtil.isLoggable(TAG, Log.ERROR, mLoggingEnabled)) {
-                Log.e(TAG, "Breaking due to empty SSID");
-            }
             return WiseFyCodes.MISSING_PARAMETER;
         }
-        if (mWifiManager != null) {
-            if (!checkIfNetworkInConfigurationList(ssid)) {
-                if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                    Log.d(TAG, String.format("Adding open network with SSID %s", ssid));
-                }
 
-                WifiConfiguration wifiConfiguration = WifiConfigurationUtil.getInstance().generateOpenNetworkConfiguration(ssid);
-                return addNetwork(wifiConfiguration);
-            } else {
-                return WiseFyCodes.NETWORK_ALREADY_CONFIGURED;
-            }
-        } else {
-            if (LogUtil.isLoggable(TAG, Log.ERROR, mLoggingEnabled)) {
-                Log.e(TAG, "No WifiManager to add open network");
-            }
-            return WiseFyCodes.NULL_MANAGER;
+        if (!mWiseFyPrerequisites.hasPrerequisites()) {
+            return WiseFyCodes.MISSING_PREREQUISITE;
+        }
+
+        if (mWiseFySearch.isNetworkASavedConfiguration(ssid)) {
+            return WiseFyCodes.NETWORK_ALREADY_CONFIGURED;
+        }
+
+        if (LogUtil.isLoggable(TAG, Log.DEBUG, mWiseFyConfiguration.isLoggingEnabled())) {
+            Log.d(TAG, String.format("Adding open network with SSID %s", ssid));
         }
+        WifiConfiguration wifiConfiguration = WifiConfigurationUtil.getInstance().generateOpenNetworkConfiguration(ssid);
+        return addNetworkConfiguration(wifiConfiguration);
     }
 
     /**
-     * To add an open network to the user's configured network list
-     *
-     * @param ssid - The ssid of the open network you want to add
-     * @param addOpenNetworkCallbacks -
-     *
-     * Uses
-     *   {@link #addNetwork(WifiConfiguration)}
-     *   {@link #checkIfNetworkInConfigurationList(String)}
-     *   {@link WifiConfigurationUtil#generateOpenNetworkConfiguration(String)}
-     *   {@link WiseFyCodes
+     * To add an open network to the user's configured network list (asynchronously)
+     *
+     * @param ssid The ssid of the open network you want to add
+     * @param callbacks The listener to return results to
+     *
+     * @see #addNetworkConfiguration(WifiConfiguration)
+     * @see #execute(Runnable)
+     * @see AddOpenNetworkCallbacks
+     * @see WifiConfigurationUtil#generateOpenNetworkConfiguration(String)
+     * @see WiseFyCodes
+     * @see WiseFyConfiguration#isLoggingEnabled()
+     * @see WiseFyPrerequisites#hasPrerequisites()
+     * @see WiseFySearch#isNetworkASavedConfiguration(String)
      */
     @Async
     @WiseFyThread
-    public void addOpenNetwork(@Nullable final String ssid, @Nullable final AddOpenNetworkCallbacks addOpenNetworkCallbacks) {
+    public void addOpenNetwork(final String ssid, final AddOpenNetworkCallbacks callbacks) {
         Runnable runnable = new Runnable() {
             @Override
             public void run() {
                 if (TextUtils.isEmpty(ssid)) {
-                    if (LogUtil.isLoggable(TAG, Log.ERROR, mLoggingEnabled)) {
-                        Log.e(TAG, "Breaking due to empty SSID");
-                    }
-                    if (addOpenNetworkCallbacks != null) {
-                        addOpenNetworkCallbacks.addOpenNetworkWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
+                    if (callbacks != null) {
+                        callbacks.addOpenNetworkWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
                     }
                     return;
                 }
-                if (mWifiManager != null) {
-                    if (!checkIfNetworkInConfigurationList(ssid)) {
-                        if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                            Log.d(TAG, String.format("Adding open network with SSID %s", ssid));
-                        }
-
-                        WifiConfiguration wifiConfiguration = WifiConfigurationUtil.getInstance().generateOpenNetworkConfiguration(ssid);
-                        if (addOpenNetworkCallbacks != null) {
-                            int result = addNetwork(wifiConfiguration);
-                            if (result != WIFI_MANAGER_FAILURE) {
-                                addOpenNetworkCallbacks.openNetworkAdded(wifiConfiguration);
-                            } else {
-                                addOpenNetworkCallbacks.failureAddingOpenNetwork(result);
-                            }
-                        }
-                    } else {
-                        if (addOpenNetworkCallbacks != null) {
-                            addOpenNetworkCallbacks.addOpenNetworkWiseFyFailure(WiseFyCodes.NETWORK_ALREADY_CONFIGURED);
-                        }
 
+                if (!mWiseFyPrerequisites.hasPrerequisites()) {
+                    if (callbacks != null) {
+                        callbacks.addOpenNetworkWiseFyFailure(WiseFyCodes.MISSING_PREREQUISITE);
                     }
-                } else {
-                    if (LogUtil.isLoggable(TAG, Log.ERROR, mLoggingEnabled)) {
-                        Log.e(TAG, "No WifiManager to add open network");
+                    return;
+                }
+
+                if (mWiseFySearch.isNetworkASavedConfiguration(ssid)) {
+                    if (callbacks != null) {
+                        callbacks.addOpenNetworkWiseFyFailure(WiseFyCodes.NETWORK_ALREADY_CONFIGURED);
                     }
-                    if (addOpenNetworkCallbacks != null) {
-                        addOpenNetworkCallbacks.addOpenNetworkWiseFyFailure(WiseFyCodes.NULL_MANAGER);
+                    return;
+                }
+
+                if (LogUtil.isLoggable(TAG, Log.DEBUG, mWiseFyConfiguration.isLoggingEnabled())) {
+                    Log.d(TAG, String.format("Adding open network with SSID %s", ssid));
+                }
+                WifiConfiguration wifiConfiguration = WifiConfigurationUtil.getInstance().generateOpenNetworkConfiguration(ssid);
+                if (callbacks != null) {
+                    int result = addNetworkConfiguration(wifiConfiguration);
+                    if (result != WIFI_MANAGER_FAILURE) {
+                        callbacks.openNetworkAdded(wifiConfiguration);
+                    } else {
+                        callbacks.failureAddingOpenNetwork(result);
                     }
                 }
-                mWiseFyHandlerThread.quitSafely();
             }
         };
         execute(runnable);
     }
 
     /**
-     * To add a WEP network to the user's configured network list
+     * To add a WEP network to the user's configured network list (synchronously)
      *
-     * @param ssid - The ssid of the WEP network you want to add
-     * @param password - The password for the WEP network being added
+     * @param ssid The ssid of the WEP network you want to add
+     * @param password The password for the WEP network being added
      *
-     * Uses
-     *   {@link #addNetwork(WifiConfiguration)}
-     *   {@link #checkIfNetworkInConfigurationList(String)}
-     *   {@link WifiConfigurationUtil#generateWEPNetworkConfiguration(String, String)}
-     *   {@link WiseFyCodes
+     * @see #addNetworkConfiguration(WifiConfiguration)
+     * @see WifiConfigurationUtil#generateWEPNetworkConfiguration(String, String)
+     * @see WiseFyCodes
+     * @see WiseFyConfiguration#isLoggingEnabled()
+     * @see WiseFyPrerequisites#hasPrerequisites()
+     * @see WiseFySearch#isNetworkASavedConfiguration(String)
      *
      * @return int - The return code from WifiManager for network creation (-1 for failure)
      */
     @Sync
     @CallingThread
-    public int addWEPNetwork(@Nullable String ssid, @Nullable String password) {
+    public int addWEPNetwork(String ssid, String password) {
         if (TextUtils.isEmpty(ssid) || TextUtils.isEmpty(password)) {
-            if (LogUtil.isLoggable(TAG, Log.WARN, mLoggingEnabled)) {
-                Log.w(TAG, String.format("Breaking due to missing ssid or password. ssid: %s, password: %s", ssid, password));
-            }
             return WiseFyCodes.MISSING_PARAMETER;
         }
-        if (mWifiManager != null) {
-            if (!checkIfNetworkInConfigurationList(ssid)) {
-                if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                    Log.d(TAG, String.format("Adding WEP network with SSID %s", ssid));
-                }
 
-                WifiConfiguration wifiConfiguration = WifiConfigurationUtil.getInstance().generateWEPNetworkConfiguration(ssid, password);
-                return addNetwork(wifiConfiguration);
-            } else {
-                return WiseFyCodes.NETWORK_ALREADY_CONFIGURED;
-            }
-        } else {
-            if (LogUtil.isLoggable(TAG, Log.ERROR, mLoggingEnabled)) {
-                Log.e(TAG, "No WifiManager to add WEP network");
-            }
-            return WiseFyCodes.NULL_MANAGER;
+        if (!mWiseFyPrerequisites.hasPrerequisites()) {
+            return WiseFyCodes.MISSING_PREREQUISITE;
+        }
+
+        if (mWiseFySearch.isNetworkASavedConfiguration(ssid)) {
+            return WiseFyCodes.NETWORK_ALREADY_CONFIGURED;
+        }
+
+        if (LogUtil.isLoggable(TAG, Log.DEBUG, mWiseFyConfiguration.isLoggingEnabled())) {
+            Log.d(TAG, String.format("Adding WEP network with SSID %s", ssid));
         }
+        WifiConfiguration wifiConfiguration = WifiConfigurationUtil.getInstance().generateWEPNetworkConfiguration(ssid, password);
+        return addNetworkConfiguration(wifiConfiguration);
     }
 
     /**
-     * To add a WEP network to the user's configured network list
-     *
-     * @param ssid - The ssid of the WEP network you want to add
-     * @param password - The password for the WEP network being added
-     * @param addWEPNetworkCallbacks -
-     *
-     * Uses
-     *   {@link #addNetwork(WifiConfiguration)}
-     *   {@link #checkIfNetworkInConfigurationList(String)}
-     *   {@link WifiConfigurationUtil#generateWEPNetworkConfiguration(String, String)}
-     *   {@link WiseFyCodes
+     * To add a WEP network to the user's configured network list (asynchronously)
+     *
+     * @param ssid The ssid of the WEP network you want to add
+     * @param password The password for the WEP network being added
+     * @param callbacks The listener to return results to
+     *
+     * @see #addNetworkConfiguration(WifiConfiguration)
+     * @see #execute(Runnable)
+     * @see AddWEPNetworkCallbacks
+     * @see WifiConfigurationUtil#generateWEPNetworkConfiguration(String, String)
+     * @see WiseFyCodes
+     * @see WiseFyConfiguration#isLoggingEnabled()
+     * @see WiseFyPrerequisites#hasPrerequisites()
+     * @see WiseFySearch#isNetworkASavedConfiguration(String)
      */
     @Async
     @WiseFyThread
-    public void addWEPNetwork(@Nullable final String ssid, @Nullable final String password, @Nullable final AddWEPNetworkCallbacks addWEPNetworkCallbacks) {
+    public void addWEPNetwork(final String ssid, final String password, final AddWEPNetworkCallbacks callbacks) {
         Runnable runnable = new Runnable() {
             @Override
             public void run() {
                 if (TextUtils.isEmpty(ssid) || TextUtils.isEmpty(password)) {
-                    if (LogUtil.isLoggable(TAG, Log.WARN, mLoggingEnabled)) {
-                        Log.w(TAG, String.format("Breaking due to missing ssid or password. ssid: %s, password: %s", ssid, password));
-                    }
-                    if (addWEPNetworkCallbacks != null) {
-                        addWEPNetworkCallbacks.addWEPNetworkWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
+                    if (callbacks != null) {
+                        callbacks.addWEPNetworkWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
                     }
                     return;
                 }
-                if (mWifiManager != null) {
-                    if (!checkIfNetworkInConfigurationList(ssid)) {
-                        if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                            Log.d(TAG, String.format("Adding WEP network with SSID %s", ssid));
-                        }
 
-                        WifiConfiguration wifiConfiguration = WifiConfigurationUtil.getInstance().generateWEPNetworkConfiguration(ssid, password);
-                        if (addWEPNetworkCallbacks != null) {
-                            int result = addNetwork(wifiConfiguration);
-                            if (result != WIFI_MANAGER_FAILURE) {
-                                addWEPNetworkCallbacks.wepNetworkAdded(wifiConfiguration);
-                            } else {
-                                addWEPNetworkCallbacks.failureAddingWEPNetwork(result);
-                            }
-                        }
-                    } else {
-                        if (addWEPNetworkCallbacks != null) {
-                            addWEPNetworkCallbacks.addWEPNetworkWiseFyFailure(WiseFyCodes.NETWORK_ALREADY_CONFIGURED);
-                        }
+                if (!mWiseFyPrerequisites.hasPrerequisites()) {
+                    if (callbacks != null) {
+                        callbacks.addWEPNetworkWiseFyFailure(WiseFyCodes.MISSING_PREREQUISITE);
                     }
-                } else {
-                    if (LogUtil.isLoggable(TAG, Log.ERROR, mLoggingEnabled)) {
-                        Log.e(TAG, "No WifiManager to add WEP network");
+                    return;
+                }
+
+                if (mWiseFySearch.isNetworkASavedConfiguration(ssid)) {
+                    if (callbacks != null) {
+                        callbacks.addWEPNetworkWiseFyFailure(WiseFyCodes.NETWORK_ALREADY_CONFIGURED);
                     }
-                    if (addWEPNetworkCallbacks != null) {
-                        addWEPNetworkCallbacks.addWEPNetworkWiseFyFailure(WiseFyCodes.NULL_MANAGER);
+                    return;
+                }
+
+                if (LogUtil.isLoggable(TAG, Log.DEBUG, mWiseFyConfiguration.isLoggingEnabled())) {
+                    Log.d(TAG, String.format("Adding WEP network with SSID %s", ssid));
+                }
+                WifiConfiguration wifiConfiguration = WifiConfigurationUtil.getInstance().generateWEPNetworkConfiguration(ssid, password);
+                if (callbacks != null) {
+                    int result = addNetworkConfiguration(wifiConfiguration);
+                    if (result != WIFI_MANAGER_FAILURE) {
+                        callbacks.wepNetworkAdded(wifiConfiguration);
+                    } else {
+                        callbacks.failureAddingWEPNetwork(result);
                     }
                 }
-                mWiseFyHandlerThread.quitSafely();
             }
         };
         execute(runnable);
     }
 
     /**
-     * To add a WPA2 network to the user's configured network list
+     * To add a WPA2 network to the user's configured network list (synchronously)
      *
-     * @param ssid - The ssid of the WPA2 network you want to add
-     * @param password - The password for the WPA2 network being added
+     * @param ssid The ssid of the WPA2 network you want to add
+     * @param password The password for the WPA2 network being added
      *
-     * Uses
-     *   {@link #addNetwork(WifiConfiguration)}
-     *   {@link #checkIfNetworkInConfigurationList(String)}
-     *   {@link WifiConfigurationUtil#generateWPA2NetworkConfiguration(String, String)}
-     *   {@link WiseFyCodes
+     * @see #addNetworkConfiguration(WifiConfiguration)
+     * @see WifiConfigurationUtil#generateWPA2NetworkConfiguration(String, String)
+     * @see WiseFyCodes
+     * @see WiseFyConfiguration#isLoggingEnabled()
+     * @see WiseFyPrerequisites#hasPrerequisites()
+     * @see WiseFySearch#isNetworkASavedConfiguration(String)
      *
      * @return int - The return code from WifiManager for network creation (-1 for failure)
      */
     @Sync
     @CallingThread
-    public int addWPA2Network(@Nullable String ssid, @Nullable String password) {
+    public int addWPA2Network(String ssid, String password) {
         if (TextUtils.isEmpty(ssid) || TextUtils.isEmpty(password)) {
-            if (LogUtil.isLoggable(TAG, Log.WARN, mLoggingEnabled)) {
-                Log.w(TAG, String.format("Breaking due to missing ssid or password. ssid: %s, password: %s", ssid, password));
-            }
             return WiseFyCodes.MISSING_PARAMETER;
         }
-        if (mWifiManager != null) {
-            if (!checkIfNetworkInConfigurationList(ssid)) {
-                if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                    Log.d(TAG, String.format("Adding WPA2 network with SSID %s", ssid));
-                }
 
-                WifiConfiguration wifiConfiguration = WifiConfigurationUtil.getInstance().generateWPA2NetworkConfiguration(ssid, password);
-                return addNetwork(wifiConfiguration);
-            } else {
-                return WiseFyCodes.NETWORK_ALREADY_CONFIGURED;
-            }
-        } else {
-            if (LogUtil.isLoggable(TAG, Log.ERROR, mLoggingEnabled)) {
-                Log.e(TAG, "No WifiManager to add WPA2 network");
-            }
-            return WiseFyCodes.NULL_MANAGER;
+        if (!mWiseFyPrerequisites.hasPrerequisites()) {
+            return WiseFyCodes.MISSING_PREREQUISITE;
+        }
+
+        if (mWiseFySearch.isNetworkASavedConfiguration(ssid)) {
+            return WiseFyCodes.NETWORK_ALREADY_CONFIGURED;
         }
+
+        if (LogUtil.isLoggable(TAG, Log.DEBUG, mWiseFyConfiguration.isLoggingEnabled())) {
+            Log.d(TAG, String.format("Adding WPA2 network with SSID %s", ssid));
+        }
+        WifiConfiguration wifiConfiguration = WifiConfigurationUtil.getInstance().generateWPA2NetworkConfiguration(ssid, password);
+        return addNetworkConfiguration(wifiConfiguration);
     }
 
     /**
-     * To add a WPA2 network to the user's configured network list
-     *
-     * @param ssid - The ssid of the WPA2 network you want to add
-     * @param password - The password for the WPA2 network being added
-     * @param addWPA2NetworkCallbacks -
-     *
-     * Uses
-     *   {@link #addNetwork(WifiConfiguration)}
-     *   {@link #checkIfNetworkInConfigurationList(String)}
-     *   {@link WifiConfigurationUtil#generateWPA2NetworkConfiguration(String, String)}
-     *   {@link WiseFyCodes
+     * To add a WPA2 network to the user's configured network list (asynchronously)
+     *
+     * @param ssid The ssid of the WPA2 network you want to add
+     * @param password The password for the WPA2 network being added
+     * @param callbacks The listener to return results to
+     *
+     * @see #addNetworkConfiguration(WifiConfiguration)
+     * @see #execute(Runnable)
+     * @see AddWPA2NetworkCallbacks
+     * @see WifiConfigurationUtil#generateWPA2NetworkConfiguration(String, String)
+     * @see WiseFyCodes
+     * @see WiseFyConfiguration#isLoggingEnabled()
+     * @see WiseFyPrerequisites#hasPrerequisites()
+     * @see WiseFySearch#isNetworkASavedConfiguration(String)
      */
     @Async
     @WiseFyThread
-    public void addWPA2Network(@Nullable final String ssid, @Nullable final String password, @Nullable final AddWPA2NetworkCallbacks addWPA2NetworkCallbacks) {
+    public void addWPA2Network(final String ssid, final String password, final AddWPA2NetworkCallbacks callbacks) {
         Runnable runnable = new Runnable() {
             @Override
             public void run() {
                 if (TextUtils.isEmpty(ssid) || TextUtils.isEmpty(password)) {
-                    if (LogUtil.isLoggable(TAG, Log.WARN, mLoggingEnabled)) {
-                        Log.w(TAG, String.format("Breaking due to missing ssid or password. ssid: %s, password: %s", ssid, password));
-                    }
-                    if (addWPA2NetworkCallbacks != null) {
-                        addWPA2NetworkCallbacks.addWPA2NetworkWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
+                    if (callbacks != null) {
+                        callbacks.addWPA2NetworkWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
                     }
                     return;
                 }
-                if (mWifiManager != null) {
-                    if (!checkIfNetworkInConfigurationList(ssid)) {
-                        if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                            Log.d(TAG, String.format("Adding WPA2 network with SSID %s", ssid));
-                        }
 
-                        WifiConfiguration wifiConfiguration = WifiConfigurationUtil.getInstance().generateWPA2NetworkConfiguration(ssid, password);
-                        if (addWPA2NetworkCallbacks != null) {
-                            int result = addNetwork(wifiConfiguration);
-                            if (result != WIFI_MANAGER_FAILURE) {
-                                addWPA2NetworkCallbacks.wpa2NetworkAdded(wifiConfiguration);
-                            } else {
-                                addWPA2NetworkCallbacks.failureAddingWPA2Network(result);
-                            }
-                        }
-                    } else {
-                        if (addWPA2NetworkCallbacks != null) {
-                            addWPA2NetworkCallbacks.addWPA2NetworkWiseFyFailure(WiseFyCodes.NETWORK_ALREADY_CONFIGURED);
-                        }
+                if (!mWiseFyPrerequisites.hasPrerequisites()) {
+                    if (callbacks != null) {
+                        callbacks.addWPA2NetworkWiseFyFailure(WiseFyCodes.MISSING_PREREQUISITE);
                     }
-                } else {
-                    if (LogUtil.isLoggable(TAG, Log.ERROR, mLoggingEnabled)) {
-                        Log.e(TAG, "No WifiManager to add WPA2 network");
+                    return;
+                }
+
+                if (mWiseFySearch.isNetworkASavedConfiguration(ssid)) {
+                    if (callbacks != null) {
+                        callbacks.addWPA2NetworkWiseFyFailure(WiseFyCodes.NETWORK_ALREADY_CONFIGURED);
                     }
-                    if (addWPA2NetworkCallbacks != null) {
-                        addWPA2NetworkCallbacks.addWPA2NetworkWiseFyFailure(WiseFyCodes.NULL_MANAGER);
+                    return;
+                }
+
+                if (LogUtil.isLoggable(TAG, Log.DEBUG, mWiseFyConfiguration.isLoggingEnabled())) {
+                    Log.d(TAG, String.format("Adding WPA2 network with SSID %s", ssid));
+                }
+                WifiConfiguration wifiConfiguration = WifiConfigurationUtil.getInstance().generateWPA2NetworkConfiguration(ssid, password);
+                if (callbacks != null) {
+                    int result = addNetworkConfiguration(wifiConfiguration);
+                    if (result != WIFI_MANAGER_FAILURE) {
+                        callbacks.wpa2NetworkAdded(wifiConfiguration);
+                    } else {
+                        callbacks.failureAddingWPA2Network(result);
                     }
                 }
-                mWiseFyHandlerThread.quitSafely();
             }
         };
         execute(runnable);
@@ -471,8 +461,8 @@ public void run() {
     /**
      * To convert an RSSI level for a network to a number of bars
      *
-     * @param rssiLevel - The signal strength of the network
-     * @param targetNumberOfBars - How many bars or levels there will be total
+     * @param rssiLevel The signal strength of the network
+     * @param targetNumberOfBars How many bars or levels there will be total
      *
      * @return int - The number of bars for the given RSSI value
      */
@@ -485,8 +475,8 @@ public int calculateBars(int rssiLevel, int targetNumberOfBars) {
     /**
      * To compare the signal strength of two networks
      *
-     * @param rssi1 - The signal strength of network 1
-     * @param rssi2 - The signal strength of network 2
+     * @param rssi1 The signal strength of network 1
+     * @param rssi2 The signal strength of network 2
      *
      * @return int - Returns negative value if the first signal is weaker than the second signal, 0 if the two
      * signals have the same strength, and a positive value if the first signal is stronger than the second signal.
@@ -498,313 +488,264 @@ public int compareSignalLevel(int rssi1, int rssi2) {
     }
 
     /**
-     * Used to connect to a network
+     * Used to connect to a network (synchronously)
      *
-     * Gets a list of saved networks, connects/reconnects to the given ssid, and then calls waitToConnectToSSID to verify connectivity
+     * Gets a list of saved networks, connects to the given ssid if found, and verifies connectivity
      *
-     * @param ssidToConnectTo - The ssid to connect/reconnect to
-     * @param timeoutInMillis - The number of milliseconds to continue waiting for the device to connect to the given SSID
+     * @param ssidToConnectTo The ssid to connect/reconnect to
+     * @param timeoutInMillis The number of milliseconds to continue waiting for the device to connect to the given SSID
      *
-     * Uses
-     *   {@link #waitToConnectToSSID(String, int)}
+     * @see WiseFyConnection#waitToConnectToSSID(String, int)
+     * @see WiseFyPrerequisites#hasPrerequisites()
+     * @see WiseFySearch#findSavedNetworkByRegex(String)
      *
      * @return boolean - If the network was successfully reconnected
      */
     @Sync
     @CallingThread
     @WaitsForTimeout
-    public boolean connectToNetwork(@Nullable String ssidToConnectTo, int timeoutInMillis) {
-        if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-            Log.d(TAG, String.format("Connecting to network: %s", ssidToConnectTo));
-        }
-        if (TextUtils.isEmpty(ssidToConnectTo)) {
+    public boolean connectToNetwork(String ssidToConnectTo, int timeoutInMillis) {
+        if (TextUtils.isEmpty(ssidToConnectTo) || !mWiseFyPrerequisites.hasPrerequisites()) {
             return false;
         }
-        if (mWifiManager != null) {
-            List<WifiConfiguration> list = mWifiManager.getConfiguredNetworks();
-            if (list != null) {
-                for (int i = 0; i < list.size(); i++) {
-                    WifiConfiguration wifiConfiguration = list.get(i);
-                    if (wifiConfiguration != null && wifiConfiguration.SSID != null) {
-                        String ssidInList = wifiConfiguration.SSID.replaceAll("\"", "");
-
-                        if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                            Log.d(TAG, String.format("Configured WiFi Network { index: %d, ssidInList: %s }", i, ssidInList));
-                        }
-                        if (ssidInList.equals(ssidToConnectTo)) {
-                            if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                                Log.d(TAG, String.format("ssidToReconnectTo: %s matches ssidInList: %s", ssidToConnectTo, ssidInList));
-                            }
-                            mWifiManager.disconnect();
-                            mWifiManager.enableNetwork(wifiConfiguration.networkId, true);
-                            mWifiManager.reconnect();
-                            return waitToConnectToSSID(ssidToConnectTo, timeoutInMillis);
-                        }
-                    }
-                }
-            }
-            if (LogUtil.isLoggable(TAG, Log.WARN, mLoggingEnabled)) {
-                Log.w(TAG, String.format("ssidToReconnectTo: %s was not found in list to connect to", ssidToConnectTo));
-            }
-        } else {
-            if (LogUtil.isLoggable(TAG, Log.ERROR, mLoggingEnabled)) {
-                Log.e(TAG, String.format("No WifiManager to connect to network. SSID: %s", ssidToConnectTo));
-            }
+
+        if (LogUtil.isLoggable(TAG, Log.DEBUG, mWiseFyConfiguration.isLoggingEnabled())) {
+            Log.d(TAG, String.format("Waiting %d to connect to network with ssid %s", timeoutInMillis, ssidToConnectTo));
+        }
+
+        WifiConfiguration wifiConfiguration = mWiseFySearch.findSavedNetworkByRegex(ssidToConnectTo);
+        if (wifiConfiguration != null) {
+            mWiseFyPrerequisites.getWifiManager().disconnect();
+            mWiseFyPrerequisites.getWifiManager().enableNetwork(wifiConfiguration.networkId, true);
+            mWiseFyPrerequisites.getWifiManager().reconnect();
+            return mWiseFyConnection.waitToConnectToSSID(ssidToConnectTo, timeoutInMillis);
         }
+
         return false;
     }
 
     /**
-     * Used to connect to a network
+     * Used to connect to a network (asynchronously)
      *
-     * Gets a list of saved networks, connects/reconnects to the given ssid, and then calls waitToConnectToSSID to verify connectivity
+     * Gets a list of saved networks, connects to the given ssid if found, and verifies connectivity
      *
-     * @param ssidToConnectTo - The ssid to connect/reconnect to
-     * @param timeoutInMillis - The number of milliseconds to continue waiting for the device to connect to the given SSID
+     * @param ssidToConnectTo The ssid to connect/reconnect to
+     * @param timeoutInMillis The number of milliseconds to continue waiting for the device to connect to the given SSID
+     * @param callbacks The listener to return results to
      *
-     * Uses
-     *   {@link #waitToConnectToSSID(String, int)}
-     *   {@link WiseFyCodes}
+     * @see #execute(Runnable)
+     * @see ConnectToNetworkCallbacks
+     * @see WiseFyCodes
+     * @see WiseFyConnection#waitToConnectToSSID(String, int)
+     * @see WiseFyPrerequisites#hasPrerequisites()
+     * @see WiseFySearch#findSavedNetworkByRegex(String)
      */
     @Async
     @WiseFyThread
     @WaitsForTimeout
-    public void connectToNetwork(@Nullable final String ssidToConnectTo, final int timeoutInMillis, @Nullable final ConnectToNetworkCallbacks connectToNetworkCallbacks) {
+    public void connectToNetwork(final String ssidToConnectTo, final int timeoutInMillis, final ConnectToNetworkCallbacks callbacks) {
         Runnable runnable = new Runnable() {
             @Override
             public void run() {
-                if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                    Log.d(TAG, String.format("Connecting to network: %s", ssidToConnectTo));
-                }
                 if (TextUtils.isEmpty(ssidToConnectTo)) {
-                    if (connectToNetworkCallbacks != null) {
-                        connectToNetworkCallbacks.connectToNetworkWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
+                    if (callbacks != null) {
+                        callbacks.connectToNetworkWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
                     }
                     return;
                 }
-                if (mWifiManager != null) {
-                    List<WifiConfiguration> list = mWifiManager.getConfiguredNetworks();
-                    if (list != null) {
-                        for (int i = 0; i < list.size(); i++) {
-                            WifiConfiguration wifiConfiguration = list.get(i);
-                            if (wifiConfiguration != null && wifiConfiguration.SSID != null) {
-                                String ssidInList = wifiConfiguration.SSID.replaceAll("\"", "");
-
-                                if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                                    Log.d(TAG, String.format("Configured WiFi Network { index: %d, ssidInList: %s }", i, ssidInList));
-                                }
-                                if (ssidInList.equals(ssidToConnectTo)) {
-                                    if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                                        Log.d(TAG, String.format("ssidToReconnectTo: %s matches ssidInList: %s", ssidToConnectTo, ssidInList));
-                                    }
-                                    mWifiManager.disconnect();
-                                    mWifiManager.enableNetwork(wifiConfiguration.networkId, true);
-                                    mWifiManager.reconnect();
-                                    boolean connected = waitToConnectToSSID(ssidToConnectTo, timeoutInMillis);
-                                    if (connectToNetworkCallbacks != null) {
-                                        if (connected) {
-                                            connectToNetworkCallbacks.connectedToNetwork();
-                                        } else {
-                                            connectToNetworkCallbacks.failureConnectingToNetwork();
-                                        }
-                                    }
-                                    return;
-                                }
-                            }
-                        }
-                    }
-                    if (LogUtil.isLoggable(TAG, Log.WARN, mLoggingEnabled)) {
-                        Log.w(TAG, String.format("ssidToReconnectTo: %s was not found in list to connect to", ssidToConnectTo));
-                    }
-                    if (connectToNetworkCallbacks != null) {
-                        connectToNetworkCallbacks.networkNotFoundToConnectTo();
-                    }
-                } else {
-                    if (LogUtil.isLoggable(TAG, Log.ERROR, mLoggingEnabled)) {
-                        Log.e(TAG, String.format("No WifiManager to connect to network. SSID: %s", ssidToConnectTo));
+
+                if (!mWiseFyPrerequisites.hasPrerequisites()) {
+                    if (callbacks != null) {
+                        callbacks.connectToNetworkWiseFyFailure(WiseFyCodes.MISSING_PREREQUISITE);
                     }
-                    if (connectToNetworkCallbacks != null) {
-                        connectToNetworkCallbacks.connectToNetworkWiseFyFailure(WiseFyCodes.NULL_MANAGER);
+                    return;
+                }
+
+                if (LogUtil.isLoggable(TAG, Log.DEBUG, mWiseFyConfiguration.isLoggingEnabled())) {
+                    Log.d(TAG, String.format("Waiting %d to connect to network with ssid %s", timeoutInMillis, ssidToConnectTo));
+                }
+
+                WifiConfiguration wifiConfiguration = mWiseFySearch.findSavedNetworkByRegex(ssidToConnectTo);
+                if (wifiConfiguration != null) {
+                    mWiseFyPrerequisites.getWifiManager().disconnect();
+                    mWiseFyPrerequisites.getWifiManager().enableNetwork(wifiConfiguration.networkId, true);
+                    mWiseFyPrerequisites.getWifiManager().reconnect();
+                    boolean connected = mWiseFyConnection.waitToConnectToSSID(ssidToConnectTo, timeoutInMillis);
+                    if (callbacks != null) {
+                        if (connected) {
+                            callbacks.connectedToNetwork();
+                        } else {
+                            callbacks.failureConnectingToNetwork();
+                        }
                     }
+                    return;
+                }
+
+                if (callbacks != null) {
+                    callbacks.networkNotFoundToConnectTo();
                 }
-                mWiseFyHandlerThread.quitSafely();
             }
         };
         execute(runnable);
     }
 
     /**
-     * To disable Wifi on a user's device
+     * To disable Wifi on a user's device (synchronously)
      *
-     * @return boolean - If the command succeeded in disabling wifi
+     * @see WiseFyPrerequisites#hasPrerequisites()
+     *
+     * @return boolean - True if the command succeeded in disabling wifi
      */
     @Sync
     @CallingThread
     public boolean disableWifi() {
-        if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-            Log.d(TAG, "Disabling WiFi");
-        }
-        if (mWifiManager != null) {
-            return mWifiManager.setWifiEnabled(false);
-        } else {
-            if (LogUtil.isLoggable(TAG, Log.ERROR, mLoggingEnabled)) {
-                Log.e(TAG, "No WifiManager to disable Wifi");
-            }
-        }
-        return false;
+        return mWiseFyPrerequisites.hasPrerequisites() && mWiseFyPrerequisites.getWifiManager().setWifiEnabled(false);
     }
 
     /**
-     * To disable Wifi on a user's device
+     * To disable Wifi on a user's device (asynchronously)
      *
-     * Uses
-     *   {@link WiseFyCodes}
+     * @param callbacks The listener to return results to
+     *
+     * @see #execute(Runnable)
+     * @see DisableWifiCallbacks
+     * @see WiseFyCodes
+     * @see WiseFyPrerequisites#hasPrerequisites()
      */
     @Async
     @WiseFyThread
-    public void disableWifi(@Nullable final DisableWifiCallbacks disableWifiCallbacks) {
+    public void disableWifi(final DisableWifiCallbacks callbacks) {
         Runnable runnable = new Runnable() {
             @Override
             public void run() {
-                if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                    Log.d(TAG, "Disabling WiFi");
-                }
-                if (mWifiManager != null) {
-                    boolean result = mWifiManager.setWifiEnabled(false);
-                    if (disableWifiCallbacks != null) {
-                        if (result) {
-                            disableWifiCallbacks.wifiDisabled();
-                        } else {
-                            disableWifiCallbacks.failureDisablingWifi();
-                        }
-                    }
-                } else {
-                    if (LogUtil.isLoggable(TAG, Log.ERROR, mLoggingEnabled)) {
-                        Log.e(TAG, "No WifiManager to disable Wifi");
+                if (!mWiseFyPrerequisites.hasPrerequisites()) {
+                    if (callbacks != null) {
+                        callbacks.disableWifiWiseFyFailure(WiseFyCodes.MISSING_PREREQUISITE);
                     }
-                    if (disableWifiCallbacks != null) {
-                        disableWifiCallbacks.disableWifiWiseFyFailure(WiseFyCodes.NULL_MANAGER);
+                    return;
+                }
+
+                boolean result = mWiseFyPrerequisites.getWifiManager().setWifiEnabled(false);
+                if (callbacks != null) {
+                    if (result) {
+                        callbacks.wifiDisabled();
+                    } else {
+                        callbacks.failureDisablingWifi();
                     }
                 }
-                mWiseFyHandlerThread.quitSafely();
             }
         };
         execute(runnable);
     }
 
     /**
-     * To disconnect the user from their current network
+     * To disconnect the user from their current network (synchronously)
+     *
+     * @see WiseFyPrerequisites#hasPrerequisites()
      *
      * @return boolean - If the command succeeded in disconnecting the device from the current network
      */
     @Sync
     @CallingThread
     public boolean disconnectFromCurrentNetwork() {
-        if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-            Log.d(TAG, "Disconnecting from current network");
-        }
-        if (mWifiManager != null) {
-            return mWifiManager.disconnect();
-        } else {
-            if (LogUtil.isLoggable(TAG, Log.ERROR, mLoggingEnabled)) {
-                Log.e(TAG, "No WifiManager to disconnect from current network");
-            }
-        }
-        return false;
+        return mWiseFyPrerequisites.hasPrerequisites() && mWiseFyPrerequisites.getWifiManager().disconnect();
     }
 
     /**
-     * To disconnect the user from their current network
+     * To disconnect the user from their current network (asynchronously)
+     *
+     * @param callbacks The listener to return results to
      *
-     * Uses
-     *   {@link WiseFyCodes}
+     * @see #execute(Runnable)
+     * @see DisconnectFromCurrentNetworkCallbacks
+     * @see WiseFyCodes
+     * @see WiseFyPrerequisites#hasPrerequisites()
      */
     @Async
     @WiseFyThread
-    public void disconnectFromCurrentNetwork(@Nullable final DisconnectFromCurrentNetworkCallbacks disconnectFromCurrentNetworkCallbacks) {
+    public void disconnectFromCurrentNetwork(final DisconnectFromCurrentNetworkCallbacks callbacks) {
         Runnable runnable = new Runnable() {
             @Override
             public void run() {
-                if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                    Log.d(TAG, "Disconnecting from current network");
-                }
-                if (mWifiManager != null) {
-                    boolean result = mWifiManager.disconnect();
-                    if (disconnectFromCurrentNetworkCallbacks != null) {
-                        if (result) {
-                            disconnectFromCurrentNetworkCallbacks.disconnectedFromCurrentNetwork();
-                        } else {
-                            disconnectFromCurrentNetworkCallbacks.failureDisconnectingFromCurrentNetwork();
-                        }
-                    }
-                } else {
-                    if (LogUtil.isLoggable(TAG, Log.ERROR, mLoggingEnabled)) {
-                        Log.e(TAG, "No WifiManager to disconnect from current network");
+                if (!mWiseFyPrerequisites.hasPrerequisites()) {
+                    if (callbacks != null) {
+                        callbacks.disconnectFromCurrentNetworkWiseFyFailure(WiseFyCodes.MISSING_PREREQUISITE);
                     }
-                    if (disconnectFromCurrentNetworkCallbacks != null) {
-                        disconnectFromCurrentNetworkCallbacks.disconnectFromCurrentNetworkWiseFyFailure(WiseFyCodes.NULL_MANAGER);
+                    return;
+                }
+
+                boolean result = mWiseFyPrerequisites.getWifiManager().disconnect();
+                if (callbacks != null) {
+                    if (result) {
+                        callbacks.disconnectedFromCurrentNetwork();
+                    } else {
+                        callbacks.failureDisconnectingFromCurrentNetwork();
                     }
                 }
-                mWiseFyHandlerThread.quitSafely();
             }
         };
         execute(runnable);
     }
 
+    /**
+     * Used to cleanup the thread started by WiseFy
+     */
+    public void dump() {
+        if (mWiseFyHandlerThread != null) {
+            mWiseFyHandlerThread.interrupt();
+            mWiseFyHandlerThread.quit();
+            mWiseFyHandlerThread = null;
+            if (LogUtil.isLoggable(TAG, Log.DEBUG, mWiseFyConfiguration.isLoggingEnabled())) {
+                Log.d(TAG, String.format("Cleaning up WiseFy Thread. Thread value: %s, Handler value: %s", mWiseFyHandlerThread, mWiseFyHandler));
+            }
+        }
+        mWiseFyHandler = null;
+    }
+
     /**
      * To enable Wifi on a user's device
      *
+     * @see WiseFyPrerequisites#hasPrerequisites()
+     *
      * @return boolean - If the command succeeded in enabling wifi
      */
     @Sync
     @CallingThread
     public boolean enableWifi() {
-        if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-            Log.d(TAG, "Enabling WiFi");
-        }
-        if (mWifiManager != null) {
-            return mWifiManager.setWifiEnabled(true);
-        } else {
-            if (LogUtil.isLoggable(TAG, Log.ERROR, mLoggingEnabled)) {
-                Log.e(TAG, "No WifiManager to enable wifi");
-            }
-        }
-        return false;
+        return mWiseFyPrerequisites.hasPrerequisites() && mWiseFyPrerequisites.getWifiManager().setWifiEnabled(true);
     }
 
     /**
      * To enable Wifi on a user's device
      *
-     * Uses
-     *   {@link WiseFyCodes}
+     * @param callbacks The listener to return results to
+     *
+     * @see #execute(Runnable)
+     * @see EnableWifiCallbacks
+     * @see WiseFyCodes
+     * @see WiseFyPrerequisites#hasPrerequisites()
      */
     @Async
     @WiseFyThread
-    public void enableWifi(@Nullable final EnableWifiCallbacks enableWifiCallbacks) {
+    public void enableWifi(final EnableWifiCallbacks callbacks) {
         Runnable runnable = new Runnable() {
             @Override
             public void run() {
-                if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                    Log.d(TAG, "Enabling WiFi");
-                }
-                if (mWifiManager != null) {
-                    boolean result = mWifiManager.setWifiEnabled(true);
-                    if (enableWifiCallbacks != null) {
-                        if (result) {
-                            enableWifiCallbacks.wifiEnabled();
-                        } else {
-                            enableWifiCallbacks.failureEnablingWifi();
-                        }
-                    }
-                } else {
-                    if (LogUtil.isLoggable(TAG, Log.ERROR, mLoggingEnabled)) {
-                        Log.e(TAG, "No WifiManager to enable wifi");
+                if (!mWiseFyPrerequisites.hasPrerequisites()) {
+                    if (callbacks != null) {
+                        callbacks.enableWifiWiseFyFailure(WiseFyCodes.MISSING_PREREQUISITE);
                     }
-                    if (enableWifiCallbacks != null) {
-                        enableWifiCallbacks.enableWifiWiseFyFailure(WiseFyCodes.NULL_MANAGER);
+                    return;
+                }
+
+                boolean result = mWiseFyPrerequisites.getWifiManager().setWifiEnabled(true);
+                if (callbacks != null) {
+                    if (result) {
+                        callbacks.wifiEnabled();
+                    } else {
+                        callbacks.failureEnablingWifi();
                     }
                 }
-                mWiseFyHandlerThread.quitSafely();
             }
         };
         execute(runnable);
@@ -813,46 +754,45 @@ public void run() {
     /**
      * To retrieve the user's current network
      *
+     * @see WiseFyPrerequisites#hasPrerequisites()
+     *
      * @return WifiInfo|null - The user's current network information
      */
     @Sync
     @CallingThread
     public WifiInfo getCurrentNetwork() {
-        if (mWifiManager != null) {
-            return mWifiManager.getConnectionInfo();
-        } else {
-            if (LogUtil.isLoggable(TAG, Log.ERROR, mLoggingEnabled)) {
-                Log.e(TAG, "No WifiManager to get current network");
-            }
+        if (!mWiseFyPrerequisites.hasPrerequisites()) {
+            return null;
         }
-        return null;
+        return mWiseFyPrerequisites.getWifiManager().getConnectionInfo();
     }
 
     /**
      * To retrieve the user's current network
      *
-     * Uses
-     *   {@link WiseFyCodes}
+     * @param callbacks The listener to return results to
+     *
+     * @see #execute(Runnable)
+     * @see GetCurrentNetworkCallbacks
+     * @see WiseFyCodes
+     * @see WiseFyPrerequisites#hasPrerequisites()
      */
     @Async
     @WiseFyThread
-    public void getCurrentNetwork(@Nullable final GetCurrentNetworkCallbacks getCurrentNetworkCallbacks) {
+    public void getCurrentNetwork(final GetCurrentNetworkCallbacks callbacks) {
         Runnable runnable = new Runnable() {
             @Override
             public void run() {
-                if (mWifiManager != null) {
-                    if (getCurrentNetworkCallbacks != null) {
-                        getCurrentNetworkCallbacks.retrievedCurrentNetwork(mWifiManager.getConnectionInfo());
-                    }
-                } else {
-                    if (LogUtil.isLoggable(TAG, Log.ERROR, mLoggingEnabled)) {
-                        Log.e(TAG, "No WifiManager to get current network");
-                    }
-                    if (getCurrentNetworkCallbacks != null) {
-                        getCurrentNetworkCallbacks.getCurrentNetworkWiseFyFailure(WiseFyCodes.NULL_MANAGER);
+                if (!mWiseFyPrerequisites.hasPrerequisites()) {
+                    if (callbacks != null) {
+                        callbacks.getCurrentNetworkWiseFyFailure(WiseFyCodes.MISSING_PREREQUISITE);
                     }
+                    return;
+                }
+
+                if (callbacks != null) {
+                    callbacks.retrievedCurrentNetwork(mWiseFyPrerequisites.getWifiManager().getConnectionInfo());
                 }
-                mWiseFyHandlerThread.quitSafely();
             }
         };
         execute(runnable);
@@ -861,13 +801,9 @@ public void run() {
     /**
      * To retrieve the frequency of the device's current network
      *
-     * Used by
-     *  {@link #isNetwork5gHz()}
-     *
-     * Uses
-     *  {@link #getCurrentNetwork()}
+     * @see #getCurrentNetwork()
      *
-     * @return int|NULL - The frequency of the devices current network or null if no network
+     * @return Integer - The frequency of the devices current network or null if no network
      */
     @Sync
     @CallingThread
@@ -883,31 +819,27 @@ public Integer getFrequency() {
     /**
      * To retrieve the frequency of the device's current network
      *
-     * Used by
-     *   {@link #isNetwork5gHz()}
+     * @param callbacks The listener to return results to
      *
-     * Uses
-     *   {@link #getCurrentNetwork(GetCurrentNetworkCallbacks)} ()}
-     *   {@link WiseFyCodes}
+     * @see #execute(Runnable)
+     * @see #getCurrentNetwork(GetCurrentNetworkCallbacks)
+     * @see GetFrequencyCallbacks
      */
     @Async
     @WiseFyThread
     @TargetApi(21)
-    public void getFrequency(@Nullable final GetFrequencyCallbacks getFrequencyCallbacks) {
+    public void getFrequency(final GetFrequencyCallbacks callbacks) {
         Runnable runnable = new Runnable() {
             @Override
             public void run() {
                 WifiInfo currentNetwork = getCurrentNetwork();
-                if (currentNetwork != null) {
-                    if (getFrequencyCallbacks != null) {
-                        getFrequencyCallbacks.retrievedFrequency(currentNetwork.getFrequency());
-                    }
-                } else {
-                    if (getFrequencyCallbacks != null) {
-                        getFrequencyCallbacks.failureGettingFrequency();
+                if (callbacks != null) {
+                    if (currentNetwork != null) {
+                        callbacks.retrievedFrequency(currentNetwork.getFrequency());
+                    } else {
+                        callbacks.failureGettingFrequency();
                     }
                 }
-                mWiseFyHandlerThread.quitSafely();
             }
         };
         execute(runnable);
@@ -916,17 +848,14 @@ public void run() {
     /**
      * To retrieve the frequency of a network
      *
-     * @param network - The network to return the frequency of
-     *
-     * Used by
-     *   {@link #isNetwork5gHz(WifiInfo)}
+     * @param network The network to return the frequency of
      *
-     * @return int|NULL - The frequency of the devices current network or null if no network
+     * @return Integer - The frequency of the devices current network or null if no network
      */
     @Sync
     @CallingThread
     @TargetApi(21)
-    public Integer getFrequency(@Nullable WifiInfo network) {
+    public Integer getFrequency(WifiInfo network) {
         if (network != null) {
             return network.getFrequency();
         }
@@ -936,30 +865,28 @@ public Integer getFrequency(@Nullable WifiInfo network) {
     /**
      * To retrieve the frequency of a network
      *
-     * @param network - The network to return the frequency of
+     * @param network The network to return the frequency of
+     * @param callbacks The listener to return results to
      *
-     * Used by isNetwork5gHz
-     *   {@link #isNetwork5gHz(WifiInfo)}
-     *
-     * Uses
-     *   {@link WiseFyCodes}
+     * @see #execute(Runnable)
+     * @see GetFrequencyCallbacks
+     * @see WiseFyCodes
      */
     @Async
     @WiseFyThread
     @TargetApi(21)
-    public void getFrequency(@Nullable final WifiInfo network, @Nullable final GetFrequencyCallbacks getFrequencyCallbacks) {
+    public void getFrequency(final WifiInfo network, final GetFrequencyCallbacks callbacks) {
         Runnable runnable = new Runnable() {
             @Override
             public void run() {
                 if (network != null) {
-                    if (getFrequencyCallbacks != null) {
-                        getFrequencyCallbacks.retrievedFrequency(network.getFrequency());
+                    if (callbacks != null) {
+                        callbacks.retrievedFrequency(network.getFrequency());
                     }
                 }
-                if (getFrequencyCallbacks != null) {
-                    getFrequencyCallbacks.getFrequencyWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
+                if (callbacks != null) {
+                    callbacks.getFrequencyWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
                 }
-                mWiseFyHandlerThread.quitSafely();
             }
         };
         execute(runnable);
@@ -970,64 +897,26 @@ public void run() {
      *
      * *NOTE* Setting filterDuplicates to true will not return SSIDs with a weaker signal strength (will always take the highest)
      *
-     * @param filterDuplicates - If you want to exclude SSIDs with that same name that have a weaker signal strength
+     * @param filterDuplicates If you want to exclude SSIDs with that same name that have a weaker signal strength
+     *
+     * @see WiseFyPrerequisites#hasPrerequisites()
+     * @see WiseFySearch#removeEntriesWithLowerSignalStrength(List)
      *
      * @return List of ScanResults|null - List of nearby access points
      */
     @Sync
     @CallingThread
     public List<ScanResult> getNearbyAccessPoints(boolean filterDuplicates) {
-        if (mWifiManager != null) {
-            mWifiManager.startScan();
-            if (!filterDuplicates) {
-                return mWifiManager.getScanResults();
-            } else {
-                List<ScanResult> scanResults = mWifiManager.getScanResults();
-                List<ScanResult> scanResultsToReturn = new ArrayList<>();
-
-                for (ScanResult newScanResult : scanResults) {
-                    boolean found = false;
-                    for (int i = 0; i < scanResultsToReturn.size(); i++) {
-                        ScanResult scanResult = scanResultsToReturn.get(i);
-                        if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                            Log.d(TAG, String.format("SSID 1: %s, SSID 2: %s", newScanResult.SSID, scanResult.SSID));
-                        }
-                        if (newScanResult.SSID.equalsIgnoreCase(scanResult.SSID)) {
-                            found = true;
-                            if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                                Log.d(TAG, "SSID did match");
-                                Log.d(TAG, String.format("Current level: %d", scanResult.level));
-                                Log.d(TAG, String.format("New level: %d", newScanResult.level));
-                                Log.d(TAG, String.format("comparison result: %d", WifiManager.compareSignalLevel(newScanResult.level, scanResult.level)));
-                            }
-                            if (WifiManager.compareSignalLevel(newScanResult.level, scanResult.level) > 0) {
-                                if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                                    Log.d(TAG, "New result has a higher signal strength, swapping");
-                                }
-                                scanResultsToReturn.set(i, newScanResult);
-                            }
-                        } else {
-                            if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                                Log.d(TAG, "SSID did not match");
-                            }
-                        }
-                    }
+        if (!mWiseFyPrerequisites.hasPrerequisites()) {
+            return null;
+        }
 
-                    if (!found) {
-                        if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                            Log.d(TAG, "Found new wifi network");
-                        }
-                        scanResultsToReturn.add(newScanResult);
-                    }
-                }
-                return scanResultsToReturn;
-            }
+        mWiseFyPrerequisites.getWifiManager().startScan();
+        if (filterDuplicates) {
+            return mWiseFySearch.removeEntriesWithLowerSignalStrength(mWiseFyPrerequisites.getWifiManager().getScanResults());
         } else {
-            if (LogUtil.isLoggable(TAG, Log.ERROR, mLoggingEnabled)) {
-                Log.e(TAG, "No WifiManager to get nearby access points");
-            }
+            return mWiseFyPrerequisites.getWifiManager().getScanResults();
         }
-        return null;
     }
 
     /**
@@ -1035,144 +924,149 @@ public List<ScanResult> getNearbyAccessPoints(boolean filterDuplicates) {
      *
      * *NOTE* Setting filterDuplicates to true will not return SSIDs with a weaker signal strength (will always take the highest)
      *
-     * @param filterDuplicates - If you want to exclude SSIDs with that same name that have a weaker signal strength
+     * @param filterDuplicates If you want to exclude SSIDs with that same name that have a weaker signal strength
+     * @param callbacks The listener to return results to
+     *
+     * @see #execute(Runnable)
+     * @see GetNearbyAccessPointsCallbacks
+     * @see WiseFyCodes
+     * @see WiseFyPrerequisites#hasPrerequisites()
+     * @see WiseFySearch#removeEntriesWithLowerSignalStrength(List)
      */
     @Async
     @WiseFyThread
-    public void getNearbyAccessPoints(final boolean filterDuplicates, @Nullable final GetNearbyAccessPointsCallbacks getNearbyAccessPointsCallbacks) {
+    public void getNearbyAccessPoints(final boolean filterDuplicates, final GetNearbyAccessPointsCallbacks callbacks) {
         Runnable runnable = new Runnable() {
             @Override
             public void run() {
-                if (mWifiManager != null) {
-                    mWifiManager.startScan();
-                    if (!filterDuplicates) {
-                        if (getNearbyAccessPointsCallbacks != null) {
-                            getNearbyAccessPointsCallbacks.retrievedNearbyAccessPoints(mWifiManager.getScanResults());
-                        }
-                    } else {
-                        List<ScanResult> scanResults = mWifiManager.getScanResults();
-                        List<ScanResult> scanResultsToReturn = new ArrayList<>();
-
-                        for (ScanResult newScanResult : scanResults) {
-                            boolean found = false;
-                            for (int i = 0; i < scanResultsToReturn.size(); i++) {
-                                ScanResult scanResult = scanResultsToReturn.get(i);
-                                if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                                    Log.d(TAG, String.format("SSID 1: %s, SSID 2: %s", newScanResult.SSID, scanResult.SSID));
-                                }
-                                if (newScanResult.SSID.equalsIgnoreCase(scanResult.SSID)) {
-                                    found = true;
-                                    if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                                        Log.d(TAG, "SSID did match");
-                                        Log.d(TAG, String.format("Current level: %d", scanResult.level));
-                                        Log.d(TAG, String.format("New level: %d", newScanResult.level));
-                                        Log.d(TAG, String.format("comparison result: %d", WifiManager.compareSignalLevel(newScanResult.level, scanResult.level)));
-                                    }
-                                    if (WifiManager.compareSignalLevel(newScanResult.level, scanResult.level) > 0) {
-                                        if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                                            Log.d(TAG, "New result has a higher signal strength, swapping");
-                                        }
-                                        scanResultsToReturn.set(i, newScanResult);
-                                    }
-                                } else {
-                                    if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                                        Log.d(TAG, "SSID did not match");
-                                    }
-                                }
-                            }
-
-                            if (!found) {
-                                if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                                    Log.d(TAG, "Found new wifi network");
-                                }
-                                scanResultsToReturn.add(newScanResult);
-                            }
-                        }
-                        if (getNearbyAccessPointsCallbacks != null) {
-                            getNearbyAccessPointsCallbacks.retrievedNearbyAccessPoints(scanResultsToReturn);
-                        }
-                    }
-                } else {
-                    if (LogUtil.isLoggable(TAG, Log.ERROR, mLoggingEnabled)) {
-                        Log.e(TAG, "No WifiManager to get nearby access points");
+                if (!mWiseFyPrerequisites.hasPrerequisites()) {
+                    if (callbacks != null) {
+                        callbacks.getNearbyAccessPointsWiseFyFailure(WiseFyCodes.MISSING_PREREQUISITE);
                     }
-                    if (getNearbyAccessPointsCallbacks != null) {
-                        getNearbyAccessPointsCallbacks.getNearbyAccessPointsWiseFyFailure(WiseFyCodes.NULL_MANAGER);
+                    return;
+                }
+
+                mWiseFyPrerequisites.getWifiManager().startScan();
+                if (callbacks != null) {
+                    if (filterDuplicates) {
+                        callbacks.retrievedNearbyAccessPoints(mWiseFySearch.removeEntriesWithLowerSignalStrength(mWiseFyPrerequisites.getWifiManager().getScanResults()));
+                    } else {
+                        callbacks.retrievedNearbyAccessPoints(mWiseFyPrerequisites.getWifiManager().getScanResults());
                     }
                 }
-                mWiseFyHandlerThread.quitSafely();
             }
         };
         execute(runnable);
     }
 
-    /**
-     * To search for and return a saved WiFiConfiguration given an SSID
-     *
-     * @param ssid - The ssid to use while searching for saved configuration
-     *
-     * Uses
-     *   {@link #findNetworkInConfigurationList(String)}
-     *
-     * @return WifiConfiguration|null - Saved network that matches the ssid
-     */
     @Sync
     @CallingThread
-    public WifiConfiguration getSavedNetwork(@Nullable String ssid) {
-        if (mWifiManager != null) {
-            if (!TextUtils.isEmpty(ssid)) {
-                return findNetworkInConfigurationList(ssid);
-            }
-        } else {
-            if (LogUtil.isLoggable(TAG, Log.ERROR, mLoggingEnabled)) {
-                Log.e(TAG, "No WifiManager to get saved networks");
-            }
+    @WaitsForTimeout
+    public Integer getRSSI(String regexForSSID, boolean takeHighest, int timeoutInMillis) {
+        if (TextUtils.isEmpty(regexForSSID) || !mWiseFyPrerequisites.hasPrerequisites()) {
+            return null;
+        }
+
+        ScanResult accessPoint = mWiseFySearch.findAccessPointByRegex(regexForSSID, timeoutInMillis, takeHighest);
+        if (accessPoint != null) {
+            return accessPoint.level;
         }
         return null;
     }
 
-    /**
-     * To search for and return a saved WiFiConfiguration given an SSID
-     *
-     * @param ssid - The ssid to use while searching for saved configuration
-     * @param getSavedNetworkCallback - The listener to return results to
-     *
-     * Uses
-     *   {@link #execute(Runnable)}
-     *   {@link #findNetworkInConfigurationList(String)}
-     *   {@link GetSavedNetworkCallbacks}
-     *   {@link WiseFyHandlerThread}
-     */
     @Async
     @WiseFyThread
-    public void getSavedNetwork(@Nullable final String ssid, @Nullable final GetSavedNetworkCallbacks getSavedNetworkCallback) {
+    @WaitsForTimeout
+    public void getRSSI(final String regexForSSID, final boolean takeHighest, final int timeoutInMillis, final GetRSSICallbacks callbacks) {
         Runnable runnable = new Runnable() {
             @Override
             public void run() {
-                if (TextUtils.isEmpty(ssid)) {
-                    if (getSavedNetworkCallback != null) {
-                        getSavedNetworkCallback.getSavedNetworkWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
+                if (TextUtils.isEmpty(regexForSSID)) {
+                    if (callbacks != null) {
+                        callbacks.getRSSIWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
                     }
                     return;
                 }
-                if (mWifiManager != null) {
-                    WifiConfiguration savedNetwork = findNetworkInConfigurationList(ssid);
-                    if (getSavedNetworkCallback != null) {
-                        if (savedNetwork != null) {
-                            getSavedNetworkCallback.retrievedSavedNetwork(savedNetwork);
-                        } else {
-                            getSavedNetworkCallback.networkNotFound();
-                        }
-                    }
-                } else {
-                    if (LogUtil.isLoggable(TAG, Log.ERROR, mLoggingEnabled)) {
-                        Log.e(TAG, "No WifiManager to get saved networks");
+
+                if (!mWiseFyPrerequisites.hasPrerequisites()) {
+                    if (callbacks != null) {
+                        callbacks.getRSSIWiseFyFailure(WiseFyCodes.MISSING_PREREQUISITE);
                     }
-                    if (getSavedNetworkCallback != null) {
-                        getSavedNetworkCallback.getSavedNetworkWiseFyFailure(WiseFyCodes.NULL_MANAGER);
+                    return;
+                }
+
+                ScanResult accessPoint = mWiseFySearch.findAccessPointByRegex(regexForSSID, timeoutInMillis, takeHighest);
+                if (callbacks != null) {
+                    if (accessPoint != null) {
+                        callbacks.retrievedRSSI(accessPoint.level);
+                    } else {
+                        callbacks.networkNotFoundToRetrieveRSSI();
+                    }
+                }
+            }
+        };
+        execute(runnable);
+    }
+
+    /**
+     * To search for and return a saved WiFiConfiguration given an SSID
+     *
+     * @param regexForSSID The ssid to use while searching for saved configuration
+     *
+     * @see WiseFyPrerequisites#hasPrerequisites()
+     * @see WiseFySearch#findSavedNetworkByRegex(String)
+     *
+     * @return WifiConfiguration|null - Saved network that matches the ssid
+     */
+    @Sync
+    @CallingThread
+    public WifiConfiguration getSavedNetwork(String regexForSSID) {
+        if (!mWiseFyPrerequisites.hasPrerequisites() || TextUtils.isEmpty(regexForSSID)) {
+            return null;
+        }
+        return mWiseFySearch.findSavedNetworkByRegex(regexForSSID);
+    }
+
+    /**
+     * To search for and return a saved WiFiConfiguration given an SSID
+     *
+     * @param regexForSSID The ssid to use while searching for saved configuration
+     * @param callbacks The listener to return results to
+     *
+     * @see #execute(Runnable)
+     * @see GetSavedNetworkCallbacks
+     * @see WiseFyCodes
+     * @see WiseFyPrerequisites#hasPrerequisites()
+     * @see WiseFySearch#findSavedNetworkByRegex(String)
+     */
+    @Async
+    @WiseFyThread
+    public void getSavedNetwork(final String regexForSSID, final GetSavedNetworkCallbacks callbacks) {
+        Runnable runnable = new Runnable() {
+            @Override
+            public void run() {
+                if (TextUtils.isEmpty(regexForSSID)) {
+                    if (callbacks != null) {
+                        callbacks.getSavedNetworkWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
+                    }
+                    return;
+                }
+
+                if (!mWiseFyPrerequisites.hasPrerequisites()) {
+                    if (callbacks != null) {
+                        callbacks.getSavedNetworkWiseFyFailure(WiseFyCodes.MISSING_PREREQUISITE);
+                    }
+                    return;
+                }
+
+                WifiConfiguration savedNetwork = mWiseFySearch.findSavedNetworkByRegex(regexForSSID);
+                if (callbacks != null) {
+                    if (savedNetwork != null) {
+                        callbacks.retrievedSavedNetwork(savedNetwork);
+                    } else {
+                        callbacks.savedNetworkNotFound();
                     }
                 }
-                mWiseFyHandlerThread.quitSafely();
             }
         };
         execute(runnable);
@@ -1181,50 +1075,85 @@ public void run() {
     /**
      * To retrieve a list of saved networks on a user's device
      *
+     * @see WiseFyPrerequisites#hasPrerequisites()
+     *
      * @return List of WifiConfiguration|null - List of saved networks on a users device
      */
     @Sync
     @CallingThread
     public List<WifiConfiguration> getSavedNetworks() {
-        if (mWifiManager != null) {
-            return mWifiManager.getConfiguredNetworks();
-        } else {
-            if (LogUtil.isLoggable(TAG, Log.ERROR, mLoggingEnabled)) {
-                Log.e(TAG, "No WifiManager to get saved networks");
-            }
+        if (!mWiseFyPrerequisites.hasPrerequisites()) {
+            return null;
         }
-        return null;
+        return mWiseFyPrerequisites.getWifiManager().getConfiguredNetworks();
     }
 
     /**
      * To retrieve a list of saved networks on a user's device
      *
-     * @param getSavedNetworksCallback - The listener to return results to
+     * @param callbacks The listener to return results to
      *
-     * Uses
-     *   {@link #execute(Runnable)}
-     *   {@link GetSavedNetworksCallbacks}
-     *   {@link WiseFyHandlerThread}
+     * @see #execute(Runnable)
+     * @see GetSavedNetworksCallbacks
+     * @see WiseFyCodes
+     * @see WiseFyPrerequisites#hasPrerequisites()
      */
     @Async
     @WiseFyThread
-    public void getSavedNetworks(@Nullable final GetSavedNetworksCallbacks getSavedNetworksCallback) {
+    public void getSavedNetworks(final GetSavedNetworksCallbacks callbacks) {
         Runnable runnable = new Runnable() {
             @Override
             public void run() {
-                if (mWifiManager != null) {
-                    if (getSavedNetworksCallback != null) {
-                        getSavedNetworksCallback.retrievedSavedNetworks(mWifiManager.getConfiguredNetworks());
+                if (!mWiseFyPrerequisites.hasPrerequisites()) {
+                    if (callbacks != null) {
+                        callbacks.getSavedNetworksWiseFyFailure(WiseFyCodes.MISSING_PREREQUISITE);
                     }
-                } else {
-                    if (LogUtil.isLoggable(TAG, Log.ERROR, mLoggingEnabled)) {
-                        Log.e(TAG, "No WifiManager to get saved networks");
+                    return;
+                }
+
+                if (callbacks != null) {
+                    List<WifiConfiguration> savedNetworks = mWiseFyPrerequisites.getWifiManager().getConfiguredNetworks();
+                    if (savedNetworks != null && savedNetworks.size() > 0) {
+                        callbacks.retrievedSavedNetworks(savedNetworks);
+                    } else {
+                        callbacks.noSavedNetworksFound();
+                    }
+                }
+            }
+        };
+        execute(runnable);
+    }
+
+    @Sync
+    @CallingThread
+    public List<WifiConfiguration> getSavedNetworks(String regexForSSID) {
+        if (!mWiseFyPrerequisites.hasPrerequisites()) {
+            return null;
+        }
+        return mWiseFySearch.findSavedNetworksMatchingRegex(regexForSSID);
+    }
+
+    @Async
+    @WiseFyThread
+    public void getSavedNetworks(final String regexForSSID, final GetSavedNetworksCallbacks callbacks) {
+        Runnable runnable = new Runnable() {
+            @Override
+            public void run() {
+                if (!mWiseFyPrerequisites.hasPrerequisites()) {
+                    if (callbacks != null) {
+                        callbacks.getSavedNetworksWiseFyFailure(WiseFyCodes.MISSING_PREREQUISITE);
                     }
-                    if (getSavedNetworksCallback != null) {
-                        getSavedNetworksCallback.getSavedNetworksWiseFyFailure(WiseFyCodes.NULL_MANAGER);
+                    return;
+                }
+
+                if (callbacks != null) {
+                    List<WifiConfiguration> savedNetworks = mWiseFySearch.findSavedNetworksMatchingRegex(regexForSSID);
+                    if (savedNetworks != null && savedNetworks.size() > 0) {
+                        callbacks.retrievedSavedNetworks(savedNetworks);
+                    } else {
+                        callbacks.noSavedNetworksFound();
                     }
                 }
-                mWiseFyHandlerThread.quitSafely();
             }
         };
         execute(runnable);
@@ -1233,48 +1162,42 @@ public void run() {
     /**
      * To check if the device is connected to a mobile network
      *
-     * Uses
-     *   {@link NetworkTypes}
+     * @see NetworkTypes
+     * @see WiseFyConnection#isNetworkConnectedAndMatchesType(NetworkInfo, String)
+     * @see WiseFyPrerequisites#hasPrerequisites()
+     * @see WiseFyPrerequisites#getConnectivityManager()
      *
      * @return bool - If the device is currently connected to a mobile network
      */
     @Sync
     @CallingThread
     public boolean isDeviceConnectedToMobileNetwork() {
-        if (mConnectivityManager != null) {
-            NetworkInfo networkInfo = mConnectivityManager.getActiveNetworkInfo();
-            if (networkInfo != null && networkInfo.getTypeName() != null && networkInfo.getTypeName().equalsIgnoreCase(NetworkTypes.MOBILE)) {
-                if (networkInfo.isConnected() && networkInfo.isAvailable()) {
-                    return true;
-                }
-            }
-        } else {
-            if (LogUtil.isLoggable(TAG, Log.ERROR, mLoggingEnabled)) {
-                Log.e(TAG, "No ConnectivityManager check if device is connected to mobile network");
-            }
+        if (!mWiseFyPrerequisites.hasPrerequisites()) {
+            return false;
         }
-        return false;
+
+        NetworkInfo networkInfo = mWiseFyPrerequisites.getConnectivityManager().getActiveNetworkInfo();
+        return mWiseFyConnection.isNetworkConnectedAndMatchesType(networkInfo, NetworkTypes.MOBILE);
     }
 
     /**
      * To check if the device is connected to a mobile or wifi network
      *
+     * @see WiseFyConnection#isNetworkConnected(NetworkInfo)
+     * @see WiseFyPrerequisites#hasPrerequisites()
+     * @see WiseFyPrerequisites#getConnectivityManager()
+     *
      * @return bool - If the device is currently connected to a mobile or wifi network
      */
     @Sync
     @CallingThread
     public boolean isDeviceConnectedToMobileOrWifiNetwork() {
-        if (mConnectivityManager != null) {
-            NetworkInfo networkInfo = mConnectivityManager.getActiveNetworkInfo();
-            if (networkInfo != null && networkInfo.isConnected() && networkInfo.isAvailable()) {
-                return true;
-            }
-        } else {
-            if (LogUtil.isLoggable(TAG, Log.ERROR, mLoggingEnabled)) {
-                Log.e(TAG, "No ConnectivityManager check if device is connected to mobile or wifi network");
-            }
+        if (!mWiseFyPrerequisites.hasPrerequisites()) {
+            return false;
         }
-        return false;
+
+        NetworkInfo networkInfo = mWiseFyPrerequisites.getConnectivityManager().getActiveNetworkInfo();
+        return mWiseFyConnection.isNetworkConnected(networkInfo);
     }
 
     /**
@@ -1282,222 +1205,246 @@ public boolean isDeviceConnectedToMobileOrWifiNetwork() {
      *
      * Used by connectToNetwork
      *
-     * @param ssid - The SSID to check if the device is attached to
+     * @param ssid The SSID to check if the device is attached to
+     *
+     * @see WiseFyConnection#isCurrentNetworkConnectedToSSID(String)
+     * @see WiseFyPrerequisites#hasPrerequisites()
      *
      * @return bool - If the device is currently attached to the given SSID
      */
     @Sync
     @CallingThread
-    public boolean isDeviceConnectedToSSID(@Nullable String ssid) {
-        if (TextUtils.isEmpty(ssid)) {
-            return false;
-        }
-        if (mWifiManager != null) {
-            WifiInfo connectionInfo = mWifiManager.getConnectionInfo();
-            if (connectionInfo != null && connectionInfo.getSSID() != null) {
-                String currentSSID = connectionInfo.getSSID().replaceAll("\"", "");
-                if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                    Log.d(TAG, String.format("Current SSID: %s", currentSSID));
-                }
-
-                if (currentSSID.equals(ssid)) {
-                    if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                        Log.d(TAG, "Correct SSID");
-                    }
-                    if (mConnectivityManager != null
-                            && mConnectivityManager.getActiveNetworkInfo() != null
-                            && mConnectivityManager.getActiveNetworkInfo().isAvailable()
-                            && mConnectivityManager.getActiveNetworkInfo().isConnected()) {
-                        if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                            Log.d(TAG, "Network is connected");
-                        }
-                        return true;
-                    }
-                }
-            }
-        } else {
-            if (LogUtil.isLoggable(TAG, Log.ERROR, mLoggingEnabled)) {
-                Log.e(TAG, String.format("No WifiManager check if device is connected to SSID: %s", ssid));
-            }
-        }
-        return false;
+    public boolean isDeviceConnectedToSSID(String ssid) {
+        return !(TextUtils.isEmpty(ssid) || !mWiseFyPrerequisites.hasPrerequisites()) && mWiseFyConnection.isCurrentNetworkConnectedToSSID(ssid);
     }
 
     /**
      * To check if the device is connected to a wifi network
      *
-     * Uses
-     *   {@link NetworkTypes}
+     * @see NetworkTypes
+     * @see WiseFyPrerequisites#hasPrerequisites()
+     * @see WiseFyPrerequisites#getConnectivityManager()
+     * @see WiseFyConnection#isNetworkConnectedAndMatchesType(NetworkInfo, String)
      *
      * @return bool - If the device is currently connected to a wifi network
      */
     @Sync
     @CallingThread
     public boolean isDeviceConnectedToWifiNetwork() {
-        if (mConnectivityManager != null) {
-            NetworkInfo networkInfo = mConnectivityManager.getActiveNetworkInfo();
-            if (networkInfo != null && networkInfo.getTypeName() != null && networkInfo.getTypeName().equalsIgnoreCase(NetworkTypes.WIFI)) {
-                if (networkInfo.isConnected() && networkInfo.isAvailable()) {
-                    return true;
-                }
-            }
-        } else {
-            if (LogUtil.isLoggable(TAG, Log.ERROR, mLoggingEnabled)) {
-                Log.e(TAG, "No ConnectivityManager check if device is connected to wifi network");
-            }
+        if (!mWiseFyPrerequisites.hasPrerequisites()) {
+            return false;
         }
-        return false;
+
+        NetworkInfo networkInfo = mWiseFyPrerequisites.getConnectivityManager().getActiveNetworkInfo();
+        return mWiseFyConnection.isNetworkConnectedAndMatchesType(networkInfo, NetworkTypes.WIFI);
     }
 
     /**
      * To query if logging is enabled or disabled for a WiseFy instance
      *
+     * @see WiseFyConfiguration
+     *
      * @return boolean - If logging is enabled for the WiseFy instance
      */
     @Sync
     @CallingThread
     public boolean isLoggingEnabled() {
-        return mLoggingEnabled;
+        return mWiseFyConfiguration.isLoggingEnabled();
     }
 
     /**
      * To check if the device's current network is 5gHz
      *
-     * Uses
-     *   {@link #getFrequency()}
+     * @see #getFrequency()
+     * @see #MIN_FREQUENCY_5GHZ
+     * @see #MAX_FREQUENCY_5GHZ
      *
      * @return boolean - If the network is 5gHz
      */
     @Sync
     @CallingThread
     public boolean isNetwork5gHz() {
-        int frequency = getFrequency();
-        return frequency > MIN_FREQUENCY_5GHZ && frequency < MAX_FREQUENCY_5GHZ;
+        Integer frequency = getFrequency();
+        return frequency != null && frequency > MIN_FREQUENCY_5GHZ && frequency < MAX_FREQUENCY_5GHZ;
     }
 
     /**
      * To check if a given network is 5gHz
      *
-     * @param network - The network to check if it's 5gHz
+     * @param network The network to check if it's 5gHz
      *
-     * Uses
-     *   {@link #getFrequency(WifiInfo)}
+     * @see #getFrequency(WifiInfo)
+     * @see #MIN_FREQUENCY_5GHZ
+     * @see #MAX_FREQUENCY_5GHZ
      *
      * @return boolean - If the network is 5gHz
      */
     @Sync
     @CallingThread
-    public boolean isNetwork5gHz(@NonNull WifiInfo network) {
-        int frequency = getFrequency(network);
-        return frequency > MIN_FREQUENCY_5GHZ && frequency < MAX_FREQUENCY_5GHZ;
+    public boolean isNetwork5gHz(WifiInfo network) {
+        Integer frequency = getFrequency(network);
+        return frequency != null && frequency > MIN_FREQUENCY_5GHZ && frequency < MAX_FREQUENCY_5GHZ;
     }
 
     /**
      * To check if an SSID is in the list of configured networks
      *
-     * @param ssid - The SSID to check and see if it's in the list of configured networks
+     * @param ssid The SSID to check and see if it's in the list of configured networks
      *
-     * Uses
-     *   {@link #checkIfNetworkInConfigurationList(String)}
+     * @see WiseFyPrerequisites#hasPrerequisites()
+     * @see WiseFySearch#isNetworkASavedConfiguration(String)
      *
      * @return boolean - If the SSID is in the list of configured networks
      */
     @Sync
     @CallingThread
-    public boolean isNetworkInConfigurationList(@NonNull String ssid) {
-        if (mWifiManager != null) {
-            return checkIfNetworkInConfigurationList(ssid);
-        } else {
-            if (LogUtil.isLoggable(TAG, Log.ERROR, mLoggingEnabled)) {
-                Log.e(TAG, "No WifiManager to check if network is in the configuration list");
-            }
-        }
-        return false;
+    public boolean isNetworkInConfigurationList(String ssid) {
+        return mWiseFyPrerequisites.hasPrerequisites() && mWiseFySearch.isNetworkASavedConfiguration(ssid);
+    }
+
+    /**
+     * To check and return if a network is a EAP network
+     *
+     * @param scanResult The network to check
+     *
+     * @see Capabilities
+     *
+     * @return boolean - Whether the network has EAP capabilities listed
+     */
+    @Sync
+    @CallingThread
+    public boolean isNetworkEAP(ScanResult scanResult) {
+        return containsCapability(scanResult, Capabilities.EAP);
     }
 
     /**
-     * To check and return if a network is secure (WEP/PSK/EAP capabilities)
+     * To check and return if a network is a PSK network
      *
-     * @param scanResult - The network to see if it is secure
+     * @param scanResult The network to check
+     *
+     * @see Capabilities
+     *
+     * @return boolean - Whether the network has PSK capabilities listed
+     */
+    @Sync
+    @CallingThread
+    public boolean isNetworkPSK(ScanResult scanResult) {
+        return containsCapability(scanResult, Capabilities.PSK);
+    }
+
+    /**
+     * To check and return if a network is secure (WEP/WPA/WPA2 capabilities)
      *
-     * Uses
-     *   {@link Capabilities}
+     * @param scanResult The network to see if it is secure
+     *
+     * @see Capabilities
      *
      * @return boolean - Whether the network is secure
      */
     @Sync
     @CallingThread
-    public boolean isNetworkSecure(@Nullable ScanResult scanResult) {
-        boolean isSecure = false;
+    public boolean isNetworkSecure(ScanResult scanResult) {
         if (scanResult != null && scanResult.capabilities != null) {
-            if (scanResult.capabilities.contains(Capabilities.WEP) || scanResult.capabilities.contains(Capabilities.PSK) || scanResult.capabilities.contains(Capabilities.EAP)) {
-                isSecure = true;
+            String networkCapabilities = scanResult.capabilities;
+            String[] securityModes = { Capabilities.EAP, Capabilities.PSK, Capabilities.WEP, Capabilities.WPA, Capabilities.WPA2 };
+            for (int i = securityModes.length - 1; i >= 0; i--) {
+                if (networkCapabilities.contains(securityModes[i])) {
+                    return true;
+                }
             }
         }
-        return isSecure;
+        return false;
+    }
+
+    /**
+     * To check and return if a network is a WEP network
+     *
+     * @param scanResult The network to check
+     *
+     * @see Capabilities
+     *
+     * @return boolean - Whether the network has WEP capabilities listed
+     */
+    @Sync
+    @CallingThread
+    public boolean isNetworkWEP(ScanResult scanResult) {
+        return containsCapability(scanResult, Capabilities.WEP);
+    }
+
+    /**
+     * To check and return if a network is a WPA network
+     *
+     * @param scanResult The network to check
+     *
+     * @see Capabilities
+     *
+     * @return boolean - Whether the network has WPA capabilities listed
+     */
+    @Sync
+    @CallingThread
+    public boolean isNetworkWPA(ScanResult scanResult) {
+        return containsCapability(scanResult, Capabilities.WPA);
+    }
+
+    /**
+     * To check and return if a network is a WPA2 network
+     *
+     * @param scanResult The network to check
+     *
+     * @see Capabilities
+     *
+     * @return boolean - Whether the network has WPA2 capabilities listed
+     */
+    @Sync
+    @CallingThread
+    public boolean isNetworkWPA2(ScanResult scanResult) {
+        return containsCapability(scanResult, Capabilities.WPA2);
     }
 
     /**
      * To check if Wifi is enabled on the device or not
      *
+     * @see WiseFyPrerequisites#hasPrerequisites()
+     * @see WiseFyPrerequisites#getWifiManager()
+     *
      * @return boolean - if Wifi is enabled on device
      */
     @Sync
     @CallingThread
     public boolean isWifiEnabled() {
-        if (mWifiManager != null) {
-            return mWifiManager.isWifiEnabled();
-        } else {
-            if (LogUtil.isLoggable(TAG, Log.ERROR, mLoggingEnabled)) {
-                Log.e(TAG, "No WifiManager to check if wifi is enabled");
-            }
-        }
-        return false;
+        return mWiseFyPrerequisites.hasPrerequisites() && mWiseFyPrerequisites.getWifiManager().isWifiEnabled();
     }
 
     /**
      * To remove a configured network
      *
-     * @param ssidToRemove - The ssid of the network you want to remove from the configured network list
+     * @param ssidToRemove The ssid of the network you want to remove from the configured network list
      *
-     * Uses
-     *   {@link #findNetworkInConfigurationList(String)}
+     * @see WiseFyConfiguration#isLoggingEnabled()
+     * @see WiseFyPrerequisites#hasPrerequisites()
+     * @see WiseFySearch#findSavedNetworkByRegex(String)
      *
      * @return boolean - If the command succeeded in removing the network
      */
     @Sync
     @CallingThread
-    public boolean removeNetwork(@Nullable String ssidToRemove) {
-        if (TextUtils.isEmpty(ssidToRemove)) {
+    public boolean removeNetwork(String ssidToRemove) {
+        if (TextUtils.isEmpty(ssidToRemove) || !mWiseFyPrerequisites.hasPrerequisites()) {
             return false;
         }
-        if (mWifiManager != null) {
-            WifiConfiguration wifiConfiguration = findNetworkInConfigurationList(ssidToRemove);
-            if (wifiConfiguration != null) {
-                if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                    Log.d(TAG, String.format("Removing network: %s", ssidToRemove));
-                }
-                mWifiManager.disconnect();
-                boolean result = mWifiManager.removeNetwork(wifiConfiguration.networkId);
-                if (result) {
-                    if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                        Log.d(TAG, "Successfully removed network");
-                    }
-                } else {
-                    if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                        Log.d(TAG, "Failed to remove network");
-                    }
-                }
-                mWifiManager.reconnect();
-                return result;
-            } else {
-                if (LogUtil.isLoggable(TAG, Log.WARN, mLoggingEnabled)) {
-                    Log.w(TAG, String.format("SSID to remove: %s was not found in list to remove network", ssidToRemove));
-                }
+
+        WifiConfiguration wifiConfiguration = mWiseFySearch.findSavedNetworkByRegex(ssidToRemove);
+        if (wifiConfiguration != null) {
+            mWiseFyPrerequisites.getWifiManager().disconnect();
+            boolean result = mWiseFyPrerequisites.getWifiManager().removeNetwork(wifiConfiguration.networkId);
+            if (LogUtil.isLoggable(TAG, Log.DEBUG, mWiseFyConfiguration.isLoggingEnabled())) {
+                Log.d(TAG, String.format("Removing network: %s had result: %b", ssidToRemove, result));
             }
+            mWiseFyPrerequisites.getWifiManager().reconnect();
+            return result;
         } else {
-            if (LogUtil.isLoggable(TAG, Log.ERROR, mLoggingEnabled)) {
-                Log.e(TAG, String.format("No WifiManager to remove network. SSID: %s", ssidToRemove));
+            if (LogUtil.isLoggable(TAG, Log.WARN, mWiseFyConfiguration.isLoggingEnabled())) {
+                Log.w(TAG, String.format("SSID to remove: %s was not found in list to remove network", ssidToRemove));
             }
         }
         return false;
@@ -1506,130 +1453,224 @@ public boolean removeNetwork(@Nullable String ssidToRemove) {
     /**
      * To remove a configured network
      *
-     * @param ssidToRemove - The ssid of the network you want to remove from the configured network list
-     * @param removeNetworkCallback - The listener to return results to
+     * @param ssidToRemove The ssid of the network you want to remove from the configured network list
+     * @param callbacks The listener to return results to
      *
-     * Uses
-     *   {@link #execute(Runnable)}
-     *   {@link #findNetworkInConfigurationList(String)}
-     *   {@link RemoveNetworkCallbacks}
-     *   {@link WiseFyHandlerThread}
+     * @see #execute(Runnable)
+     * @see RemoveNetworkCallbacks
+     * @see WiseFyCodes
+     * @see WiseFyConfiguration#isLoggingEnabled()
+     * @see WiseFyPrerequisites#hasPrerequisites()
+     * @see WiseFyPrerequisites#getWifiManager()
+     * @see WiseFySearch#findSavedNetworkByRegex(String)
      */
     @Async
     @WiseFyThread
-    public void removeNetwork(@Nullable final String ssidToRemove, @Nullable final RemoveNetworkCallbacks removeNetworkCallback) {
+    public void removeNetwork(final String ssidToRemove, final RemoveNetworkCallbacks callbacks) {
         Runnable runnable = new Runnable() {
             @Override
             public void run() {
                 if (TextUtils.isEmpty(ssidToRemove)) {
-                    if (removeNetworkCallback != null) {
-                        removeNetworkCallback.removeNetworkWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
+                    if (callbacks != null) {
+                        callbacks.removeNetworkWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
                     }
                     return;
                 }
-                if (mWifiManager != null) {
-                    WifiConfiguration wifiConfiguration = findNetworkInConfigurationList(ssidToRemove);
-                    if (wifiConfiguration != null) {
-                        if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                            Log.d(TAG, String.format("Removing network: %s", ssidToRemove));
-                        }
-                        mWifiManager.disconnect();
-                        boolean result = mWifiManager.removeNetwork(wifiConfiguration.networkId);
+
+                if (!mWiseFyPrerequisites.hasPrerequisites()) {
+                    if (callbacks != null) {
+                        callbacks.removeNetworkWiseFyFailure(WiseFyCodes.MISSING_PREREQUISITE);
+                    }
+                    return;
+                }
+
+                WifiConfiguration wifiConfiguration = mWiseFySearch.findSavedNetworkByRegex(ssidToRemove);
+                if (wifiConfiguration != null) {
+                    mWiseFyPrerequisites.getWifiManager().disconnect();
+                    boolean result = mWiseFyPrerequisites.getWifiManager().removeNetwork(wifiConfiguration.networkId);
+                    if (LogUtil.isLoggable(TAG, Log.DEBUG, mWiseFyConfiguration.isLoggingEnabled())) {
+                        Log.d(TAG, String.format("Removing network: %s had result: %b", ssidToRemove, result));
+                    }
+                    mWiseFyPrerequisites.getWifiManager().reconnect();
+                    if (callbacks != null) {
                         if (result) {
-                            if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                                Log.d(TAG, "Successfully removed network");
-                            }
-                            if (removeNetworkCallback != null) {
-                                removeNetworkCallback.networkRemoved();
-                            }
+                            callbacks.networkRemoved();
                         } else {
-                            if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                                Log.d(TAG, "Failed to remove network");
-                            }
-                            if (removeNetworkCallback != null) {
-                                removeNetworkCallback.failureRemovingNetwork();
-                            }
-                        }
-                        mWifiManager.reconnect();
-                    } else {
-                        if (LogUtil.isLoggable(TAG, Log.WARN, mLoggingEnabled)) {
-                            Log.w(TAG, String.format("SSID to remove: %s was not found in list to remove network", ssidToRemove));
-                        }
-                        if (removeNetworkCallback != null) {
-                            removeNetworkCallback.networkNotFoundToRemove();
+                            callbacks.failureRemovingNetwork();
                         }
                     }
                 } else {
-                    if (LogUtil.isLoggable(TAG, Log.ERROR, mLoggingEnabled)) {
-                        Log.e(TAG, String.format("No WifiManager to remove network. SSID: %s", ssidToRemove));
+                    if (LogUtil.isLoggable(TAG, Log.WARN, mWiseFyConfiguration.isLoggingEnabled())) {
+                        Log.w(TAG, String.format("SSID to remove: %s was not found in list to remove network", ssidToRemove));
                     }
-                    if (removeNetworkCallback != null) {
-                        removeNetworkCallback.removeNetworkWiseFyFailure(WiseFyCodes.NULL_MANAGER);
+                    if (callbacks != null) {
+                        callbacks.networkNotFoundToRemove();
                     }
                 }
-                mWiseFyHandlerThread.quitSafely();
             }
         };
         execute(runnable);
     }
 
     /**
-     * To search local networks and return the first one that contains a given ssid
+     * To return the first access point that matches a given regex
      *
-     * *NOTE* Case insensitive
+     * *NOTE* Setting filterDuplicates to true will not return an access point with a weaker signal strength (will always take the highest)
      *
-     * @param regexForSSID - The regex to be used to search for the ssid
-     * @param timeoutInMillis - The number of milliseconds to keep searching for the SSID
+     * @param regexForSSID The regex to use when iterating through nearby access points
+     * @param timeoutInMillis The amount of time (in milliseconds) to wait for a matching access point
+     * @param filterDuplicates If you want to exclude access points with the same name that have a weaker signal strength
      *
-     * @return String|null - The first SSID that contains the search ssid (if any, else null)
+     * @see WiseFyPrerequisites#hasPrerequisites()
+     * @see WiseFySearch#findAccessPointByRegex(String, Integer, boolean)
      */
-    @Sync
-    @CallingThread
-    @WaitsForTimeout
-    public String searchForSSID(@Nullable String regexForSSID, int timeoutInMillis) {
-        if (TextUtils.isEmpty(regexForSSID)) {
+    public ScanResult searchForAccessPoint(String regexForSSID, int timeoutInMillis, boolean filterDuplicates) {
+        if (TextUtils.isEmpty(regexForSSID) || !mWiseFyPrerequisites.hasPrerequisites()) {
             return null;
         }
-        if (mWifiManager != null) {
-            int scanPass = 1;
-            long currentTime;
-            long endTime = System.currentTimeMillis() + timeoutInMillis;
-            if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                Log.d(TAG, String.format("End time (searchForSSID): %d", endTime));
-            }
-            do {
-                if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                    Log.d(TAG, String.format("Scanning SSIDs, pass %d", scanPass));
+
+        ScanResult scanResult = mWiseFySearch.findAccessPointByRegex(regexForSSID, timeoutInMillis, filterDuplicates);
+        if (scanResult != null) {
+            return scanResult;
+        }
+        return null;
+    }
+
+    /**
+     * To return the first access point that matches a given regex
+     *
+     * *NOTE* Setting filterDuplicates to true will not return an access point with a weaker signal strength (will always take the highest)
+     *
+     * @param regexForSSID The regex to use when iterating through nearby access points
+     * @param timeoutInMillis The amount of time (in milliseconds) to wait for a matching access point
+     * @param filterDuplicates If you want to exclude access points with the same name that have a weaker signal strength
+     * @param callbacks The listener to return results to
+     *
+     * @see #execute(Runnable)
+     * @see SearchForAccessPointCallbacks
+     * @see WiseFyPrerequisites#hasPrerequisites()
+     * @see WiseFySearch#findAccessPointByRegex(String, Integer, boolean)
+     */
+    public void searchForAccessPoint(final String regexForSSID, final int timeoutInMillis, final boolean filterDuplicates, final SearchForAccessPointCallbacks callbacks) {
+        Runnable runnable = new Runnable() {
+            @Override
+            public void run() {
+                if (TextUtils.isEmpty(regexForSSID)) {
+                    if (callbacks != null) {
+                        callbacks.searchForAccessPointWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
+                    }
+                    return;
+                }
+
+                if (!mWiseFyPrerequisites.hasPrerequisites()) {
+                    if (callbacks != null) {
+                        callbacks.searchForAccessPointWiseFyFailure(WiseFyCodes.MISSING_PREREQUISITE);
+                    }
+                    return;
                 }
-                mWifiManager.startScan();
-                List<ScanResult> networks = mWifiManager.getScanResults();
-                for (ScanResult scanResult : networks) {
-                    if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                        Log.d(TAG, String.format("scanResult.SSID: %s", scanResult.SSID));
+
+                ScanResult scanResult = mWiseFySearch.findAccessPointByRegex(regexForSSID, timeoutInMillis, filterDuplicates);
+                if (callbacks != null) {
+                    if (scanResult != null) {
+                        callbacks.accessPointFound(scanResult);
+                    } else {
+                        callbacks.accessPointNotFound();
                     }
-                    if (scanResult.SSID != null && (scanResult.SSID).matches(regexForSSID)) {
-                        if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                            Log.d(TAG, String.format("Found match, SSID: %s", scanResult.SSID));
-                        }
-                        return scanResult.SSID;
+                }
+            }
+        };
+        execute(runnable);
+    }
+
+    /**
+     * To return nearby access points that match a given regex
+     *
+     * *NOTE* Setting filterDuplicates to true will not return access points with a weaker signal strength (will always take the highest)
+     *
+     * @param regexForSSID The regex to use when iterating through nearby access points
+     * @param filterDuplicates If you want to exclude access points with the same name that have a weaker signal strength
+     *
+     * @see WiseFyPrerequisites#hasPrerequisites()
+     * @see WiseFySearch#findAccessPointsMatchingRegex(String, boolean)
+     *
+     * @return List<ScanResults>|null - The list of matching access points or null if none match the given regex
+     */
+    public List<ScanResult> searchForAccessPoints(String regexForSSID, boolean filterDuplicates) {
+        if (TextUtils.isEmpty(regexForSSID) || !mWiseFyPrerequisites.hasPrerequisites()) {
+            return null;
+        }
+
+        return mWiseFySearch.findAccessPointsMatchingRegex(regexForSSID, filterDuplicates);
+    }
+
+    /**
+     * To return nearby access points that match a given regex
+     *
+     * *NOTE* Setting filterDuplicates to true will not return access points with a weaker signal strength (will always take the highest)
+     *
+     * @param regexForSSID The regex to use when iterating through nearby access points
+     * @param filterDuplicates If you want to exclude access points with the same name that have a weaker signal strength
+     * @param callbacks The listener to return results to
+     *
+     * @see #execute(Runnable)
+     * @see SearchForAccessPointsCallbacks
+     * @see WiseFyCodes
+     * @see WiseFyPrerequisites#hasPrerequisites()
+     * @see WiseFySearch#findAccessPointsMatchingRegex(String, boolean)
+     */
+    public void searchForAccessPoints(final String regexForSSID, final boolean filterDuplicates, final SearchForAccessPointsCallbacks callbacks) {
+        Runnable runnable = new Runnable() {
+            @Override
+            public void run() {
+                if (TextUtils.isEmpty(regexForSSID)) {
+                    if (callbacks != null) {
+                        callbacks.searchForAccessPointsWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
                     }
+                    return;
                 }
 
-                try {
-                    Thread.sleep(1000);
-                } catch (InterruptedException ie) {
-                    // Do nothing
+                if (!mWiseFyPrerequisites.hasPrerequisites()) {
+                    if (callbacks != null) {
+                        callbacks.searchForAccessPointsWiseFyFailure(WiseFyCodes.MISSING_PREREQUISITE);
+                    }
+                    return;
                 }
-                currentTime = System.currentTimeMillis();
-                if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                    Log.d(TAG, String.format("Current time (searchForSSID): %d", endTime));
+
+                List<ScanResult> networks = mWiseFySearch.findAccessPointsMatchingRegex(regexForSSID, filterDuplicates);
+                if (callbacks != null) {
+                    if (networks != null) {
+                        callbacks.foundNetworks(networks);
+                    } else {
+                        callbacks.noNetworksFound();
+                    }
                 }
-                scanPass++;
-            } while (currentTime < endTime);
-        } else {
-            if (LogUtil.isLoggable(TAG, Log.ERROR, mLoggingEnabled)) {
-                Log.e(TAG, String.format("No WifiManager to search for network. SSID: %s", regexForSSID));
             }
+        };
+        execute(runnable);
+    }
+
+    /**
+     * To search local networks and return the first one that contains a given ssid
+     *
+     * @param regexForSSID The regex to be used to search for the ssid
+     * @param timeoutInMillis The number of milliseconds to keep searching for the SSID
+     *
+     * @see WiseFyPrerequisites#hasPrerequisites()
+     * @see WiseFySearch#findAccessPointByRegex(String, Integer, boolean)
+     *
+     * @return String|null - The first SSID that contains the search ssid (if any, else null)
+     */
+    @Sync
+    @CallingThread
+    @WaitsForTimeout
+    public String searchForSSID(String regexForSSID, int timeoutInMillis) {
+        if (TextUtils.isEmpty(regexForSSID) || !mWiseFyPrerequisites.hasPrerequisites()) {
+            return null;
+        }
+
+        ScanResult scanResult = mWiseFySearch.findAccessPointByRegex(regexForSSID, timeoutInMillis, false);
+        if (scanResult != null) {
+            return scanResult.SSID;
         }
         return null;
     }
@@ -1637,81 +1678,111 @@ public String searchForSSID(@Nullable String regexForSSID, int timeoutInMillis)
     /**
      * To search local networks and return the first one that contains a given ssid
      *
-     * *NOTE* Case insensitive
-     *
-     * @param regexForSSID - The regex to be used to search for the ssid
-     * @param timeoutInMillis - The number of milliseconds to keep searching for the SSID
-     * @param searchForSSIDCallback - The listener to return results to
+     * @param regexForSSID The regex to be used to search for the ssid
+     * @param timeoutInMillis The number of milliseconds to keep searching for the SSID
+     * @param callbacks The listener to return results to
      *
-     * Uses
-     *   {@link #execute(Runnable)}
-     *   {@link SearchForSSIDCallbacks}
-     *   {@link WiseFyHandlerThread}
+     * @see #execute(Runnable)
+     * @see SearchForSSIDCallbacks
+     * @see WiseFyCodes
+     * @see WiseFySearch#findAccessPointByRegex(String, Integer, boolean)
      */
     @Async
     @WiseFyThread
     @WaitsForTimeout
-    public void searchForSSID(@Nullable final String regexForSSID, final int timeoutInMillis, @Nullable final SearchForSSIDCallbacks searchForSSIDCallback) {
+    public void searchForSSID(final String regexForSSID, final int timeoutInMillis, final SearchForSSIDCallbacks callbacks) {
         Runnable runnable = new Runnable() {
             @Override
             public void run() {
                 if (TextUtils.isEmpty(regexForSSID)) {
-                    if (searchForSSIDCallback != null) {
-                        searchForSSIDCallback.searchForSSIDWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
+                    if (callbacks != null) {
+                        callbacks.searchForSSIDWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
                     }
                     return;
                 }
-                if (mWifiManager != null) {
-                    int scanPass = 1;
-                    long currentTime;
-                    long endTime = System.currentTimeMillis() + timeoutInMillis;
-                    if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                        Log.d(TAG, String.format("End time (searchForSSID): %d", endTime));
+
+                if (!mWiseFyPrerequisites.hasPrerequisites()) {
+                    if (callbacks != null) {
+                        callbacks.searchForSSIDWiseFyFailure(WiseFyCodes.MISSING_PREREQUISITE);
                     }
-                    do {
-                        if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                            Log.d(TAG, String.format("Scanning SSIDs, pass %d", scanPass));
-                        }
-                        mWifiManager.startScan();
-                        List<ScanResult> networks = mWifiManager.getScanResults();
-                        for (ScanResult scanResult : networks) {
-                            if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                                Log.d(TAG, String.format("scanResult.SSID: %s", scanResult.SSID));
-                            }
-                            if (scanResult.SSID != null && (scanResult.SSID).matches(regexForSSID)) {
-                                if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                                    Log.d(TAG, String.format("Found match, SSID: %s", scanResult.SSID));
-                                }
-                                if (searchForSSIDCallback != null) {
-                                    searchForSSIDCallback.ssidFound(scanResult.SSID);
-                                }
-                                return;
-                            }
-                        }
+                    return;
+                }
 
-                        try {
-                            Thread.sleep(1000);
-                        } catch (InterruptedException ie) {
-                            // Do nothing
-                        }
-                        currentTime = System.currentTimeMillis();
-                        if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                            Log.d(TAG, String.format("Current time (searchForSSID): %d", endTime));
-                        }
-                        scanPass++;
-                    } while (currentTime < endTime);
-                    if (searchForSSIDCallback != null) {
-                        searchForSSIDCallback.ssidNotFound();
+                ScanResult scanResult = mWiseFySearch.findAccessPointByRegex(regexForSSID, timeoutInMillis, false);
+                if (callbacks != null) {
+                    if (scanResult != null) {
+                        callbacks.ssidFound(scanResult.SSID);
+                    } else {
+                        callbacks.ssidNotFound();
                     }
-                } else {
-                    if (LogUtil.isLoggable(TAG, Log.ERROR, mLoggingEnabled)) {
-                        Log.e(TAG, String.format("No WifiManager to search for network. SSID: %s", regexForSSID));
+                }
+            }
+        };
+        execute(runnable);
+    }
+
+    /**
+     * To search local networks and return the first one that contains a given ssid
+     *
+     * @param regexForSSID The regex to be used to search for the ssid
+     *
+     * @see WiseFyPrerequisites#hasPrerequisites()
+     * @see WiseFySearch#findSSIDsMatchingRegex(String)
+     *
+     * @return String|null - The first SSID that contains the search ssid (if any, else null)
+     */
+    @Sync
+    @CallingThread
+    @WaitsForTimeout
+    public List<String> searchForSSIDs(String regexForSSID) {
+        if (TextUtils.isEmpty(regexForSSID) || !mWiseFyPrerequisites.hasPrerequisites()) {
+            return null;
+        }
+
+        return mWiseFySearch.findSSIDsMatchingRegex(regexForSSID);
+    }
+
+    /**
+     * To search local networks and return the first one that contains a given ssid
+     *
+     * @param regexForSSID The regex to be used to search for the ssid
+     * @param callbacks The listener to return results to
+     *
+     * @see #execute(Runnable)
+     * @see SearchForSSIDCallbacks
+     * @see WiseFyCodes
+     * @see WiseFyPrerequisites#hasPrerequisites()
+     * @see WiseFySearch#findSSIDsMatchingRegex(String)
+     */
+    @Async
+    @WiseFyThread
+    @WaitsForTimeout
+    public void searchForSSIDs(final String regexForSSID, final SearchForSSIDsCallbacks callbacks) {
+        Runnable runnable = new Runnable() {
+            @Override
+            public void run() {
+                if (TextUtils.isEmpty(regexForSSID)) {
+                    if (callbacks != null) {
+                        callbacks.searchForSSIDsWiseFyFailure(WiseFyCodes.MISSING_PARAMETER);
                     }
-                    if (searchForSSIDCallback != null) {
-                        searchForSSIDCallback.searchForSSIDWiseFyFailure(WiseFyCodes.NULL_MANAGER);
+                    return;
+                }
+
+                if (!mWiseFyPrerequisites.hasPrerequisites()) {
+                    if (callbacks != null) {
+                        callbacks.searchForSSIDsWiseFyFailure(WiseFyCodes.MISSING_PREREQUISITE);
+                    }
+                    return;
+                }
+
+                List<String> ssids = mWiseFySearch.findSSIDsMatchingRegex(regexForSSID);
+                if (callbacks != null) {
+                    if (ssids != null) {
+                        callbacks.retrievedSSIDs(ssids);
+                    } else {
+                        callbacks.noSSIDsFound();
                     }
                 }
-                mWiseFyHandlerThread.quitSafely();
             }
         };
         execute(runnable);
@@ -1724,26 +1795,16 @@ public void run() {
     /**
      * Used internally to add and save a new wifi configuration
      *
-     * @param wifiConfiguration - The network to configuration to add
+     * @param wifiConfiguration The network configuration to add
      *
-     * Used by
-     *   {@link #addOpenNetwork(String)}
-     *   {@link #addOpenNetwork(String, AddOpenNetworkCallbacks)}
-     *   {@link #addWEPNetwork(String, String)}
-     *   {@link #addWEPNetwork(String, String, AddWEPNetworkCallbacks)}
-     *   {@link #addWPA2Network(String, String)}
-     *   {@link #addWPA2Network(String, String, AddWPA2NetworkCallbacks)}
+     * @see WiseFyConfiguration#isLoggingEnabled()
      *
      * @return int - The return code from WifiManager for network creation (-1 for failure)
      */
-    private int addNetwork(@NonNull WifiConfiguration wifiConfiguration) {
-        int result = mWifiManager.addNetwork(wifiConfiguration);
-        if (result != WIFI_MANAGER_FAILURE) {
-            if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                Log.d(TAG, "Successfully added network");
-            }
-        } else {
-            if (LogUtil.isLoggable(TAG, Log.ERROR, mLoggingEnabled)) {
+    private int addNetworkConfiguration(WifiConfiguration wifiConfiguration) {
+        int result = mWiseFyPrerequisites.getWifiManager().addNetwork(wifiConfiguration);
+        if (result == WIFI_MANAGER_FAILURE) {
+            if (LogUtil.isLoggable(TAG, Log.ERROR, mWiseFyConfiguration.isLoggingEnabled())) {
                 Log.e(TAG, "Failed to add network");
             }
         }
@@ -1751,49 +1812,23 @@ private int addNetwork(@NonNull WifiConfiguration wifiConfiguration) {
     }
 
     /**
-     * Used internally to see if an ssid is already saved
-     *
-     * *NOTE* CASE SENSITIVE!
+     * Used internally to check if a network has a given capability
      *
-     * @param ssid - The ssid to check for in the configured network list
+     * @param scanResult The network to check
+     * @param capability The capability to check for
      *
-     * Used by
-     *   {@link #addOpenNetwork(String)}
-     *   {@link #addOpenNetwork(String, AddOpenNetworkCallbacks)}
-     *   {@link #addWEPNetwork(String, String)}
-     *   {@link #addWEPNetwork(String, String, AddWEPNetworkCallbacks)}
-     *   {@link #addWPA2Network(String, String)}
-     *   {@link #addWPA2Network(String, String, AddWPA2NetworkCallbacks)}
-     *   {@link #isNetworkInConfigurationList(String)}
-     *
-     * @return boolean - If the ssid was found in the configuration list
+     * @return boolean - True if the network contains the capability
      */
-    private boolean checkIfNetworkInConfigurationList(@NonNull String ssid) {
-        WifiConfiguration wifiConfiguration = findNetworkInConfigurationList(ssid);
-        return wifiConfiguration != null;
+    private boolean containsCapability(ScanResult scanResult, String capability) {
+        return scanResult != null && scanResult.capabilities != null && scanResult.capabilities.contains(capability);
     }
 
     /**
      * A method to execute logic on a background thread
      *
-     * Used by
-     *   {@link #addOpenNetwork(String, AddOpenNetworkCallbacks)}
-     *   {@link #addWEPNetwork(String, String, AddWEPNetworkCallbacks)}
-     *   {@link #addWPA2Network(String, String, AddWPA2NetworkCallbacks)}
-     *   {@link #connectToNetwork(String, int, ConnectToNetworkCallbacks)}
-     *   {@link #disableWifi(DisableWifiCallbacks)}
-     *   {@link #disconnectFromCurrentNetwork(DisconnectFromCurrentNetworkCallbacks)}
-     *   {@link #enableWifi(EnableWifiCallbacks)}
-     *   {@link #getCurrentNetwork(GetCurrentNetworkCallbacks)}
-     *   {@link #getFrequency(GetFrequencyCallbacks)}
-     *   {@link #getFrequency(WifiInfo, GetFrequencyCallbacks)}
-     *   {@link #getNearbyAccessPoints(boolean, GetNearbyAccessPointsCallbacks)}
-     *   {@link #getSavedNetwork(String, GetSavedNetworkCallbacks)}
-     *   {@link #getSavedNetworks(GetSavedNetworksCallbacks)}
-     *   {@link #removeNetwork(String, RemoveNetworkCallbacks)}
-     *   {@link #searchForSSID(String, int, SearchForSSIDCallbacks)}
-     *
-     * @param runnable - The block of code to execute in the background
+     * @param runnable The block of code to execute in the background
+     *
+     * @see #setupWiseFyThread()
      */
     private void execute(Runnable runnable) {
         if (mWiseFyHandler == null) {
@@ -1803,95 +1838,15 @@ private void execute(Runnable runnable) {
     }
 
     /**
-     * Used internally to see if an ssid is already saved
-     *
-     * *NOTE* CASE SENSITIVE!
+     * Used internally to setup a WiseFyThread to run background operations
      *
-     * @param ssid - The ssid to find in the configured network list
-     *
-     * Used by
-     *   {@link #checkIfNetworkInConfigurationList(String)}
-     *   {@link #getSavedNetwork(String)}
-     *   {@link #getSavedNetwork(String, GetSavedNetworkCallbacks)}
-     *   {@link #removeNetwork(String)}
-     *   {@link #removeNetwork(String, RemoveNetworkCallbacks)}
-     *
-     * @return WiFiConfiguration|null - A matching configured network in the list or null if no matching ones found
-     */
-    private WifiConfiguration findNetworkInConfigurationList(@NonNull String ssid) {
-        List<WifiConfiguration> list = mWifiManager.getConfiguredNetworks();
-        if (list != null && list.size() > 0) {
-            for (int i = 0; i < list.size(); i++) {
-                WifiConfiguration wifiConfiguration = list.get(i);
-                if (wifiConfiguration != null && wifiConfiguration.SSID != null) {
-                    String ssidInList = wifiConfiguration.SSID.replaceAll("\"", "");
-                    if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                        Log.d(TAG, String.format("SSID in list: %s, SSID: %s", ssidInList, ssid));
-                    }
-                    if (ssidInList.equals(ssid)) {
-                        if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                            Log.d(TAG, "Found SSID in list");
-                        }
-                        return wifiConfiguration;
-                    }
-                }
-            }
-        } else {
-            if (LogUtil.isLoggable(TAG, Log.WARN, mLoggingEnabled)) {
-                Log.w(TAG, "Found 0 configured networks");
-            }
-        }
-        return null;
-    }
-
-    /**
-     *  Used internally to setup a WiseFyThread to run background operations
-     *
-     *  Used by
-     *    {@link #execute(Runnable)}
+     * @see #execute(Runnable)
+     * @see WiseFyHandlerThread
      */
     private void setupWiseFyThread() {
-        mWiseFyHandlerThread = new WiseFyHandlerThread(WiseFyHandlerThread.TAG, mLoggingEnabled);
+        mWiseFyHandlerThread = new WiseFyHandlerThread(WiseFyHandlerThread.TAG, mWiseFyConfiguration.isLoggingEnabled());
         mWiseFyHandlerThread.start();
         Looper looper = mWiseFyHandlerThread.getLooper();
         mWiseFyHandler = new Handler(looper);
     }
-
-    /**
-     * Used internally to check if the device connects to a given SSID
-     * within a specified time (timeout is in millis)
-     *
-     * @param ssid - The ssid to wait for the device to connect to
-     * @param timeoutInMillis - The number of milliseconds to wait
-     *
-     * Used by
-     *   {@link #connectToNetwork(String, int)}
-     *   {@link #connectToNetwork(String, int, ConnectToNetworkCallbacks)}
-     *
-     * @return boolean - If the device is connected to the ssid in the given time
-     */
-    @WaitsForTimeout
-    private boolean waitToConnectToSSID(@NonNull String ssid, int timeoutInMillis) {
-        long currentTime;
-        long endTime = System.currentTimeMillis() + timeoutInMillis;
-        if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-            Log.d(TAG, String.format("End time (waitToConnectToSSID): %d", endTime));
-        }
-        do {
-            boolean result = isDeviceConnectedToSSID(ssid);
-            if (result) {
-                return true;
-            }
-            try {
-                Thread.sleep(1000);
-            } catch (InterruptedException ie) {
-                // Do nothing
-            }
-            currentTime = System.currentTimeMillis();
-            if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-                Log.d(TAG, String.format("Current time (waitToConnectToSSID): %d", endTime));
-            }
-        } while (currentTime < endTime);
-        return false;
-    }
 }
\ No newline at end of file
diff --git a/wisefy/src/main/java/com/isupatches/wisefy/WiseFyConfiguration.java b/wisefy/src/main/java/com/isupatches/wisefy/WiseFyConfiguration.java
new file mode 100644
index 00000000..d9f768ee
--- /dev/null
+++ b/wisefy/src/main/java/com/isupatches/wisefy/WiseFyConfiguration.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2017 Patches Klinefelter
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.isupatches.wisefy;
+
+
+/**
+ * A class used internally to hold a shared reference to the configuration provided with the
+ * builder pattern.  Right now logging is the only configurable option, but this could potentially
+ * be expanded.
+ *
+ * @author Patches
+ */
+class WiseFyConfiguration {
+
+    private static final WiseFyConfiguration WISEFY_CONFIGURATION = new WiseFyConfiguration();
+
+    private boolean mLoggingEnabled;
+
+    /**
+     * Private constructor with no setup
+     */
+    private WiseFyConfiguration() {
+    }
+
+    /**
+     * @return instance of WiseFyConfiguration
+     */
+    static WiseFyConfiguration getInstance() {
+        return WISEFY_CONFIGURATION;
+    }
+
+    /**
+     * Used internally to query for if logging has been enabled on this instance of WiseFy
+     *
+     * @return boolean - True if logging has been enabled
+     */
+    boolean isLoggingEnabled() {
+        return mLoggingEnabled;
+    }
+
+    /**
+     * Used internally to set the logging configuration
+     *
+     * *NOTE* Called upon initialization
+     */
+    void setLoggingEnabled(boolean mLoggingEnabled) {
+        this.mLoggingEnabled = mLoggingEnabled;
+    }
+}
diff --git a/wisefy/src/main/java/com/isupatches/wisefy/WiseFyConnection.java b/wisefy/src/main/java/com/isupatches/wisefy/WiseFyConnection.java
new file mode 100644
index 00000000..fe448af8
--- /dev/null
+++ b/wisefy/src/main/java/com/isupatches/wisefy/WiseFyConnection.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright 2017 Patches Klinefelter
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.isupatches.wisefy;
+
+
+import android.net.NetworkInfo;
+import android.net.wifi.WifiInfo;
+import android.util.Log;
+import com.isupatches.wisefy.annotations.WaitsForTimeout;
+import com.isupatches.wisefy.util.LogUtil;
+import com.isupatches.wisefy.util.SleepUtil;
+
+
+/**
+ * A class used internally to query and determine different parts of the connection state for a
+ * device.
+ *
+ * @author Patches
+ */
+class WiseFyConnection {
+
+    private static final String TAG = WiseFyConnection.class.getSimpleName();
+
+    private static final WiseFyConnection WISEFY_CONNECTION = new WiseFyConnection();
+
+    private WiseFyConfiguration mWiseFyConfiguration;
+
+    private WiseFyPrerequisites mWiseFyPrerequisites;
+
+    /**
+     * Private constructor with no setup
+     */
+    private WiseFyConnection() {
+        mWiseFyConfiguration = WiseFyConfiguration.getInstance();
+        mWiseFyPrerequisites = WiseFyPrerequisites.getInstance();
+    }
+
+    /**
+     * @return instance of WiseFyPrerequisites
+     */
+    static WiseFyConnection getInstance() {
+        return WISEFY_CONNECTION;
+    }
+
+    /**
+     * Used internally to see if the current network is connected to and matches a given ssid
+     *
+     * *NOTE* Case insensitive
+     *
+     * @param ssid The ssid to check if the device is connected to
+     *
+     * @see WiseFyConfiguration#isLoggingEnabled()
+     * @see WiseFyPrerequisites#getConnectivityManager() ()
+     * @see WiseFyPrerequisites#getWifiManager()
+     *
+     * @return boolean - True if the device is connected to a network
+     */
+    boolean isCurrentNetworkConnectedToSSID(String ssid) {
+        WifiInfo connectionInfo = mWiseFyPrerequisites.getWifiManager().getConnectionInfo();
+        if (connectionInfo != null && connectionInfo.getSSID() != null) {
+            String currentSSID = connectionInfo.getSSID().replaceAll("\"", "");
+            if (LogUtil.isLoggable(TAG, Log.DEBUG, mWiseFyConfiguration.isLoggingEnabled())) {
+                Log.d(TAG, String.format("Current SSID: %s, Desired SSID: %s", currentSSID, ssid));
+            }
+            if (currentSSID.equalsIgnoreCase(ssid)) {
+                if (isNetworkConnected(mWiseFyPrerequisites.getConnectivityManager().getActiveNetworkInfo())) {
+                    if (LogUtil.isLoggable(TAG, Log.DEBUG, mWiseFyConfiguration.isLoggingEnabled())) {
+                        Log.d(TAG, "Network is connected");
+                    }
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Used internally to check if a network is connected
+     *
+     * @param networkInfo The network to check
+     *
+     * @return boolean - True if the network is available and connected
+     */
+    boolean isNetworkConnected(NetworkInfo networkInfo) {
+        return networkInfo != null && networkInfo.isConnected() && networkInfo.isAvailable();
+    }
+
+    /**
+     * Used internally to check if a given network matches a given type and is connected
+     *
+     * @param networkInfo The network to check
+     * @param type The type of network (i.e. Mobile or Wifi)
+     *
+     * @see #doesNetworkMatchType(NetworkInfo, String)
+     * @see #isNetworkConnected(NetworkInfo)
+     *
+     * @return boolean - True if the network is both connected and matches the given type of network
+     */
+    boolean isNetworkConnectedAndMatchesType(NetworkInfo networkInfo, String type) {
+        return isNetworkConnected(networkInfo) && doesNetworkMatchType(networkInfo, type);
+    }
+
+    /**
+     * Used internally to check if the device connects to a given SSID within a specified time
+     *
+     * @param ssid The ssid to wait for the device to connect to
+     * @param timeoutInMillis The number of milliseconds to wait
+     *
+     * @see #isCurrentNetworkConnectedToSSID(String)}
+     * @see WiseFyConfiguration#isLoggingEnabled()
+     *
+     * @return boolean - If the device is connected to the ssid in the given time
+     */
+    @WaitsForTimeout
+    boolean waitToConnectToSSID(String ssid, int timeoutInMillis) {
+        long currentTime;
+        long endTime = System.currentTimeMillis() + timeoutInMillis;
+        do {
+            boolean result = isCurrentNetworkConnectedToSSID(ssid);
+            if (result) {
+                return true;
+            }
+            SleepUtil.sleep(1000);
+            currentTime = System.currentTimeMillis();
+            if (LogUtil.isLoggable(TAG, Log.DEBUG, mWiseFyConfiguration.isLoggingEnabled())) {
+                Log.d(TAG, String.format("Current time: %d / End time: %d (waitToConnectToSSID)", currentTime, endTime));
+            }
+        } while (currentTime < endTime);
+        return false;
+    }
+
+    /**
+     * Used internally to check to see if a given network matches a specified type (i.e. Mobile or Wifi)
+     *
+     * *NOTE* Case insensitive
+     *
+     * @param networkInfo The network to check
+     * @param type The type of network
+     *
+     * @return boolean - True if the network matches the given type
+     */
+    private boolean doesNetworkMatchType(NetworkInfo networkInfo, String type) {
+        return networkInfo != null && networkInfo.getTypeName() != null && networkInfo.getTypeName().equalsIgnoreCase(type);
+    }
+}
diff --git a/wisefy/src/main/java/com/isupatches/wisefy/WiseFyPrerequisites.java b/wisefy/src/main/java/com/isupatches/wisefy/WiseFyPrerequisites.java
new file mode 100644
index 00000000..cc367d90
--- /dev/null
+++ b/wisefy/src/main/java/com/isupatches/wisefy/WiseFyPrerequisites.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2017 Patches Klinefelter
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.isupatches.wisefy;
+
+
+import android.net.ConnectivityManager;
+import android.net.wifi.WifiManager;
+import android.util.Log;
+import com.isupatches.wisefy.util.LogUtil;
+
+
+/**
+ * A class used internally as a bridge for other parts of the library to use a shared set of
+ * prerequisite instances.  This contains the WifiManager and ConnectivityManger used throughout
+ * the library.
+ *
+ * @author Patches
+ */
+class WiseFyPrerequisites {
+
+    private static final String TAG = WiseFyPrerequisites.class.getSimpleName();
+
+    private static final WiseFyPrerequisites WISEFY_PREREQUISITES = new WiseFyPrerequisites();
+
+    private WiseFyConfiguration mWiseFyConfiguration;
+
+    private ConnectivityManager mConnectivityManager;
+
+    private  WifiManager mWifiManager;
+
+    /**
+     * Private constructor with no setup
+     */
+    private WiseFyPrerequisites() {
+        mWiseFyConfiguration = WiseFyConfiguration.getInstance();
+    }
+
+    /**
+     * @return instance of WiseFyPrerequisites
+     */
+    static WiseFyPrerequisites getInstance() {
+        return WISEFY_PREREQUISITES;
+    }
+
+    /**
+     * Used internally to verify if the WiseFy instances has the necessary criteria to work
+     *
+     * @see WiseFyConfiguration#isLoggingEnabled()
+     *
+     * @return boolean - True if all prerequisites are met
+     */
+    boolean hasPrerequisites() {
+        if (mWifiManager == null) {
+            if (LogUtil.isLoggable(TAG, Log.ERROR, mWiseFyConfiguration.isLoggingEnabled())) {
+                Log.e(TAG, "Missing WifiManager");
+            }
+            return false;
+        }
+        if (mConnectivityManager == null) {
+            if (LogUtil.isLoggable(TAG, Log.ERROR, mWiseFyConfiguration.isLoggingEnabled())) {
+                Log.e(TAG, "Missing ConnectivityManager");
+            }
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Used internally to return a shared ConnectivityManager instance to the rest of the library
+     *
+     * @return ConnectivityManager|null - The shared ConnectivityManager instance if any or null
+     */
+    ConnectivityManager getConnectivityManager() {
+        return mConnectivityManager;
+    }
+
+    /**
+     * Used internally to return a shared WifiManager instance to the rest of the library
+     *
+     * @return WifiManager|null - The shared WifiManager instance if any or null
+     */
+    WifiManager getWifiManager() {
+        return mWifiManager;
+    }
+
+
+    /**
+     * Used internally to set the shared ConnectivityManager instance for the rest of the library
+     *
+     * *NOTE* Called upon initialization or in test
+     */
+    void setConnectivityManager(ConnectivityManager mConnectivityManager) {
+        this.mConnectivityManager = mConnectivityManager;
+    }
+
+    /**
+     * Used internally to set the shared WifiManager instance for the rest of the library
+     *
+     * *NOTE* Called upon initialization or in test
+     */
+    void setWifiManager(WifiManager mWifiManager) {
+        this.mWifiManager = mWifiManager;
+    }
+}
diff --git a/wisefy/src/main/java/com/isupatches/wisefy/WiseFySearch.java b/wisefy/src/main/java/com/isupatches/wisefy/WiseFySearch.java
new file mode 100644
index 00000000..906387ff
--- /dev/null
+++ b/wisefy/src/main/java/com/isupatches/wisefy/WiseFySearch.java
@@ -0,0 +1,342 @@
+/*
+ * Copyright 2017 Patches Klinefelter
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.isupatches.wisefy;
+
+
+import android.net.wifi.ScanResult;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager;
+import android.util.Log;
+import com.isupatches.wisefy.util.LogUtil;
+import com.isupatches.wisefy.util.SleepUtil;
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * A class used internally for the purposes of shared query logic. This handles saved networks and
+ * nearby access points. There is also filtering by regex functionality and some RSSI logic that
+ * are tied into these queries.
+ *
+ * @author Patches
+ */
+class WiseFySearch {
+
+    private static final String TAG = WiseFySearch.class.getSimpleName();
+
+    private static final WiseFySearch WISEFY_SEARCH = new WiseFySearch();
+
+    WiseFyPrerequisites mWiseFyPrerequisites;
+
+    private WiseFyConfiguration mWiseFyConfiguration;
+
+    /**
+     * Private constructor with no setup
+     */
+    private WiseFySearch() {
+        mWiseFyPrerequisites = WiseFyPrerequisites.getInstance();
+        mWiseFyConfiguration = WiseFyConfiguration.getInstance();
+    }
+
+    /**
+     * @return instance of WiseFySearch
+     */
+    static WiseFySearch getInstance() {
+        return WISEFY_SEARCH;
+    }
+
+    /**
+     * Used internally to wait for a given time and return the first ScanResult whose SSID matches a given regex
+     *
+     * @param regexForSSID The regex to check the SSID of the network against
+     * @param timeoutInMillis The amount of time to wait for a match
+     * @param takeHighest If the method should iterate through and return only the access point with the highest RSSI
+     *
+     * @see #hasHighestSignalStrength(List, ScanResult)
+     * @see WiseFyConfiguration#isLoggingEnabled()
+     * @see WiseFyPrerequisites#getWifiManager() ()
+     *
+     * @return ScanResult|null - The first network whose SSID matches a given regex
+     */
+    ScanResult findAccessPointByRegex(String regexForSSID, Integer timeoutInMillis, boolean takeHighest) {
+        int scanPass = 1;
+        long currentTime;
+        long endTime = System.currentTimeMillis() + timeoutInMillis;
+        do {
+            if (LogUtil.isLoggable(TAG, Log.DEBUG, mWiseFyConfiguration.isLoggingEnabled())) {
+                Log.d(TAG, String.format("Scanning SSIDs, pass %d", scanPass));
+            }
+            mWiseFyPrerequisites.getWifiManager().startScan();
+            List<ScanResult> accessPoints = mWiseFyPrerequisites.getWifiManager().getScanResults();
+            if (accessPoints != null && accessPoints.size() > 0) {
+                for (ScanResult accessPoint : accessPoints) {
+                    if (accessPoint != null && accessPoint.SSID != null && (accessPoint.SSID).matches(regexForSSID)) {
+                        if (LogUtil.isLoggable(TAG, Log.DEBUG, mWiseFyConfiguration.isLoggingEnabled())) {
+                            Log.d(TAG, String.format("scanResult.SSID: %s, regex for SSID: %s", accessPoint.SSID, regexForSSID));
+                        }
+                        if (takeHighest) {
+                            if (hasHighestSignalStrength(accessPoints, accessPoint)) {
+                                return accessPoint;
+                            }
+                        } else {
+                            return accessPoint;
+                        }
+                    }
+                }
+            }
+
+            SleepUtil.sleep(1000);
+
+            currentTime = System.currentTimeMillis();
+            if (LogUtil.isLoggable(TAG, Log.DEBUG, mWiseFyConfiguration.isLoggingEnabled())) {
+                Log.d(TAG, String.format("Current time: %d / End time: %d (findAccessPointByRegex)", currentTime, endTime));
+            }
+            scanPass++;
+        } while (currentTime < endTime);
+        return null;
+    }
+
+    /**
+     * Used internally to return a list of networks whose SSID match the given regex
+     *
+     * @param regexForSSID The regex to check the SSID of the network against
+     * @param takeHighest If the method should iterate through and return only the access point with the highest RSSI
+     *
+     * @see #hasHighestSignalStrength(List, ScanResult)
+     * @see WiseFyConfiguration#isLoggingEnabled()
+     * @see WiseFyPrerequisites#getWifiManager()
+     *
+     * @return List<ScanResult>|null - The list of networks that have an SSID that matches the given regex
+     */
+    List<ScanResult> findAccessPointsMatchingRegex(String regexForSSID, boolean takeHighest) {
+        mWiseFyPrerequisites.getWifiManager().startScan();
+        List<ScanResult> matchingAccessPoints = new ArrayList<>();
+        List<ScanResult> accessPoints = mWiseFyPrerequisites.getWifiManager().getScanResults();
+        if (accessPoints != null && accessPoints.size() > 0) {
+            for (ScanResult accessPoint : accessPoints) {
+                if (accessPoint != null && accessPoint.SSID != null && accessPoint.SSID.matches(regexForSSID)) {
+                    if (LogUtil.isLoggable(TAG, Log.DEBUG, mWiseFyConfiguration.isLoggingEnabled())) {
+                        Log.d(TAG, String.format("accessPoint.SSID: %s, regex for SSID: %s", accessPoint.SSID, regexForSSID));
+                    }
+                    if (takeHighest) {
+                        if (hasHighestSignalStrength(accessPoints, accessPoint)) {
+                            matchingAccessPoints.add(accessPoint);
+                        }
+                    } else {
+                        matchingAccessPoints.add(accessPoint);
+                    }
+                }
+            }
+        }
+        if (matchingAccessPoints.size() > 0) {
+            return matchingAccessPoints;
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Used internally to return the first configuration of s saved networks matching a given regex
+     *
+     * @param regexForSSID The regex for the SSID to find in the configured network list
+     *
+     * @see WiseFyConfiguration#isLoggingEnabled()
+     * @see WiseFyPrerequisites#getWifiManager()
+     *
+     * @return WiFiConfiguration|null - The first saved configuration matching the given regex
+     * or null if none meet the criteria
+     */
+    WifiConfiguration findSavedNetworkByRegex(String regexForSSID) {
+        List<WifiConfiguration> savedNetworks = mWiseFyPrerequisites.getWifiManager().getConfiguredNetworks();
+        if (savedNetworks != null && savedNetworks.size() > 0) {
+            for (WifiConfiguration savedNetwork : savedNetworks) {
+                if (savedNetwork != null && savedNetwork.SSID != null) {
+                    String ssidInList = savedNetwork.SSID.replaceAll("\"", "");
+                    if (LogUtil.isLoggable(TAG, Log.DEBUG, mWiseFyConfiguration.isLoggingEnabled())) {
+                        Log.d(TAG, String.format("SSID in list: %s, SSID: %s", ssidInList, regexForSSID));
+                    }
+                    if (ssidInList.matches(regexForSSID)) {
+                        return savedNetwork;
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Used internally to return a list of saved networks matching a given regex
+     *
+     * @param regexForSSID The regex for the SSIDs to find in the configured network list
+     *
+     * @see WiseFyConfiguration#isLoggingEnabled()
+     * @see WiseFyPrerequisites#getWifiManager()
+     *
+     * @return List<WifiConfiguration>|null - The list of saved network configurations matching
+     * the given regex or null if none meet the criteria
+     */
+    List<WifiConfiguration> findSavedNetworksMatchingRegex(String regexForSSID) {
+        List<WifiConfiguration> savedNetworks = mWiseFyPrerequisites.getWifiManager().getConfiguredNetworks();
+        List<WifiConfiguration> matchingSavedNetworks = new ArrayList<>();
+        if (savedNetworks != null && savedNetworks.size() > 0) {
+            for (WifiConfiguration savedNetwork : savedNetworks) {
+                if (savedNetwork != null && savedNetwork.SSID != null) {
+                    String ssidInList = savedNetwork.SSID.replaceAll("\"", "");
+                    if (LogUtil.isLoggable(TAG, Log.DEBUG, mWiseFyConfiguration.isLoggingEnabled())) {
+                        Log.d(TAG, String.format("SSID in list: %s, SSID: %s", ssidInList, regexForSSID));
+                    }
+                    if (ssidInList.matches(regexForSSID)) {
+                        matchingSavedNetworks.add(savedNetwork);
+                    }
+                }
+            }
+        }
+        if (matchingSavedNetworks.size() > 0) {
+            return matchingSavedNetworks;
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Used internally to return a list of SSIDs from saved networks matching a given regex
+     *
+     * @param regexForSSID The regex for the SSIDs to find in the configured network list
+     *
+     * @see WiseFyConfiguration#isLoggingEnabled()
+     * @see WiseFyPrerequisites#getWifiManager()
+     *
+     * @return List<String>|null - The list of SSIDs of saved network configurations matching
+     * the given regex or null if none meet the criteria
+     */
+    List<String> findSSIDsMatchingRegex(String regexForSSID) {
+        mWiseFyPrerequisites.getWifiManager().startScan();
+        List<String> matchingSSIDs = new ArrayList<>();
+        List<ScanResult> accessPoints = mWiseFyPrerequisites.getWifiManager().getScanResults();
+        if (accessPoints != null && accessPoints.size() > 0) {
+            for (ScanResult accessPoint : accessPoints) {
+                if (accessPoint != null && accessPoint.SSID != null) {
+                    if (LogUtil.isLoggable(TAG, Log.DEBUG, mWiseFyConfiguration.isLoggingEnabled())) {
+                        Log.d(TAG, String.format("accessPoint.SSID: %s, regex for SSID: %s", accessPoint.SSID, regexForSSID));
+                    }
+                    if (accessPoint.SSID.matches(regexForSSID)) {
+                        matchingSSIDs.add(accessPoint.SSID);
+                    }
+                }
+            }
+        }
+        if (matchingSSIDs.size() > 0) {
+            return matchingSSIDs;
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Used internally to determine if a network exists as a saved network configuration
+     *
+     * @param ssid The ssid to check for in the configured network list
+     *
+     * @see WiseFySearch#findSavedNetworkByRegex(String)
+     *
+     * @return boolean - True if the ssid was found in the configuration list
+     */
+    boolean isNetworkASavedConfiguration(String ssid) {
+        WifiConfiguration wifiConfiguration = findSavedNetworkByRegex(ssid);
+        return wifiConfiguration != null;
+    }
+
+    /**
+     * Used internally to build a list of ScanResults (removes duplicates by taking access point with higher RSSI)
+     *
+     * *NOTE* Case insensitive
+     *
+     * @param accessPoints The list of access points to remove entries with lower signal strength from
+     *
+     * @see WiseFyConfiguration#isLoggingEnabled()
+     *
+     * @return List<ScanResult> - The filtered list of networks
+     */
+    List<ScanResult> removeEntriesWithLowerSignalStrength(List<ScanResult> accessPoints) {
+        List<ScanResult> accessPointsToReturn = new ArrayList<>();
+
+        for (ScanResult accessPoint : accessPoints) {
+            boolean found = false;
+            for (int i = 0; i < accessPointsToReturn.size(); i++) {
+                ScanResult scanResult = accessPointsToReturn.get(i);
+                if (LogUtil.isLoggable(TAG, Log.DEBUG, mWiseFyConfiguration.isLoggingEnabled())) {
+                    Log.d(TAG, String.format("SSID 1: %s, SSID 2: %s", accessPoint.SSID, scanResult.SSID));
+                }
+                if (accessPoint.SSID.equalsIgnoreCase(scanResult.SSID)) {
+                    found = true;
+                    if (LogUtil.isLoggable(TAG, Log.DEBUG, mWiseFyConfiguration.isLoggingEnabled())) {
+                        Log.d(TAG, String.format("RSSI level of access point 1: %d", scanResult.level));
+                        Log.d(TAG, String.format("RSSI level of access point 2: %d", accessPoint.level));
+                        Log.d(TAG, String.format("comparison result: %d", WifiManager.compareSignalLevel(accessPoint.level, scanResult.level)));
+                    }
+                    if (WifiManager.compareSignalLevel(accessPoint.level, scanResult.level) > 0) {
+                        if (LogUtil.isLoggable(TAG, Log.DEBUG, mWiseFyConfiguration.isLoggingEnabled())) {
+                            Log.d(TAG, "New result has a higher or same signal strength, swapping");
+                        }
+                        accessPointsToReturn.set(i, accessPoint);
+                    }
+                }
+            }
+
+            if (!found) {
+                if (LogUtil.isLoggable(TAG, Log.DEBUG, mWiseFyConfiguration.isLoggingEnabled())) {
+                    Log.d(TAG, "Found new wifi network");
+                }
+                accessPointsToReturn.add(accessPoint);
+            }
+        }
+        return accessPointsToReturn;
+    }
+
+    /*
+     * Helpers
+     */
+
+    /**
+     * Used internally to determine if the current access point has the highest signal strength
+     * compared to others that have the same SSID
+     *
+     * @param accessPoints A list of access points to compare the current access point to
+     * @param currentAccessPoint The access point to see if it has the highest signal strength
+     *
+     * @see WiseFyConfiguration#isLoggingEnabled()
+     *
+     * @return boolean - True if the current access point has the highest signal strength
+     */
+    private boolean hasHighestSignalStrength(List<ScanResult> accessPoints, ScanResult currentAccessPoint) {
+        for (ScanResult accessPoint : accessPoints) {
+            if (accessPoint.SSID.equalsIgnoreCase(currentAccessPoint.SSID)) {
+                if (LogUtil.isLoggable(TAG, Log.DEBUG, mWiseFyConfiguration.isLoggingEnabled())) {
+                    Log.d(TAG, String.format("RSSI level of current access point: %d", currentAccessPoint.level));
+                    Log.d(TAG, String.format("RSSI level of access point in list: %d", accessPoint.level));
+                    Log.d(TAG, String.format("comparison result: %d", WifiManager.compareSignalLevel(accessPoint.level, currentAccessPoint.level)));
+                }
+                if (WifiManager.compareSignalLevel(accessPoint.level, currentAccessPoint.level) > 0) {
+                    if (LogUtil.isLoggable(TAG, Log.DEBUG, mWiseFyConfiguration.isLoggingEnabled())) {
+                        Log.d(TAG, "Stronger signal strength found");
+                    }
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+}
diff --git a/wisefy/src/main/java/com/isupatches/wisefy/callbacks/GetRSSICallbacks.java b/wisefy/src/main/java/com/isupatches/wisefy/callbacks/GetRSSICallbacks.java
new file mode 100644
index 00000000..fc9e2a2e
--- /dev/null
+++ b/wisefy/src/main/java/com/isupatches/wisefy/callbacks/GetRSSICallbacks.java
@@ -0,0 +1,8 @@
+package com.isupatches.wisefy.callbacks;
+
+
+public interface GetRSSICallbacks {
+    void retrievedRSSI(Integer rssi);
+    void networkNotFoundToRetrieveRSSI();
+    void getRSSIWiseFyFailure(Integer wisefyReturnCode);
+}
diff --git a/wisefy/src/main/java/com/isupatches/wisefy/callbacks/GetSavedNetworkCallbacks.java b/wisefy/src/main/java/com/isupatches/wisefy/callbacks/GetSavedNetworkCallbacks.java
index e4eceb1f..0630561b 100644
--- a/wisefy/src/main/java/com/isupatches/wisefy/callbacks/GetSavedNetworkCallbacks.java
+++ b/wisefy/src/main/java/com/isupatches/wisefy/callbacks/GetSavedNetworkCallbacks.java
@@ -21,6 +21,6 @@
 
 public interface GetSavedNetworkCallbacks {
     void getSavedNetworkWiseFyFailure(Integer wisefyReturnCode);
-    void networkNotFound();
+    void savedNetworkNotFound();
     void retrievedSavedNetwork(WifiConfiguration savedNetwork);
 }
diff --git a/wisefy/src/main/java/com/isupatches/wisefy/callbacks/GetSavedNetworksCallbacks.java b/wisefy/src/main/java/com/isupatches/wisefy/callbacks/GetSavedNetworksCallbacks.java
index 79d3dfbb..420f9c7a 100644
--- a/wisefy/src/main/java/com/isupatches/wisefy/callbacks/GetSavedNetworksCallbacks.java
+++ b/wisefy/src/main/java/com/isupatches/wisefy/callbacks/GetSavedNetworksCallbacks.java
@@ -22,5 +22,6 @@
 
 public interface GetSavedNetworksCallbacks {
     void getSavedNetworksWiseFyFailure(Integer wisefyReturnCode);
+    void noSavedNetworksFound();
     void retrievedSavedNetworks(List<WifiConfiguration> savedNetworks);
 }
diff --git a/wisefy/src/main/java/com/isupatches/wisefy/callbacks/SearchForAccessPointCallbacks.java b/wisefy/src/main/java/com/isupatches/wisefy/callbacks/SearchForAccessPointCallbacks.java
new file mode 100644
index 00000000..1c02b891
--- /dev/null
+++ b/wisefy/src/main/java/com/isupatches/wisefy/callbacks/SearchForAccessPointCallbacks.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2017 Patches Klinefelter
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.isupatches.wisefy.callbacks;
+
+
+import android.net.wifi.ScanResult;
+
+
+public interface SearchForAccessPointCallbacks {
+    void searchForAccessPointWiseFyFailure(Integer wisefyReturnCode);
+    void accessPointFound(ScanResult network);
+    void accessPointNotFound();
+}
diff --git a/wisefy/src/main/java/com/isupatches/wisefy/callbacks/SearchForAccessPointsCallbacks.java b/wisefy/src/main/java/com/isupatches/wisefy/callbacks/SearchForAccessPointsCallbacks.java
new file mode 100644
index 00000000..be45793b
--- /dev/null
+++ b/wisefy/src/main/java/com/isupatches/wisefy/callbacks/SearchForAccessPointsCallbacks.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2017 Patches Klinefelter
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.isupatches.wisefy.callbacks;
+
+
+import android.net.wifi.ScanResult;
+import java.util.List;
+
+
+public interface SearchForAccessPointsCallbacks {
+    void searchForAccessPointsWiseFyFailure(Integer wisefyReturnCode);
+    void foundNetworks(List<ScanResult> networks);
+    void noNetworksFound();
+}
diff --git a/wisefy/src/main/java/com/isupatches/wisefy/callbacks/SearchForSSIDsCallbacks.java b/wisefy/src/main/java/com/isupatches/wisefy/callbacks/SearchForSSIDsCallbacks.java
new file mode 100644
index 00000000..545a12e0
--- /dev/null
+++ b/wisefy/src/main/java/com/isupatches/wisefy/callbacks/SearchForSSIDsCallbacks.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2017 Patches Klinefelter
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.isupatches.wisefy.callbacks;
+
+
+import java.util.List;
+
+
+public interface SearchForSSIDsCallbacks {
+    void searchForSSIDsWiseFyFailure(Integer wisefyReturnCode);
+    void retrievedSSIDs(List<String> ssids);
+    void noSSIDsFound();
+}
diff --git a/wisefy/src/main/java/com/isupatches/wisefy/constants/Capabilities.java b/wisefy/src/main/java/com/isupatches/wisefy/constants/Capabilities.java
index edfd4e5e..07127e47 100644
--- a/wisefy/src/main/java/com/isupatches/wisefy/constants/Capabilities.java
+++ b/wisefy/src/main/java/com/isupatches/wisefy/constants/Capabilities.java
@@ -20,4 +20,6 @@ public class Capabilities {
     public static final String EAP = "EAP";
     public static final String PSK = "PSK";
     public static final String WEP = "WEP";
+    public static final String WPA = "WPA";
+    public static final String WPA2 = "WPA2";
 }
diff --git a/wisefy/src/main/java/com/isupatches/wisefy/constants/WiseFyCodes.java b/wisefy/src/main/java/com/isupatches/wisefy/constants/WiseFyCodes.java
index c5a42981..b52857f0 100644
--- a/wisefy/src/main/java/com/isupatches/wisefy/constants/WiseFyCodes.java
+++ b/wisefy/src/main/java/com/isupatches/wisefy/constants/WiseFyCodes.java
@@ -18,6 +18,6 @@
 
 public class WiseFyCodes {
     public static final int MISSING_PARAMETER = -1000;
-    public static final int NETWORK_ALREADY_CONFIGURED = -1001;
-    public static final int NULL_MANAGER = -1002;
+    public static final int MISSING_PREREQUISITE = -1001;
+    public static final int NETWORK_ALREADY_CONFIGURED = -1002;
 }
diff --git a/wisefy/src/main/java/com/isupatches/wisefy/threads/WiseFyHandlerThread.java b/wisefy/src/main/java/com/isupatches/wisefy/threads/WiseFyHandlerThread.java
index 2e9d9dfe..8580fc9c 100644
--- a/wisefy/src/main/java/com/isupatches/wisefy/threads/WiseFyHandlerThread.java
+++ b/wisefy/src/main/java/com/isupatches/wisefy/threads/WiseFyHandlerThread.java
@@ -1,11 +1,34 @@
+/*
+ * Copyright 2017 Patches Klinefelter
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.isupatches.wisefy.threads;
 
 
 import android.os.HandlerThread;
 import android.util.Log;
+import com.isupatches.wisefy.WiseFy;
 import com.isupatches.wisefy.util.LogUtil;
 
 
+/**
+ * A Thread to use for all WiseFy background processing
+ *
+ * *NOTE* Must be cleaned!! {@link WiseFy#dump()}
+ *
+ * @author Patches
+ */
 public class WiseFyHandlerThread extends HandlerThread {
 
     public static final String TAG = WiseFyHandlerThread.class.getSimpleName();
@@ -26,10 +49,10 @@ public synchronized void start() {
     }
 
     @Override
-    public boolean quitSafely() {
+    public boolean quit() {
         if (LogUtil.isLoggable(TAG, Log.DEBUG, mLoggingEnabled)) {
-            Log.d(TAG, "quitSafely called on WiseFyHandlerThread");
+            Log.d(TAG, "quit called on WiseFyHandlerThread");
         }
-        return super.quitSafely();
+        return super.quit();
     }
 }
diff --git a/wisefy/src/main/java/com/isupatches/wisefy/util/LogUtil.java b/wisefy/src/main/java/com/isupatches/wisefy/util/LogUtil.java
index 6226f8e7..727114fa 100644
--- a/wisefy/src/main/java/com/isupatches/wisefy/util/LogUtil.java
+++ b/wisefy/src/main/java/com/isupatches/wisefy/util/LogUtil.java
@@ -21,19 +21,21 @@
 
 /**
  * Logging helper class
+ *
+ * @author Patches
  */
 public class LogUtil {
 
     /**
      * Checks to see given a TAG, log level, and if logging is enabled if logging should occur
      *
-     * @param tag - The tag to be used for the log
-     * @param level - The level of logging (i.e Log.DEBUG, Log.WARN, Log.ERROR, etc)
-     * @param loggingEnabled - If the instances of WiseFy has logging set to always be enabled
+     * @param tag The tag to be used for the log
+     * @param level The level of logging (i.e Log.DEBUG, Log.WARN, Log.ERROR, etc)
+     * @param loggingEnabled If the instances of WiseFy has logging set to always be enabled
      *
-     * {@link Log}
+     * @see Log
      *
-     * @return boolean - if logging is enabled
+     * @return boolean - True if logging should occur based off level and other factors
      */
     public static boolean isLoggable(String tag, int level, boolean loggingEnabled) {
         boolean isLoggable;
diff --git a/wisefy/src/main/java/com/isupatches/wisefy/util/ManagerUtil.java b/wisefy/src/main/java/com/isupatches/wisefy/util/ManagerUtil.java
index 0da44e8d..c14f9821 100644
--- a/wisefy/src/main/java/com/isupatches/wisefy/util/ManagerUtil.java
+++ b/wisefy/src/main/java/com/isupatches/wisefy/util/ManagerUtil.java
@@ -19,9 +19,13 @@
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.wifi.WifiManager;
-import com.isupatches.wisefy.WiseFy;
 
 
+/**
+ * Manager helper class
+ *
+ * @author Patches
+ */
 public class ManagerUtil {
 
     private static final ManagerUtil MANAGER_UTIL = new ManagerUtil();
@@ -42,34 +46,32 @@ public static ManagerUtil getInstance() {
     /**
      * To get a Connectivity manger instance from an activity's context.
      *
+     * @param context The context to use to retrieve a connectivity manager via getSystemService
+     *
      * @see ConnectivityManager
-     * @see WiseFy
      *
-     * @param context - The context to use to retrieve a connectivity manager via getSystemService
      * @return ConnectivityManager|null
      */
     public ConnectivityManager getConnectivityManager(Context context) {
-        if(context != null) {
+        if (context != null) {
             return (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-        } else {
-            return null;
         }
+        return null;
     }
 
     /**
      * To get a WiFi manger instance from an activity's context.
      *
+     * @param context The context to use to retrieve a wifi manager via getSystemService
+     *
      * @see WifiManager
-     * @see WiseFy
      *
-     * @param context - The context to use to retrieve a wifi manager via getSystemService
      * @return WifiManager|null
      */
     public WifiManager getWiFiManager(Context context) {
-        if(context != null) {
+        if (context != null) {
             return (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
-        } else {
-            return null;
         }
+        return null;
     }
 }
\ No newline at end of file
diff --git a/wisefy/src/main/java/com/isupatches/wisefy/util/SSIDUtil.java b/wisefy/src/main/java/com/isupatches/wisefy/util/SSIDUtil.java
index 17d77c4c..0c777372 100644
--- a/wisefy/src/main/java/com/isupatches/wisefy/util/SSIDUtil.java
+++ b/wisefy/src/main/java/com/isupatches/wisefy/util/SSIDUtil.java
@@ -19,6 +19,11 @@
 import android.os.Build;
 
 
+/**
+ * A helper class to manipulate the string value for SSIDs
+ *
+ * @author Patches
+ */
 public class SSIDUtil {
 
     private static final SSIDUtil SSID_UTIL = new SSIDUtil();
@@ -36,6 +41,13 @@ static SSIDUtil getInstance() {
         return SSID_UTIL;
     }
 
+    /**
+     * Used internally to convert an SSID into a format for KitKat and below if needed
+     *
+     * @param ssid The SSID to alter
+     *
+     * @return String - The converted SSID value
+     */
     String convertSSIDForConfig(String ssid) {
         // On devices with version Kitkat and below, We need to send SSID name
         // with double quotes. On devices with version Lollipop, We need to send
diff --git a/wisefy/src/main/java/com/isupatches/wisefy/util/SleepUtil.java b/wisefy/src/main/java/com/isupatches/wisefy/util/SleepUtil.java
new file mode 100644
index 00000000..beb96671
--- /dev/null
+++ b/wisefy/src/main/java/com/isupatches/wisefy/util/SleepUtil.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2017 Patches Klinefelter
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.isupatches.wisefy.util;
+
+
+/**
+ * A helper class for shared wait logic
+ *
+ * @author Patches
+ */
+public class SleepUtil {
+
+    /**
+     * Used to wait for a given amount of time (in milliseconds)
+     *
+     * @param timeToSleepInMillis The number of milliseconds to sleep
+     */
+    public static void sleep(long timeToSleepInMillis) {
+        try {
+            Thread.sleep(timeToSleepInMillis);
+        } catch (InterruptedException ie) {
+            // Do nothing
+        }
+    }
+}
diff --git a/wisefy/src/main/java/com/isupatches/wisefy/util/WifiConfigurationUtil.java b/wisefy/src/main/java/com/isupatches/wisefy/util/WifiConfigurationUtil.java
index bed24325..b9c58150 100644
--- a/wisefy/src/main/java/com/isupatches/wisefy/util/WifiConfigurationUtil.java
+++ b/wisefy/src/main/java/com/isupatches/wisefy/util/WifiConfigurationUtil.java
@@ -19,6 +19,11 @@
 import android.net.wifi.WifiConfiguration;
 
 
+/**
+ * A helper class to generate WifiConfigurations
+ *
+ * @author Patches
+ */
 public class WifiConfigurationUtil {
 
     private static final WifiConfigurationUtil WIFI_CONFIGURATION_UTIL = new WifiConfigurationUtil();
@@ -38,6 +43,13 @@ public static WifiConfigurationUtil getInstance() {
         return WIFI_CONFIGURATION_UTIL;
     }
 
+    /**
+     * To generate a configuration for an open network
+     *
+     * @param ssid The ssid for the open network's configuration
+     *
+     * @return WifiConfiguration - The open network configuration
+     */
     public WifiConfiguration generateOpenNetworkConfiguration(String ssid) {
         WifiConfiguration wifiConfiguration = new WifiConfiguration();
         wifiConfiguration.SSID = mSSIDUtil.convertSSIDForConfig(ssid);
@@ -54,6 +66,14 @@ public WifiConfiguration generateOpenNetworkConfiguration(String ssid) {
         return wifiConfiguration;
     }
 
+    /**
+     * To generate a configuration for a WEP network
+     *
+     * @param ssid The ssid for the WEP network's configuration
+     * @param password The password for the WEP networks configuration
+     *
+     * @return WifiConfiguration - The WEP network configuration
+     */
     public WifiConfiguration generateWEPNetworkConfiguration(String ssid, String password) {
         WifiConfiguration wifiConfiguration = new WifiConfiguration();
         wifiConfiguration.SSID = mSSIDUtil.convertSSIDForConfig(ssid);
@@ -70,6 +90,14 @@ public WifiConfiguration generateWEPNetworkConfiguration(String ssid, String pas
         return wifiConfiguration;
     }
 
+    /**
+     * To generate a configuration for a WPA2 network
+     *
+     * @param ssid The ssid for the WPA2 network's configuration
+     * @param password The password for the WPA2 networks configuration
+     *
+     * @return WifiConfiguration - The WPA2 network configuration
+     */
     public WifiConfiguration generateWPA2NetworkConfiguration(String ssid, String password) {
         WifiConfiguration wifiConfiguration = new WifiConfiguration();
         wifiConfiguration.SSID = mSSIDUtil.convertSSIDForConfig(ssid);