add buildings to cities and started merging bases to move server side