Try to add in better wireless stuff