Yeah, I agree. I left these out address stuff b/c (I thought) they were used elsewhere and didn't want to change/break more stuff than was necessary to get the shenzhen page done.  I can address (heh, pun) later.