Extended into 8 classes and objects. Parser changed to Reader and can take separate Parser objects for different parse types. More cleanup invovled.