Added image support. Should look more into whether I'm getting the right images.