Started working on png support