Massive XML commit.
WIP commit