Added XML stuff (still doesn't work)