Bedrock

Token structure and naming. Everything downstream is a consequence of this — or a workaround for it.