working on images also removed most of the TODOs