Added parse tree and other stuff