Look for the new geo-ip functionality and utilize that in the Core bootstrap.