Incremental work on parser