Further work on allowing multiple images to be booted