Parser now works well, but need some testing for the parser