Districts load

Move Michael's modifications into my branch (that has some new feature and small modifications)