Add back function and redo how the image loader works