[WIP] Do loading in the pmap rather than in the factory