First draft of code for new parser.