add wifi and 3g stuff (nonworking i guess)