more progress on org, db migration to add new fields to orgs