still wip - listImages refactoring