progress on parsing
done with most of the heavy lifting for parsing