expiring tokens: WIP

Note: This is a WIP, and it isn't ready to be merged yet.  Opening this PR for discussion.