Refactoring to use pyparsing in progress...