Added (untested) image class