Add WiFi shield stuff and refactored some stuff