Finished parser
Merge