Continue work on parser