WIP Streamline our internal image use