final commit before dumping most of current parser code