Got pictures working
Merged