I agree with Ravell's. I think you have your mapping down. Time to work on your toponyms .