Add villager implementation. Merges PR #95