-removed stack, implement it again later
-added different token types to list