Worked on Parser. Added unit tests.