Flesh out a bit
Add line and column information to the tokens