[WIP] Token identification

First cut at this, any thoughts?