new, manual parser - partial impl
first version of full grammar parser
cleanup