Upgrading libraries, and resolving issues from that upgrade, including changes to how we manage tokens. This seems to be working locally.