Work on the Pop\Image refactor