Added crazy XML building thing