Refactor so that we can have multiple images