Clean up and start incorporating district info.