Custom images

ug, I deleted the period when I deleted the TODO comment :-(