Generalizing input to drawImage

Image is now call CanvasImage