Feature/add proper village r0