Added geolookup and calculations