refactored

still need if statement to change ruler of city