WIP: underlying plumbing
WIP
WIP
WIP: rebasing again
WIP: data goes in, but doesn't yet come back out