Working on image support

Not working yet but added