Implemented the new parser again, and removed the logger