Changed city to use fluid population rather than tracking citizens as individuals