ACTUALLY finished the stupid xml nonsense