City census

Addresses #34. Not fully polished, but does the trick.