More image related updates. Async is fun.