continued work on parser