Continued fleshing out the canvas demo.