broke out lexicon; primary expression wip
broke out expressions
fixed scope mods