Worked more on parser