wip: Working to improve the speed of file loading