Start refactoring parser functionality into OO