Incomplete parser redesign
parser2 added to main (commented out)