start of parser rethink
simplify parser layout