now pulling both GPS and network location data

Needs testing!