Format token strings better.
Fix bug in add() and make __toString recurse.
More work on the parser.

This particular parse method is a dead end and needs to be rewritten.