Restore image class back to functionality

See individual commit summaries for more.