Formatting

Started to reading in the new xml, added some formatting along the way.