Image Experiments/Tweaks

Attempting to fix image loading.
Revert "Image Experiments/Tweaks"

This reverts commit 3d4106911d7bf7f838fb3528150eca0cde74da54.
Revert "Revert "Image Experiments/Tweaks""

This reverts commit 82e8329d1896c66419babd289386328dfc5e5ff0.