Worked on parser a bit