Fixed numerous bugs related to issues with parsing, HACKRU STYLE COMMITS YEAH
Added scan based parsing mode for mode tokenizing
Merging