Refactor cityhall method majorly!