Messed with inheritance to make things easier

mostly to do with cities