Add ugly support for listing images, needs cleaning up