Ok, big merge. here's the new xml-config stuff in action. There's a few