Finished refactoring Parser Combinators, need to adjust EBNF as well now