Feature/add proper village