added city, state, zip, associations, and migrations, updated JSON and templates