More XML work, almost done!