Finishing Touches on No-Wifi Mode.