More images, compare refactor
Merge