[loading] move loading higher up the code chain