Massive change to parser.  Removed lots of unnecessary code.  More validation testing in notebook.  #131