Working on formatting xml to be parsed by the 3D viewer
Pulling
Abi's changes