XML load refactor essentially complete