New XML parsing

@cpennington I think this is ready.