Remove stupid extra file again
Fix null overwrite problem with tokens, and add branch for lexical analysis dump
Add missing instantiation of HashMap to Memory
Refactor for clarity