Updated with now essentially working parser.