Newparser 2

Stuff that we changed over the last week based on Dwight's comments on the original pull request.