In Progress

Private project for xsdatasolution #5