incremental work on parser