Dropping requirement to have comma separated city, state. We can reasonaly infer from zips, 2 letter states, etc.