in process of reorganizing asset loading code