Not even close to working, but getting there
Fix last night's XML parsing error