Images

@mlippert please review this so we can get it into master.