Org locations and updates to org stuff