WIP: some more work on the parser