Refactored out the parser to a separate class
Fixed the merge conflict