Partly shapes support added

Simply parse the images out of the shapes