Made changes to XML parser. WIP. May just use whole doc.