more work on orgs upload