Revert "Revert "revamp wifi services"" *FIXME*

This reverts commit e3547888c93d2bbb811f17dc4a013c346f084702.