Moved some debugging around and made progress in our parser.