Added other choropleths and added switching.