Feature/add proper village

None of my old code really seems to be getting used anymore. Maybe the old stuff should be taken out.