Made some changes, added a new test file, trying to get the parser working.