completed refactor of Symbol to store context and flags
merge