refactoring
switch from hardcoding to more general, half-implemented solution
get rid of hardcoding of xml filename