Use new data and fix parser to handle establishment ids

Some early morning hacking. Looks like this fixes everything and makes it LIVES compliant.