going to leave this for now, I think this functionality should be moved into the image proxy later