Almost done with parser