Began adding support for specifying tokens in the Command object.
Updated everything to draw tokens from the Command objects instead of extra arguments.