WIP Adding support for images.