Added build class, rewrote city class