[WIP] Change to XML Mappings

This is stub PR in instead of an issue.