Progress on new image plugin and handling