Changes to ensure existing xml will work
down to two compile errors
One test passing!