[Finishes #78333634] Complete initial pass at User/Org association, and a lot of various other improvements