[WIP] Token identification

First cut at this, any thoughts?
I'd drop the `identifier` bit everywhere.