Committing some partial parser work.