Continuing work on the WiFi handler