finishing (sorta hardcoded) xml file support, merging back to main