Finish first pass at xsd