Mega huge update for d3 mapping