Working on fixing the parser