Some TODO updates, a model revision, and getting association/disassociation working on user/team creds.