Working on new parser

Shouldn't affect current code