Working on speeding up the parser