Add missing this
More villager bits
Hook up villager interaction
Resolve conflict

index.html conflict