Reorganized code.  Added DataUtils class to hold parsing functions.