[WIP] Token identification

First cut at this, any thoughts?
I'd prefer `token`, also you should `find_by_token` once it's there.