Refactored and pulled in more WiFi data.