Generalized inventory; added alignment enum; added TokenList