Almost have choropleth working properly
More work on choropleth