most tests passing again, almost done with new parser