This loader should still be in a seperate patch.