Cleaning up selected loader behavior

Still not creating modules on the selected loader - need to fix this