New hierarchical geography model, no longer hardcoded