Working on adding PNG support