referencing/populatian partially made to work
merged resolution for city.js
sync with repo