Switch to better variable name
Test for geolocation entries
Order to match class