Wifi plug n play

Tom, do we want this in mainline plug and play?