more work towards images, unfinished
Merge origin/master