major change to parsing method ... more to do yet!