Added some container classes for token things
Some work on modifiers