Beginning work on parser
Continuing work on parsing functions
More internal cleanup.