Reverting.

Property list isn't going to work out, and will only decrease efficiency.
Reverting to token list idea.
Added local/global specifiers.