Moved cities to another class and implemented