Parser built, tests updated, need refactoring