Started parser refactor