Got something working by generating from the xml

Got as far as fix ver 4.4