Moved all functionality to the parser