Feature/add proper village r0

Didn't see any other issues so I guess I'll merge it once you get back to me on that one thing.